[commit] r2395 - in trunk: GME/DotNetPIAs Install Install/Build SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Tue Nov 5 14:08:52 CST 2013
Author: ksmyth
Date: Tue Nov 5 14:08:52 2013
New Revision: 2395
Log:
Register PIAs under v4.0 Assemblies\Extensions for VS 2012. Register ISIS.GME.Common under v4.0
Modified:
trunk/GME/DotNetPIAs/DotNetPIAs.vcxproj
trunk/Install/Build/build.py
trunk/Install/GME_bin.wxs
trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties/AssemblyInfo.cs
Modified: trunk/GME/DotNetPIAs/DotNetPIAs.vcxproj
==============================================================================
--- trunk/GME/DotNetPIAs/DotNetPIAs.vcxproj Fri Oct 25 12:55:51 2013 (r2394)
+++ trunk/GME/DotNetPIAs/DotNetPIAs.vcxproj Tue Nov 5 14:08:52 2013 (r2395)
@@ -120,6 +120,7 @@
<Exec Command=""$(SDK35ToolsPath)\gacutil" /nologo /i $(OutName).dll" />
<!-- nb must execute 32bit -->
<Exec Command="reg add HKLM\SOFTWARE\Microsoft\.NETFramework\v2.0.50727\AssemblyFoldersEx\$([System.IO.Path]::GetFileName($(OutName))) /ve /d c:\WINDOWS\assembly\GAC_MSIL\$([System.IO.Path]::GetFileName($(OutName)))\$(PIAVersion)__f240a760fe751c2e /f" />
+ <Exec Command="reg add HKLM\SOFTWARE\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\$([System.IO.Path]::GetFileName($(OutName))) /ve /d c:\WINDOWS\assembly\GAC_MSIL\$([System.IO.Path]::GetFileName($(OutName)))\$(PIAVersion)__f240a760fe751c2e /f" />
</Target>
<Target Name="AfterBuild">
<MSBuild Properties="OutName=..\DotNetPIAs_1.0.0.0\GME.MGA.Core;PIAVersion=1.0.0.0" Projects="$(MSBuildProjectFullPath)" Targets="RegisterPIA" />
Modified: trunk/Install/Build/build.py
==============================================================================
--- trunk/Install/Build/build.py Fri Oct 25 12:55:51 2013 (r2394)
+++ trunk/Install/Build/build.py Tue Nov 5 14:08:52 2013 (r2395)
@@ -211,6 +211,7 @@
def compile_tools():
"Compile external tool components"
+ import _winreg
# Auto Layout
sln_file = os.path.join(GME_ROOT, "Tools", "AutoLayout", "AutoLayout.sln")
@@ -218,14 +219,16 @@
sln_file = os.path.join(GME_ROOT, "SDK", "DotNet", "DsmlGenerator", "DsmlGenerator.sln")
tools.build_VS(sln_file, "Release", arch='Any CPU', msbuild=(prefs['arch'] == 'x64' and tools.MSBUILD.replace('Framework', 'Framework64') or tools.MSBUILD))
-
+
+ with _winreg.CreateKeyEx(_winreg.HKEY_LOCAL_MACHINE, r"SOFTWARE\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\ISIS.GME.Common", 0, _winreg.KEY_WOW64_32KEY | _winreg.KEY_WRITE | _winreg.KEY_READ) as key:
+ _winreg.SetValueEx(key, None, 0, _winreg.REG_SZ, os.path.join(os.environ['windir'], r"Microsoft.NET\assembly\GAC_MSIL\ISIS.GME.Common\v4.0_1.0.4.0__1321e6b92842fe54"))
+
sln_file = os.path.join(GME_ROOT, "Tools", "DumpWMF", "DumpWMF.sln")
tools.build_VS(sln_file, "Release", arch='Any CPU', msbuild=(prefs['arch'] == 'x64' and tools.MSBUILD.replace('Framework', 'Framework64') or tools.MSBUILD))
if prefs['arch'] == 'x64':
tools.system([r'%windir%\Microsoft.NET\Framework64\v4.0.30319\RegAsm.exe', '/codebase',
os.path.join(GME_ROOT, 'Tools', 'DumpWMF', 'bin', 'Release', 'DumpWMF.dll')])
- import _winreg
with _winreg.OpenKey(_winreg.HKEY_CLASSES_ROOT, r"CLSID\{A051FEEA-E310-3F6A-8D71-A55E3F4F2E14}", 0, _winreg.KEY_WRITE | _winreg.KEY_WOW64_64KEY) as key:
_winreg.SetValueEx(key, "AppID", 0, _winreg.REG_SZ, "{461F30AF-3BF0-11D4-B3F0-005004D38590}")
Modified: trunk/Install/GME_bin.wxs
==============================================================================
--- trunk/Install/GME_bin.wxs Fri Oct 25 12:55:51 2013 (r2394)
+++ trunk/Install/GME_bin.wxs Tue Nov 5 14:08:52 2013 (r2395)
@@ -858,6 +858,30 @@
<RegistryValue Type='string' Value='[WindowsFolder]assembly\GAC_MSIL\GME\1.0.1.0__f240a760fe751c2e'/>
</RegistryKey>
</RegistryKey>
+ <RegistryKey Root='HKLM' Key='Software\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx'>
+ <RegistryKey Key='GME.MGA.Core' >
+ <RegistryValue Type='string' Value='[WindowsFolder]assembly\GAC_MSIL\GME.MGA.Core\1.0.1.0__f240a760fe751c2e'/>
+ </RegistryKey>
+ <RegistryKey Key='GME.MGA.Meta' >
+ <RegistryValue Type='string' Value='[WindowsFolder]assembly\GAC_MSIL\GME.MGA.Meta\1.0.1.0__f240a760fe751c2e'/>
+ </RegistryKey>
+ <RegistryKey Key='GME.MGA' >
+ <RegistryValue Type='string' Value='[WindowsFolder]assembly\GAC_MSIL\GME.MGA\1.0.1.0__f240a760fe751c2e'/>
+ </RegistryKey>
+ <RegistryKey Key='GME.MGA.Parser' >
+ <RegistryValue Type='string' Value='[WindowsFolder]assembly\GAC_MSIL\GME.MGA.Parser\1.1.0.0__f240a760fe751c2e'/>
+ </RegistryKey>
+ <RegistryKey Key='GME.Util' >
+ <RegistryValue Type='string' Value='[WindowsFolder]assembly\GAC_MSIL\GME.Util\1.0.1.0__f240a760fe751c2e'/>
+ </RegistryKey>
+ <RegistryKey Key='GME' >
+ <RegistryValue Type='string' Value='[WindowsFolder]assembly\GAC_MSIL\GME\1.0.1.0__f240a760fe751c2e'/>
+ </RegistryKey>
+
+ <RegistryKey Key='ISIS.GME.Common' >
+ <RegistryValue Type='string' Value='[WindowsFolder]Microsoft.NET\assembly\GAC_MSIL\ISIS.GME.Common\v4.0_1.0.4.0__1321e6b92842fe54'/>
+ </RegistryKey>
+ </RegistryKey>
</Component>
</DirectoryRef>
Modified: trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties/AssemblyInfo.cs
==============================================================================
--- trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties/AssemblyInfo.cs Fri Oct 25 12:55:51 2013 (r2394)
+++ trunk/SDK/DotNet/DsmlGenerator/ISIS.GME.Common/Properties/AssemblyInfo.cs Tue Nov 5 14:08:52 2013 (r2395)
@@ -22,15 +22,6 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("eef84a03-3f78-4ea0-a366-f2a3e8caf27e")]
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
+// also change GME_bin.wxs and build.py AssemblyFoldersEx
[assembly: AssemblyVersion("1.0.4.0")]
[assembly: AssemblyFileVersion("1.0.4.0")]
More information about the gme-commit
mailing list