[commit] r2743 - in trunk/Install: . Build

GMESRC Repository Notifications gme-commit at list.isis.vanderbilt.edu
Wed Feb 21 11:53:22 CST 2018 

Author: ksmyth
Date: Wed Feb 21 11:53:22 2018
New Revision: 2743

Log:
Add x64 CSharpDsmlGenerator

Modified:
   trunk/Install/Build/build.py
   trunk/Install/Build/tools.py
   trunk/Install/GME.wxs
   trunk/Install/GME_SDK.wxs

Modified: trunk/Install/Build/build.py
==============================================================================
--- trunk/Install/Build/build.py	Mon Feb  5 11:29:06 2018	(r2742)
+++ trunk/Install/Build/build.py	Wed Feb 21 11:53:22 2018	(r2743)
@@ -389,7 +389,6 @@
     import glob
     sources = [f for f in glob.glob(os.path.join(GME_ROOT, "Install", "*.wxs")) if os.path.basename(f) not in ('GME.wxs', 'GME_bundle.wxs')]
     if prefs['arch'] == 'x64':
-        sources.remove(os.path.join(GME_ROOT, "Install", "GME_SDK.wxs"))
         sources.remove(os.path.join(GME_ROOT, "Install", "GME_paradigms.wxs"))
     for file_ in sources:
         extras = []

Modified: trunk/Install/Build/tools.py
==============================================================================
--- trunk/Install/Build/tools.py	Mon Feb  5 11:29:06 2018	(r2742)
+++ trunk/Install/Build/tools.py	Wed Feb 21 11:53:22 2018	(r2743)
@@ -243,7 +243,7 @@
             ext = '.msi'
             wixlibs = WIX_LIGHT_ARG.split() + ['GME_bin.wixlib', 'GME_SDK.wixlib', 'GME_paradigms.wixlib']
             if prefs['arch'] == 'x64':
-                wixlibs += ['GME_bin_x64.wixlib']
+                wixlibs += ['GME_bin_x64.wixlib', 'GME_SDK_x64.wixlib']
         cmd_line = [exepath] + ['-o', _x64_suffix(os.path.splitext(wxs)[0]) + ext] + [ _get_wixobj(file) for file in wxi_files ] + [ _get_wixobj(wxs)] + wixlibs
         system(cmd_line, dirname)
 

Modified: trunk/Install/GME.wxs
==============================================================================
--- trunk/Install/GME.wxs	Mon Feb  5 11:29:06 2018	(r2742)
+++ trunk/Install/GME.wxs	Wed Feb 21 11:53:22 2018	(r2743)
@@ -235,7 +235,7 @@
             </Directory>
             <Directory Id='INSTALLDIR_SDK_PATTERNPROCESSORx86' Name='PatternProcessor' />
             <Directory Id='INSTALLDIR_SDK_DOTNET' Name='DotNet'>
-              <Directory Id='INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR' Name='CSharpDSMLGenerator'>
+              <Directory Id='INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATORx86' Name='CSharpDSMLGenerator'>
                 <Directory Id='INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR_1_0_4_0' Name='1.0.4.0'/>
               </Directory>
             </Directory>
@@ -310,6 +310,9 @@
           <Directory Id='INSTALLDIR_SDKx64' Name='SDK'>
             <Directory Id='INSTALLDIR_SDK_JAVAx64' Name='Java' />
             <Directory Id='INSTALLDIR_SDK_PATTERNPROCESSORx64' Name='PatternProcessor' />
+            <Directory Id='INSTALLDIR_SDK_DOTNETx64' Name='DotNet'>
+              <Directory Id='INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATORx64' Name='CSharpDSMLGenerator'/>
+            </Directory>
           </Directory>
           <Directory Id='INSTALLDIR_TOOLSx64' Name='Tools' />
           <Directory Id='INSTALLDIR_LIBSx64' Name='Lib' />
@@ -330,6 +333,7 @@
         <ComponentGroupRef Id='GME_SDKx86' />
         <ComponentGroupRef Id='GME_paradigmsx86' />
         <?if $(sys.BUILDARCH)=x64 ?>
+        <ComponentGroupRef Id='GME_SDKx64' />
         <ComponentGroupRef Id='GME_binx64' />
         <?endif?>
 

Modified: trunk/Install/GME_SDK.wxs
==============================================================================
--- trunk/Install/GME_SDK.wxs	Mon Feb  5 11:29:06 2018	(r2742)
+++ trunk/Install/GME_SDK.wxs	Wed Feb 21 11:53:22 2018	(r2743)
@@ -10,15 +10,9 @@
     <PropertyRef Id="NETFRAMEWORK40FULL"/>
     <PropertyRef Id="NETFRAMEWORK40CLIENT"/>
 
-    <?if $(sys.BUILDARCH)=x86 ?>
     <ComponentGroup Id='GME_SDK$(sys.BUILDARCH)'>
