[commit] r1742 - in trunk: Install Install/Build Install/PIAs Install/PIAs_1.0.1.0 Tests/GPyUnit
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Fri Dec 9 09:25:38 CST 2011
Author: ksmyth
Date: Fri Dec 9 09:25:38 2011
New Revision: 1742
Log:
Bug: PIAs werent in the installer
Modified:
trunk/Install/Build/build.py
trunk/Install/GME_paradigms.wxs
trunk/Install/PIAs/GME.MGA.Core.wxi
trunk/Install/PIAs/GME.MGA.Meta.wxi
trunk/Install/PIAs/GME.MGA.Parser.wxi
trunk/Install/PIAs/GME.MGA.wxi
trunk/Install/PIAs/GME.Util.wxi
trunk/Install/PIAs/GMEPIA.wxi
trunk/Install/PIAs_1.0.1.0/GMEPIA.wxi
trunk/Tests/GPyUnit/test_gmeoleapp.py
Modified: trunk/Install/Build/build.py
==============================================================================
--- trunk/Install/Build/build.py Fri Dec 9 09:25:16 2011 (r1741)
+++ trunk/Install/Build/build.py Fri Dec 9 09:25:38 2011 (r1742)
@@ -220,7 +220,6 @@
f.close()
import glob
- # Build the msi file
tools.build_WiX([]
+ [file for file in glob.glob(os.path.join(GME_ROOT, "Install", "*.wxs")) if file.find('GME.wxs') == -1 ]
+ glob.glob(os.path.join(GME_ROOT, "Install", "PIAs", "*.wxi"))
Modified: trunk/Install/GME_paradigms.wxs
==============================================================================
--- trunk/Install/GME_paradigms.wxs Fri Dec 9 09:25:16 2011 (r1741)
+++ trunk/Install/GME_paradigms.wxs Fri Dec 9 09:25:38 2011 (r1742)
@@ -49,5 +49,18 @@
</RegistryKey>
</Component>
</DirectoryRef>
+
+ <ComponentGroupRef Id='GME.1.0.1.0'/>
+ <ComponentGroupRef Id='GME.MGA.1.0.1.0'/>
+ <ComponentGroupRef Id='GME.MGA.Core.1.0.1.0'/>
+ <ComponentGroupRef Id='GME.MGA.Meta.1.0.1.0'/>
+ <ComponentGroupRef Id='GME.MGA.Parser.1.0.1.0'/>
+ <ComponentGroupRef Id='GME.Util.1.0.1.0'/>
+ <ComponentGroupRef Id='GME'/>
+ <ComponentGroupRef Id='GME.MGA'/>
+ <ComponentGroupRef Id='GME.MGA.Core'/>
+ <ComponentGroupRef Id='GME.MGA.Meta'/>
+ <ComponentGroupRef Id='GME.MGA.Parser'/>
+ <ComponentGroupRef Id='GME.Util'/>
</Module>
</Wix>
Modified: trunk/Install/PIAs/GME.MGA.Core.wxi
==============================================================================
--- trunk/Install/PIAs/GME.MGA.Core.wxi Fri Dec 9 09:25:16 2011 (r1741)
+++ trunk/Install/PIAs/GME.MGA.Core.wxi Fri Dec 9 09:25:38 2011 (r1742)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
- <DirectoryRef Id="INSTALLDIR_BIN" />
+ <DirectoryRef Id="INSTALLDIR_PARADIGMS32" />
</Fragment>
<Fragment>
<ComponentGroup Id="GME.MGA.Core">
- <Component Id="GME.MGA.Core.dll" Directory="INSTALLDIR_BIN" Guid="{3BDD7F38-DCF5-46C1-B07E-CF70772C882F}">
+ <Component Id="GME.MGA.Core.dll" Directory="INSTALLDIR_PARADIGMS32" Guid="{3BDD7F38-DCF5-46C1-B07E-CF70772C882F}">
<File Id="GME.MGA.Core.dll" KeyPath="yes" Source="$(var.PIADir)\GME.MGA.Core.dll" Assembly=".net" />
</Component>
</ComponentGroup>
</Fragment>
-</Wix>
\ No newline at end of file
+</Wix>
Modified: trunk/Install/PIAs/GME.MGA.Meta.wxi
==============================================================================
--- trunk/Install/PIAs/GME.MGA.Meta.wxi Fri Dec 9 09:25:16 2011 (r1741)
+++ trunk/Install/PIAs/GME.MGA.Meta.wxi Fri Dec 9 09:25:38 2011 (r1742)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
- <DirectoryRef Id="INSTALLDIR_BIN" />
+ <DirectoryRef Id="INSTALLDIR_PARADIGMS32" />
</Fragment>
<Fragment>
<ComponentGroup Id="GME.MGA.Meta">
- <Component Id="GME.MGA.Meta.dll" Directory="INSTALLDIR_BIN" Guid="{0BE9DD47-1FEB-4492-88E7-0172D9AA4A30}">
+ <Component Id="GME.MGA.Meta.dll" Directory="INSTALLDIR_PARADIGMS32" Guid="{0BE9DD47-1FEB-4492-88E7-0172D9AA4A30}">
<File Id="GME.MGA.Meta.dll" KeyPath="yes" Source="$(var.PIADir)\GME.MGA.Meta.dll" Assembly=".net" />
</Component>
</ComponentGroup>
</Fragment>
-</Wix>
\ No newline at end of file
+</Wix>
Modified: trunk/Install/PIAs/GME.MGA.Parser.wxi
==============================================================================
--- trunk/Install/PIAs/GME.MGA.Parser.wxi Fri Dec 9 09:25:16 2011 (r1741)
+++ trunk/Install/PIAs/GME.MGA.Parser.wxi Fri Dec 9 09:25:38 2011 (r1742)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
- <DirectoryRef Id="INSTALLDIR_BIN" />
+ <DirectoryRef Id="INSTALLDIR_PARADIGMS32" />
</Fragment>
<Fragment>
<ComponentGroup Id="GME.MGA.Parser">
- <Component Id="GME.MGA.Parser.dll" Directory="INSTALLDIR_BIN" Guid="{9DF42C34-5F58-4158-BD50-454864B9DFD6}">
+ <Component Id="GME.MGA.Parser.dll" Directory="INSTALLDIR_PARADIGMS32" Guid="{9DF42C34-5F58-4158-BD50-454864B9DFD6}">
<File Id="GME.MGA.Parser.dll" KeyPath="yes" Source="$(var.PIADir)\GME.MGA.Parser.dll" Assembly=".net" />
</Component>
</ComponentGroup>
</Fragment>
-</Wix>
\ No newline at end of file
+</Wix>
Modified: trunk/Install/PIAs/GME.MGA.wxi
==============================================================================
--- trunk/Install/PIAs/GME.MGA.wxi Fri Dec 9 09:25:16 2011 (r1741)
+++ trunk/Install/PIAs/GME.MGA.wxi Fri Dec 9 09:25:38 2011 (r1742)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
- <DirectoryRef Id="INSTALLDIR_BIN" />
+ <DirectoryRef Id="INSTALLDIR_PARADIGMS32" />
</Fragment>
<Fragment>
<ComponentGroup Id="GME.MGA">
- <Component Id="GME.MGA.dll" Directory="INSTALLDIR_BIN" Guid="{4C5478E1-D9FF-4E93-B87C-B847F398408A}">
+ <Component Id="GME.MGA.dll" Directory="INSTALLDIR_PARADIGMS32" Guid="{4C5478E1-D9FF-4E93-B87C-B847F398408A}">
<File Id="GME.MGA.dll" KeyPath="yes" Source="$(var.PIADir)\GME.MGA.dll" Assembly=".net" />
</Component>
</ComponentGroup>
</Fragment>
-</Wix>
\ No newline at end of file
+</Wix>
Modified: trunk/Install/PIAs/GME.Util.wxi
==============================================================================
--- trunk/Install/PIAs/GME.Util.wxi Fri Dec 9 09:25:16 2011 (r1741)
+++ trunk/Install/PIAs/GME.Util.wxi Fri Dec 9 09:25:38 2011 (r1742)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
- <DirectoryRef Id="INSTALLDIR_BIN" />
+ <DirectoryRef Id="INSTALLDIR_PARADIGMS32" />
</Fragment>
<Fragment>
<ComponentGroup Id="GME.Util">
- <Component Id="GME.Util.dll" Directory="INSTALLDIR_BIN" Guid="{074746CF-EA1A-4B45-899E-D4D6C5B6FEB0}">
+ <Component Id="GME.Util.dll" Directory="INSTALLDIR_PARADIGMS32" Guid="{074746CF-EA1A-4B45-899E-D4D6C5B6FEB0}">
<File Id="GME.Util.dll" KeyPath="yes" Source="$(var.PIADir)\GME.Util.dll" Assembly=".net" />
</Component>
</ComponentGroup>
</Fragment>
-</Wix>
\ No newline at end of file
+</Wix>
Modified: trunk/Install/PIAs/GMEPIA.wxi
==============================================================================
--- trunk/Install/PIAs/GMEPIA.wxi Fri Dec 9 09:25:16 2011 (r1741)
+++ trunk/Install/PIAs/GMEPIA.wxi Fri Dec 9 09:25:38 2011 (r1742)
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
- <DirectoryRef Id="INSTALLDIR_BIN" />
+ <DirectoryRef Id="INSTALLDIR_PARADIGMS32" />
</Fragment>
<Fragment>
<ComponentGroup Id="GME">
- <Component Id="GME.dll" Directory="INSTALLDIR_BIN" Guid="{B4C1E329-1964-4941-901B-077CC0A64A83}">
+ <Component Id="GME.dll" Directory="INSTALLDIR_PARADIGMS32" Guid="{B4C1E329-1964-4941-901B-077CC0A64A83}">
<File Id="GME.dll" KeyPath="yes" Source="$(var.PIADir)\GME.dll" Assembly=".net" />
</Component>
</ComponentGroup>
</Fragment>
-</Wix>
\ No newline at end of file
+</Wix>
Modified: trunk/Install/PIAs_1.0.1.0/GMEPIA.wxi
==============================================================================
--- trunk/Install/PIAs_1.0.1.0/GMEPIA.wxi Fri Dec 9 09:25:16 2011 (r1741)
+++ trunk/Install/PIAs_1.0.1.0/GMEPIA.wxi Fri Dec 9 09:25:38 2011 (r1742)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
- <DirectoryRef Id="INSTALLDIR_BIN">
+ <DirectoryRef Id="INSTALLDIR_PARADIGMS32">
<Directory Id="PIADIR.1.0.1.0" Name="PIA1.0.1.0"/>
</DirectoryRef>
</Fragment>
Modified: trunk/Tests/GPyUnit/test_gmeoleapp.py
==============================================================================
--- trunk/Tests/GPyUnit/test_gmeoleapp.py Fri Dec 9 09:25:16 2011 (r1741)
+++ trunk/Tests/GPyUnit/test_gmeoleapp.py Fri Dec 9 09:25:38 2011 (r1742)
@@ -8,7 +8,11 @@
gme.Exit()
# under _DEBUG, GME.exe does not exit until Release()ed
del(gme)
-
+
+ def test_PIAs(self):
+ import os.path
+ self.assertTrue(os.path.isfile(r"c:\Windows\assembly\GAC_MSIL\GME\1.0.0.0__f240a760fe751c2e\GME.dll"))
+
def test_Console(self):
import win32com.client
More information about the gme-commit
mailing list