[commit] r2472 - in trunk/Install: . Build
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Fri Apr 18 13:30:29 CDT 2014
Author: ksmyth
Date: Fri Apr 18 13:30:29 2014
New Revision: 2472
Log:
Add publisher policy redirects for PIAs.
Modified:
trunk/Install/Build/build.py
trunk/Install/GME.wxs
trunk/Install/GME_paradigms.wxs
Modified: trunk/Install/Build/build.py
==============================================================================
--- trunk/Install/Build/build.py Fri Apr 18 11:09:50 2014 (r2471)
+++ trunk/Install/Build/build.py Fri Apr 18 13:30:29 2014 (r2472)
@@ -135,7 +135,17 @@
tools.system( ['call', 'regrelease.bat'] + (['x64'] if prefs['arch'] == 'x64' else []) + ['<NUL'], cmd_dir)
sln_file = os.path.join(GME_ROOT, "GME", "DotNetPIAs", "DotNetPIAs.vcxproj")
tools.build_VS( sln_file, "Release" )
-
+
+ for filename in ('policy.1.0.GME.MGA.Core', 'policy.1.0.GME.MGA.Meta', 'policy.1.0.GME.MGA', 'policy.1.0.GME', 'policy.1.0.GME.Util', 'policy.1.0.GME.MGA.Parser'):
+ pia_dir = os.path.join(GME_ROOT, "GME", "DotNetPIAs_1.0.1.0")
+ config = '%s.config' % filename
+ dll = '%s.dll' % filename
+ if newer(os.path.join(pia_dir, config), os.path.join(pia_dir, dll)):
+ tools.system([r'C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\al.exe',
+ '/link:' + config, '/out:' + dll,
+ '/keyfile:..\MgaDotNetServices\MgaDotNetServicesKey.snk', '/platform:anycpu', '/version:1.0.0.0'], pia_dir)
+ tools.system([r'C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\gacutil.exe', '/i', dll], pia_dir)
+
def _Release_PGO_dir():
if prefs['arch'] == 'x64':
return os.path.join(GME_ROOT, 'GME', 'x64', 'Release_PGO')
Modified: trunk/Install/GME.wxs
==============================================================================
--- trunk/Install/GME.wxs Fri Apr 18 11:09:50 2014 (r2471)
+++ trunk/Install/GME.wxs Fri Apr 18 13:30:29 2014 (r2472)
@@ -121,12 +121,6 @@
<!-- =========================================================== -->
<DirectoryRef Id='TARGETDIR'>
<?if $(sys.BUILDARCH)=x86 ?>
- <Merge Id="CRT" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC90_CRT_$(sys.BUILDARCH).msm" DiskId="1" />
- <Merge Id="CRT Policy" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\policy_9_0_Microsoft_VC90_CRT_$(sys.BUILDARCH).msm" DiskId="1" />
- <Merge Id="MFC" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC90_MFC_$(sys.BUILDARCH).msm" DiskId="1" />
- <Merge Id="MFC Policy" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\policy_9_0_Microsoft_VC90_MFC_$(sys.BUILDARCH).msm" DiskId="1" />
- <Merge Id="ATL" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC90_ATL_$(sys.BUILDARCH).msm" DiskId="1" />
- <Merge Id="ATL Policy" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\policy_9_0_Microsoft_VC90_ATL_$(sys.BUILDARCH).msm" DiskId="1" />
<?endif?>
<Merge Id="CRT100" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_CRT_$(sys.BUILDARCH).msm" DiskId="1" />
<Merge Id="MFC100" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_MFC_$(sys.BUILDARCH).msm" DiskId="1" />
@@ -167,12 +161,6 @@
<?endif?>
<?if $(sys.BUILDARCH)=x86 ?>
- <MergeRef Id='CRT' />
- <MergeRef Id='CRT Policy' />
- <MergeRef Id='MFC' />
- <MergeRef Id='MFC Policy' />
- <MergeRef Id='ATL' />
- <MergeRef Id='ATL Policy' />
<?endif?>
<MergeRef Id='CRT100' />
Modified: trunk/Install/GME_paradigms.wxs
==============================================================================
--- trunk/Install/GME_paradigms.wxs Fri Apr 18 11:09:50 2014 (r2471)
+++ trunk/Install/GME_paradigms.wxs Fri Apr 18 13:30:29 2014 (r2472)
@@ -87,5 +87,39 @@
<ComponentGroupRef Id='GME.MGA.Meta'/>
<ComponentGroupRef Id='GME.MGA.Parser'/>
<ComponentGroupRef Id='GME.Util'/>
+
+ <DirectoryRef Id="INSTALLDIR_PARADIGMS32">
+ <Directory Id="PIApolicy" Name="PIApolicy"/>
+ </DirectoryRef>
+ <Component Directory="PIApolicy" Guid="{E9E9C0FB-4B8D-4F27-90A4-7987A822B956}">
+ <Condition>NETFRAMEWORK</Condition>
+ <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.dll" Assembly=".net" KeyPath="yes"/>
+ <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.config"/>
+ </Component>
+ <Component Directory="PIApolicy" Guid="{877114E5-6F7D-41C7-9985-0E6B01044EF4}">
+ <Condition>NETFRAMEWORK</Condition>
+ <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.dll" Assembly=".net" KeyPath="yes"/>
+ <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.config"/>
+ </Component>
+ <Component Directory="PIApolicy" Guid="{F3995FC8-B839-4807-9363-079DEE3D9283}">
+ <Condition>NETFRAMEWORK</Condition>
+ <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.Core.dll" Assembly=".net" KeyPath="yes"/>
+ <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.Core.config"/>
+ </Component>
+ <Component Directory="PIApolicy" Guid="{54513982-DA3B-4165-AD08-A8989007DB88}">
+ <Condition>NETFRAMEWORK</Condition>
+ <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.Meta.dll" Assembly=".net" KeyPath="yes"/>
+ <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.Meta.config"/>
+ </Component>
+ <Component Directory="PIApolicy" Guid="{74AED912-FAA1-4604-A638-06CF214731FD}">
+ <Condition>NETFRAMEWORK</Condition>
+ <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.Util.dll" Assembly=".net" KeyPath="yes"/>
+ <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.Util.config"/>
+ </Component>
+ <Component Directory="PIApolicy" Guid="{CCF7A1A5-60BA-42C0-AB42-1637E11210EB}">
+ <Condition>NETFRAMEWORK</Condition>
+ <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.Parser.dll" Assembly=".net" KeyPath="yes"/>
+ <File Source="..\GME\DotNetPIAs_1.0.1.0\policy.1.0.GME.MGA.Parser.config"/>
+ </Component>
</Module>
</Wix>
More information about the gme-commit
mailing list