-      <Component Id="MetaParadigmFiles" Guid="18535c6e-aeff-4e89-b262-f3eb0a7854ee" Directory="INSTALLDIR_PARADIGMS_METAGMEx86">
-        <File Id="MetaGME.xmp" Name="MetaGME.xmp" KeyPath="yes" Source="..\Paradigms\MetaGME\MetaGME.xmp" />
-        <File Id="MetaGME_model.xme" Name="MetaGME-model.xme" Source="..\Paradigms\MetaGME\MetaGME-model.xme" />
-      </Component>
-
-      <Component Id="CSharpDSMLGenerator.dll" Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR">
-        <File Id="CSharpDSMLGenerator.dll" Name="CSharpDSMLGenerator.dll" KeyPath="yes" Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\bin\Release\CSharpDSMLGenerator.dll" />
+      <Component Id="CSharpDSMLGenerator.dll$(sys.BUILDARCH)" Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR$(sys.BUILDARCH)">
+        <File Id="CSharpDSMLGenerator.dll$(sys.BUILDARCH)" Name="CSharpDSMLGenerator.dll" KeyPath="yes" Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\bin\Release\CSharpDSMLGenerator.dll" />
         <Class Id="{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}" Context="InprocServer32" Description="MGA.Interpreter.CSharpDSMLGenerator" ThreadingModel="both" ForeignServer="mscoree.dll">
           <ProgId Id="MGA.Interpreter.CSharpDSMLGenerator" Description="MGA.Interpreter.CSharpDSMLGenerator" />
         </Class>
@@ -26,11 +20,11 @@
         <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="Class" Value="CSharpDSMLGenerator.CSharpDSMLGeneratorInterpreter" Type="string" Action="write" />
         <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="Assembly" Value="CSharpDSMLGenerator, Version=1.0.17.1, Culture=neutral" Type="string" Action="write" />
         <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="RuntimeVersion" Value="v4.0.30319" Type="string" Action="write" />
-        <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="CodeBase" Value="file:///[#CSharpDSMLGenerator.dll]" Type="string" Action="write" />
+        <RegistryValue Root="HKCR" Key="CLSID\{78BE7B95-3564-4BA9-8FE6-8D9B91EEE0B8}\InprocServer32" Name="CodeBase" Value="file:///[#CSharpDSMLGenerator.dll$(sys.BUILDARCH)]" Type="string" Action="write" />
         <RegistryValue Root="HKCR" Key="Component Categories\{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}" Name="0" Value=".NET Category" Type="string" Action="write" />
         <RegistryKey Root='HKLM' Key='Software\GME\Components\MGA.Interpreter.CSharpDSMLGenerator'>
           <RegistryValue Name='Description' Type='string' Value='CSharp (.Net) Dsml API Generator'/>
-          <RegistryValue Name='Icon' Type='string' Value='[#CSharpDSMLGenerator.ico]'/>
+          <RegistryValue Name='Icon' Type='string' Value='[#CSharpDSMLGenerator.ico$(sys.BUILDARCH)]'/>
           <RegistryValue Name='Paradigm' Type='string' Value='MetaGME'/>
           <RegistryValue Name='Tooltip' Type='string' Value='CSharp (.Net) Dsml API Generator'/>
           <RegistryValue Name='Type' Type='integer' Value='1'/>
@@ -40,10 +34,20 @@
           </RegistryKey>
         </RegistryKey>
       </Component>
-      <Component Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR">
-        <File Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\CSharpDSMLGenerator.ico" />
+      <Component Id="MgaMeta.dll$(sys.BUILDARCH)" Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR$(sys.BUILDARCH)">
+        <File Id="MgaMeta.dll$(sys.BUILDARCH)" Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\bin\Release\MgaMeta.dll" />
+      </Component>
+      <Component Id="CSharpDSMLGenerator.ico$(sys.BUILDARCH)" Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR$(sys.BUILDARCH)">
+        <File Id="CSharpDSMLGenerator.ico$(sys.BUILDARCH)" Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\CSharpDSMLGenerator.ico" />
       </Component>
-      <Component Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR" Guid="{AEE769E8-E82D-46AF-AF94-F61B2C41DF5A}" Permanent="yes">
+
+     <?if $(sys.BUILDARCH)=x86 ?>
+      <Component Id="MetaParadigmFiles" Guid="18535c6e-aeff-4e89-b262-f3eb0a7854ee" Directory="INSTALLDIR_PARADIGMS_METAGMEx86">
+        <File Id="MetaGME.xmp" Name="MetaGME.xmp" KeyPath="yes" Source="..\Paradigms\MetaGME\MetaGME.xmp" />
+        <File Id="MetaGME_model.xme" Name="MetaGME-model.xme" Source="..\Paradigms\MetaGME\MetaGME-model.xme" />
+      </Component>
+
+      <Component Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR$(sys.BUILDARCH)" Guid="{AEE769E8-E82D-46AF-AF94-F61B2C41DF5A}" Permanent="yes">
         <File Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\bin\Release\ISIS.GME.Common.dll" KeyPath="yes" Assembly=".net"/>
         <Condition>NETFRAMEWORK40</Condition>
       </Component>
@@ -51,9 +55,6 @@
         <File Id="ISIS.GME.Common.dll.1.0.4.0" Source="..\SDK\DotNet\DsmlGenerator\ISIS.GME.Common\1.0.4.0\ISIS.GME.Common.dll" KeyPath="yes" Assembly=".net"/>
         <Condition>NETFRAMEWORK40</Condition>
       </Component>
-      <Component Directory="INSTALLDIR_SDK_DOTNET_CSHARPDSMLGENERATOR">
-        <File Source="..\SDK\DotNet\DsmlGenerator\CSharpDsmlGenerator\bin\Release\MgaMeta.dll" />
-      </Component>
 
       <Component Id="BON2SFInterpreter.dll" Directory="INSTALLDIR_PARADIGMS_SF">
         <File Id="BON2SFInterpreter.dll" Name="BON2SFInterpreter.dll" KeyPath="yes" Source="..\Paradigms\SF\BON2SFInterpreter\$(var.Release)\BON2SFInterpreter.dll">

More information about the gme-commit mailing list