[commit] r1346 - in trunk: GME/DotNetPIAs Install Install/Build
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Wed Jun 8 18:59:52 CDT 2011
Author: ksmyth
Date: Wed Jun 8 18:59:52 2011
New Revision: 1346
Log:
Try putting MGACoreLib PIA in installer
Added:
trunk/GME/DotNetPIAs/MGACoreLib.wxi (contents, props changed)
Modified:
trunk/Install/Build/build.py
trunk/Install/Build/tools.py
trunk/Install/GME.wxs
Added: trunk/GME/DotNetPIAs/MGACoreLib.wxi
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/GME/DotNetPIAs/MGACoreLib.wxi Wed Jun 8 18:59:52 2011 (r1346)
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Fragment>
+ <DirectoryRef Id="INSTALLDIR_BIN" />
+ </Fragment>
+ <Fragment>
+ <ComponentGroup Id="Interop.MGACoreLib">
+ <Component Id="Interop.MGACoreLib.dll" Directory="INSTALLDIR_BIN" Guid="{2F807B57-6B1F-471C-9A08-4F6D8CFD7CDE}">
+ <File Id="Interop.MGACoreLib.dll" KeyPath="yes" Source="$(var.PIADir)\Interop.MGACoreLib.dll" Assembly=".net"/>
+ <RegistryValue Root="HKCR" Key="CLSID\{7281C07A-3E09-11D3-B2F7-005004D38590}\InprocServer32\0.1.0.0" Name="Class" Value="Interop.MGACoreLib.CoreBinFileClass" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{7281C07A-3E09-11D3-B2F7-005004D38590}\InprocServer32\0.1.0.0" Name="Assembly" Value="Interop.MGACoreLib, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{7281C07A-3E09-11D3-B2F7-005004D38590}\InprocServer32\0.1.0.0" Name="RuntimeVersion" Value="v2.0.50727" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{7281C07A-3E09-11D3-B2F7-005004D38590}\InprocServer32\0.1.0.0" Name="CodeBase" Value="file:///[#Interop.MGACoreLib.dll]" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{7281C07A-3E09-11D3-B2F7-005004D38590}\InprocServer32" Name="Class" Value="Interop.MGACoreLib.CoreBinFileClass" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{7281C07A-3E09-11D3-B2F7-005004D38590}\InprocServer32" Name="Assembly" Value="Interop.MGACoreLib, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{7281C07A-3E09-11D3-B2F7-005004D38590}\InprocServer32" Name="RuntimeVersion" Value="v2.0.50727" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{7281C07A-3E09-11D3-B2F7-005004D38590}\InprocServer32" Name="CodeBase" Value="file:///[#Interop.MGACoreLib.dll]" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{98AA02DD-2E2C-11D3-B36D-0060082DF884}\InprocServer32\0.1.0.0" Name="Class" Value="Interop.MGACoreLib.CoreMetaProjectClass" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{98AA02DD-2E2C-11D3-B36D-0060082DF884}\InprocServer32\0.1.0.0" Name="Assembly" Value="Interop.MGACoreLib, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{98AA02DD-2E2C-11D3-B36D-0060082DF884}\InprocServer32\0.1.0.0" Name="RuntimeVersion" Value="v2.0.50727" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{98AA02DD-2E2C-11D3-B36D-0060082DF884}\InprocServer32\0.1.0.0" Name="CodeBase" Value="file:///[#Interop.MGACoreLib.dll]" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{98AA02DD-2E2C-11D3-B36D-0060082DF884}\InprocServer32" Name="Class" Value="Interop.MGACoreLib.CoreMetaProjectClass" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{98AA02DD-2E2C-11D3-B36D-0060082DF884}\InprocServer32" Name="Assembly" Value="Interop.MGACoreLib, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{98AA02DD-2E2C-11D3-B36D-0060082DF884}\InprocServer32" Name="RuntimeVersion" Value="v2.0.50727" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{98AA02DD-2E2C-11D3-B36D-0060082DF884}\InprocServer32" Name="CodeBase" Value="file:///[#Interop.MGACoreLib.dll]" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{AD9DFA4F-2A3B-11D3-B36C-0060082DF884}\InprocServer32\0.1.0.0" Name="Class" Value="Interop.MGACoreLib.CoreProjectClass" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{AD9DFA4F-2A3B-11D3-B36C-0060082DF884}\InprocServer32\0.1.0.0" Name="Assembly" Value="Interop.MGACoreLib, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{AD9DFA4F-2A3B-11D3-B36C-0060082DF884}\InprocServer32\0.1.0.0" Name="RuntimeVersion" Value="v2.0.50727" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{AD9DFA4F-2A3B-11D3-B36C-0060082DF884}\InprocServer32\0.1.0.0" Name="CodeBase" Value="file:///[#Interop.MGACoreLib.dll]" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{AD9DFA4F-2A3B-11D3-B36C-0060082DF884}\InprocServer32" Name="Class" Value="Interop.MGACoreLib.CoreProjectClass" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{AD9DFA4F-2A3B-11D3-B36C-0060082DF884}\InprocServer32" Name="Assembly" Value="Interop.MGACoreLib, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{AD9DFA4F-2A3B-11D3-B36C-0060082DF884}\InprocServer32" Name="RuntimeVersion" Value="v2.0.50727" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="CLSID\{AD9DFA4F-2A3B-11D3-B36C-0060082DF884}\InprocServer32" Name="CodeBase" Value="file:///[#Interop.MGACoreLib.dll]" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="Record\{26F4BA40-BAA0-3C7D-845C-D548D4736070}\0.1.0.0" Name="Class" Value="Interop.MGACoreLib.transtype_enum" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="Record\{26F4BA40-BAA0-3C7D-845C-D548D4736070}\0.1.0.0" Name="Assembly" Value="Interop.MGACoreLib, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="Record\{26F4BA40-BAA0-3C7D-845C-D548D4736070}\0.1.0.0" Name="RuntimeVersion" Value="v2.0.50727" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="Record\{26F4BA40-BAA0-3C7D-845C-D548D4736070}\0.1.0.0" Name="CodeBase" Value="file:///[#Interop.MGACoreLib.dll]" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="Record\{386E4366-00A7-3690-9D83-85AA96780404}\0.1.0.0" Name="Class" Value="Interop.MGACoreLib.GMEInterfaceVersion_enum" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="Record\{386E4366-00A7-3690-9D83-85AA96780404}\0.1.0.0" Name="Assembly" Value="Interop.MGACoreLib, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="Record\{386E4366-00A7-3690-9D83-85AA96780404}\0.1.0.0" Name="RuntimeVersion" Value="v2.0.50727" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="Record\{386E4366-00A7-3690-9D83-85AA96780404}\0.1.0.0" Name="CodeBase" Value="file:///[#Interop.MGACoreLib.dll]" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="Record\{61CEAE6C-DD5A-3EFF-AC8E-3A78692A4443}\0.1.0.0" Name="Class" Value="Interop.MGACoreLib.valtype_enum" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="Record\{61CEAE6C-DD5A-3EFF-AC8E-3A78692A4443}\0.1.0.0" Name="Assembly" Value="Interop.MGACoreLib, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="Record\{61CEAE6C-DD5A-3EFF-AC8E-3A78692A4443}\0.1.0.0" Name="RuntimeVersion" Value="v2.0.50727" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="Record\{61CEAE6C-DD5A-3EFF-AC8E-3A78692A4443}\0.1.0.0" Name="CodeBase" Value="file:///[#Interop.MGACoreLib.dll]" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="Record\{6D9C1056-A181-383B-A68A-6D35DCFB3C81}\0.1.0.0" Name="Class" Value="Interop.MGACoreLib.locking_enum" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="Record\{6D9C1056-A181-383B-A68A-6D35DCFB3C81}\0.1.0.0" Name="Assembly" Value="Interop.MGACoreLib, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="Record\{6D9C1056-A181-383B-A68A-6D35DCFB3C81}\0.1.0.0" Name="RuntimeVersion" Value="v2.0.50727" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="Record\{6D9C1056-A181-383B-A68A-6D35DCFB3C81}\0.1.0.0" Name="CodeBase" Value="file:///[#Interop.MGACoreLib.dll]" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="TypeLib\{9E9AAACF-28B8-11D3-B36C-0060082DF884}\1.0" Name="PrimaryInteropAssemblyName" Value="Interop.MGACoreLib, Version=0.1.0.0, Culture=neutral, PublicKeyToken=f240a760fe751c2e" Type="string" Action="write" />
+ <RegistryValue Root="HKCR" Key="TypeLib\{9E9AAACF-28B8-11D3-B36C-0060082DF884}\1.0" Name="PrimaryInteropAssemblyCodeBase" Value="file:///[#Interop.MGACoreLib.dll]" Type="string" Action="write" />
+ </Component>
+ </ComponentGroup>
+ </Fragment>
+</Wix>
\ No newline at end of file
Modified: trunk/Install/Build/build.py
==============================================================================
--- trunk/Install/Build/build.py Wed Jun 8 18:26:49 2011 (r1345)
+++ trunk/Install/Build/build.py Wed Jun 8 18:59:52 2011 (r1346)
@@ -210,7 +210,8 @@
f.close()
# Build the msi file
- tools.build_WiX(os.path.join(GME_ROOT, "Install", "GME.wxs"))
+ tools.build_WiX([ os.path.join(GME_ROOT, "Install", "GME.wxs"),
+ os.path.join(GME_ROOT, "GME", "DotNetPIAS", "MGACoreLib.wxi")])
def zip_pdb():
"Collect and zip all debug information (*.pdb)"
Modified: trunk/Install/Build/tools.py
==============================================================================
--- trunk/Install/Build/tools.py Wed Jun 8 18:26:49 2011 (r1345)
+++ trunk/Install/Build/tools.py Wed Jun 8 18:59:52 2011 (r1346)
@@ -16,9 +16,9 @@
#
ZIP_PRG = os.path.abspath(os.path.join(os.path.dirname(__file__), "zip.exe"))
WIX_CANDLE_PRG = "candle.exe"
-WIX_CANDLE_ARG = ""
+WIX_CANDLE_ARG = "-dPIADir=..\GME\DotNetPIAs"
WIX_LIGHT_PRG = "light.exe"
-WIX_LIGHT_ARG = "-sw1076 -sw1055 -sw1056 -sice:ICE43 -sice:ICE57 -ext WixUIExtension -ext WixUtilExtension" # See comments in GME.wxs
+WIX_LIGHT_ARG = "-sw1076 -sw1055 -sw1056 -sice:ICE43 -sice:ICE57 -ext WixUIExtension -ext WixUtilExtension -o GME.msi" # See comments in GME.wxs
#
# Classes
@@ -175,13 +175,13 @@
exepath = os.path.join(os.environ['WIX'], 'bin', exepath)
system([exepath])
-def build_WiX(wxs_file):
+def build_WiX(wxs_files):
"""
Builds a WiX project.
params
wxs_file : full path to the WiX source (.wxs)
"""
- fullpath = os.path.normpath(os.path.abspath(wxs_file))
+ fullpath = os.path.normpath(os.path.abspath(wxs_files[0]))
dirname = os.path.dirname(fullpath)
filename = os.path.basename(fullpath)
(projectname, ext) = os.path.splitext(filename)
@@ -191,11 +191,12 @@
exepath = WIX_CANDLE_PRG
if 'WIX' in os.environ.keys():
exepath = os.path.join(os.environ['WIX'], 'bin', exepath)
- cmd_line = [exepath] + WIX_CANDLE_ARG.split() + [filename]
- system(cmd_line, dirname)
+ for file in wxs_files:
+ cmd_line = [exepath] + WIX_CANDLE_ARG.split() + [file]
+ system(cmd_line, dirname)
exepath = WIX_LIGHT_PRG
if 'WIX' in os.environ.keys():
exepath = os.path.join(os.environ['WIX'], 'bin', exepath)
- cmd_line = [exepath] + WIX_LIGHT_ARG.split() + [projectname + ".wixobj"]
+ cmd_line = [exepath] + WIX_LIGHT_ARG.split() + [ os.path.splitext(os.path.basename(file))[0] + ".wixobj" for file in wxs_files ]
system(cmd_line, dirname)
Modified: trunk/Install/GME.wxs
==============================================================================
--- trunk/Install/GME.wxs Wed Jun 8 18:26:49 2011 (r1345)
+++ trunk/Install/GME.wxs Wed Jun 8 18:59:52 2011 (r1346)
@@ -53,6 +53,7 @@
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' RequiredVersion='3.0.4813.0'>
<?include GME_dyn.wxi ?>
+ <?define InteropDir='..\GME\DotNetPIAs' ?>
@@ -2293,6 +2294,8 @@
<ComponentRef Id='xerces_c_3_1.dll' />
<ComponentRef Id='XmlBackEnd.dll' />
<ComponentRef Id='GMEplink.exe' />
+
+ <ComponentRef Id='Interop.MGACoreLib.dll'/>
<MergeRef Id='CRT' />
<MergeRef Id='CRT Policy' />
More information about the gme-commit
mailing list