[commit] r1679 - in trunk: GME/Gme GME/MgaUtil Install
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Thu Nov 10 22:09:28 CST 2011
Author: ksmyth
Date: Thu Nov 10 22:09:28 2011
New Revision: 1679
Log:
Read paradigms from 32bit registry. Add GME_paradigms.wxs for 32bit paradigms and registry
Added:
trunk/Install/GME_paradigms.wxs
Modified:
trunk/GME/Gme/GME.vcxproj
trunk/GME/Gme/GME.vcxproj.filters
trunk/GME/MgaUtil/MgaRegistrar.cpp
trunk/Install/GME.wxs
trunk/Install/GME_bin.wxs
Modified: trunk/GME/Gme/GME.vcxproj
==============================================================================
--- trunk/GME/Gme/GME.vcxproj Thu Nov 10 22:09:11 2011 (r1678)
+++ trunk/GME/Gme/GME.vcxproj Thu Nov 10 22:09:28 2011 (r1679)
@@ -357,6 +357,7 @@
<SubType>Designer</SubType>
</None>
<None Include="..\..\Install\GME_inc.wxi" />
+ <None Include="..\..\Install\GME_paradigms.wxs" />
<None Include="..\..\Install\GME_SDK.wxs">
<SubType>Designer</SubType>
</None>
Modified: trunk/GME/Gme/GME.vcxproj.filters
==============================================================================
--- trunk/GME/Gme/GME.vcxproj.filters Thu Nov 10 22:09:11 2011 (r1678)
+++ trunk/GME/Gme/GME.vcxproj.filters Thu Nov 10 22:09:28 2011 (r1679)
@@ -367,6 +367,7 @@
</None>
<None Include="..\..\Install\GME_bin.wxs" />
<None Include="..\..\Install\GME_SDK.wxs" />
+ <None Include="..\..\Install\GME_paradigms.wxs" />
<None Include="..\..\Install\GME_inc.wxi" />
</ItemGroup>
<ItemGroup>
Modified: trunk/GME/MgaUtil/MgaRegistrar.cpp
==============================================================================
--- trunk/GME/MgaUtil/MgaRegistrar.cpp Thu Nov 10 22:09:11 2011 (r1678)
+++ trunk/GME/MgaUtil/MgaRegistrar.cpp Thu Nov 10 22:09:28 2011 (r1679)
@@ -1088,7 +1088,7 @@
if(mode & RM_SYSDOREAD) {
CRegKey pars;
- LONG res = pars.Open(HKEY_LOCAL_MACHINE, rootreg+_T("\\Paradigms"), KEY_READ);
+ LONG res = pars.Open(HKEY_LOCAL_MACHINE, rootreg+_T("\\Paradigms"), KEY_READ | KEY_WOW64_32KEY);
if(res != ERROR_SUCCESS && res != ERROR_ACCESS_DENIED && res != ERROR_FILE_NOT_FOUND) ERRTHROW(res);
if(res == ERROR_SUCCESS) {
for(int index = 0;; ++index) {
@@ -1338,7 +1338,7 @@
WIN32THROW(mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
CRegKey pars;
- WIN32THROW( pars.Create(mga, _T("Paradigms")) );
+ WIN32THROW( pars.Create(mga, _T("Paradigms"), 0, 0, KEY_READ | KEY_WRITE | KEY_WOW64_32KEY) );
CRegKey par;
@@ -1404,7 +1404,7 @@
if(mode & RM_SYSDOREAD) {
CRegKey par;
- LONG res = par.Open(HKEY_LOCAL_MACHINE, rootreg+_T("\\Paradigms\\") + pname, KEY_READ);
+ LONG res = par.Open(HKEY_LOCAL_MACHINE, rootreg+_T("\\Paradigms\\") + pname, KEY_READ | KEY_WOW64_32KEY);
if(res != ERROR_SUCCESS && res != ERROR_ACCESS_DENIED && res != ERROR_FILE_NOT_FOUND) ERRTHROW(res);
if(res == ERROR_SUCCESS) {
CString cur = QueryValue(par, _T("CurrentVersion"));
@@ -1481,7 +1481,7 @@
if(mode & RM_SYSDOREAD) {
CRegKey par;
- res = par.Open(HKEY_LOCAL_MACHINE, rootreg + _T("\\Paradigms\\") + pname, KEY_READ);
+ res = par.Open(HKEY_LOCAL_MACHINE, rootreg + _T("\\Paradigms\\") + pname, KEY_READ | KEY_WOW64_32KEY);
if(res == ERROR_SUCCESS) {
CString cur = QueryValue(par, _T("CurrentVersion"));
if(cur.IsEmpty()) {
@@ -1572,7 +1572,7 @@
}
if(mode & (RM_SYSDOREAD)) {
CRegKey par;
- res = par.Open(HKEY_LOCAL_MACHINE, rootreg + _T("\\Paradigms\\")+name, KEY_READ);
+ res = par.Open(HKEY_LOCAL_MACHINE, rootreg + _T("\\Paradigms\\")+name, KEY_READ | KEY_WOW64_32KEY);
if(res != ERROR_SUCCESS && res != ERROR_ACCESS_DENIED && res != ERROR_FILE_NOT_FOUND) ERRTHROW(res);
if(res == ERROR_SUCCESS) {
for(int index = 0;; ++index) {
@@ -1628,7 +1628,7 @@
}
if(mode & (RM_SYSDOREAD)) {
CRegKey par;
- res = par.Open(HKEY_LOCAL_MACHINE, rootreg + _T("\\Paradigms\\")+name, KEY_READ);
+ res = par.Open(HKEY_LOCAL_MACHINE, rootreg + _T("\\Paradigms\\")+name, KEY_READ | KEY_WOW64_32KEY);
if(res != ERROR_SUCCESS && res != ERROR_ACCESS_DENIED && res != ERROR_FILE_NOT_FOUND) ERRTHROW(res);
if(res == ERROR_SUCCESS) {
gstr = QueryValue(par, verstr);
@@ -1687,7 +1687,7 @@
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey par;
- ERRTHROW( par.Open(HKEY_LOCAL_MACHINE, rootreg + _T("\\Paradigms\\")+name) );
+ ERRTHROW( par.Open(HKEY_LOCAL_MACHINE, rootreg + _T("\\Paradigms\\")+name, KEY_READ | KEY_WRITE | KEY_WOW64_32KEY) );
CString cur = QueryValue(par, _T("CurrentVersion"));
if(cur.Compare(PutInCString(guidbstr)) == 0) {
COMTHROW(E_INVALID_USAGE);
@@ -1732,7 +1732,7 @@
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey pars;
- LONG res = pars.Open(HKEY_LOCAL_MACHINE, rootreg + _T("\\Paradigms"));
+ LONG res = pars.Open(HKEY_LOCAL_MACHINE, rootreg + _T("\\Paradigms"), KEY_READ | KEY_WRITE | KEY_WOW64_32KEY);
if(!res) {
if(mode & RM_SYS) res = pars.RecurseDeleteKey(PutInCString(name));
if(mode & RM_TEST) res = pars.Open(pars, PutInCString(name));
Modified: trunk/Install/GME.wxs
==============================================================================
--- trunk/Install/GME.wxs Thu Nov 10 22:09:11 2011 (r1678)
+++ trunk/Install/GME.wxs Thu Nov 10 22:09:28 2011 (r1679)
@@ -121,6 +121,7 @@
<Merge Id="GME_bin" Language="1033" SourceFile="GME_bin.msm" DiskId="1" />
<Merge Id="GME_SDK" Language="1033" SourceFile="GME_SDK.msm" DiskId="1"/>
+ <Merge Id="GME_paradigms" Language="1033" SourceFile="GME_paradigms.msm" DiskId="1"/>
<?if $(sys.BUILDARCH)=x64 ?>
<Merge Id="GME_bin_x64" Language="1033" SourceFile="GME_bin_x64.msm" DiskId="1" />
<?endif?>
@@ -137,6 +138,7 @@
Level='1'>
<MergeRef Id='GME_bin' />
+ <MergeRef Id='GME_paradigms' />
<?if $(sys.BUILDARCH)=x64 ?>
<MergeRef Id='GME_bin_x64'/>
<?endif?>
Modified: trunk/Install/GME_bin.wxs
==============================================================================
--- trunk/Install/GME_bin.wxs Thu Nov 10 22:09:11 2011 (r1678)
+++ trunk/Install/GME_bin.wxs Thu Nov 10 22:09:28 2011 (r1679)
@@ -418,18 +418,6 @@
</Component>
</DirectoryRef>
- <DirectoryRef Id="INSTALLDIR_PARADIGMS_METAGME">
- <Component Id="MetaGME.mta">
- <File Id="MetaGME.mta" Name="MetaGME.mta" Source="..\Paradigms\MetaGME\MetaGME.mta" />
- <RegistryKey Root='HKLM' Key='Software\GME\Paradigms\MetaGME'>
- <RegistryValue Name='CurrentVersion' Type='string' Value='$(var.GUIDSTRMETAGME)'/>
- <RegistryKey Key='$(var.GUIDSTRMETAGME)'>
- <RegistryValue Name='ConnStr' Type='string' Value='MGA=[INSTALLDIR_PARADIGMS_METAGME]MetaGME.mta'/>
- </RegistryKey>
- </RegistryKey>
- </Component>
- </DirectoryRef>
-
<DirectoryRef Id="INSTALLDIR_PARADIGMS_UML">
<Component Id="UMLDecorator.dll">
<File Id="UMLDecorator.dll" Name="UMLDecorator.dll" KeyPath="yes" Source="..\Paradigms\UML\decorator\$(var.Release)\UMLDecorator.dll">
@@ -444,19 +432,6 @@
</Component>
</DirectoryRef>
- <DirectoryRef Id="INSTALLDIR_PARADIGMS_UML">
- <Component Id="UML.mta">
- <File Id="UML.mta" Name="UML.mta" Source="..\Paradigms\UML\UML.mta" />
- <RegistryKey Root='HKLM' Key='Software\GME\Paradigms\UML'>
- <RegistryValue Name='CurrentVersion' Type='string' Value='$(var.GUIDSTRUML)'/>
- <RegistryKey Key='$(var.GUIDSTRUML)'>
- <RegistryValue Name='ConnStr' Type='string' Value='MGA=[INSTALLDIR_PARADIGMS_UML]UML.mta'/>
- </RegistryKey>
- </RegistryKey>
- </Component>
- </DirectoryRef>
-
-
<DirectoryRef Id="INSTALLDIR_BIN">
<Component Id="Mga.dll">
<File Id="Mga.dll" Name="Mga.dll" KeyPath="yes" Source="..\GME\$(var.Release)\Mga.dll">
Added: trunk/Install/GME_paradigms.wxs
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/Install/GME_paradigms.wxs Thu Nov 10 22:09:28 2011 (r1679)
@@ -0,0 +1,53 @@
+<?xml version='1.0' encoding='windows-1252'?>
+
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' RequiredVersion='3.0.4813.0'>
+
+ <?include GME_dyn.wxi ?>
+ <?include GME_inc.wxi ?>
+
+ <Module Id='GME_paradigms' Language='1033' Codepage='1252' Version='$(var.VERSIONSTR)'>
+
+ <Package Id='ABD398DE-2F52-4FD6-B372-C323D941EB65' Keywords='GME, MIC, modeling, domain specific languages' Description='Generic Modeling Environment Installer'
+ Manufacturer='Vanderbilt University, ISIS'
+ InstallerVersion='300' Languages='1033' SummaryCodepage='1252'
+ InstallPrivileges='elevated' InstallScope='perMachine'/>
+
+ <!-- =========================================================== -->
+ <!-- DIRECTORY STRUCTURE -->
+ <!-- =========================================================== -->
+ <Directory Id='TARGETDIR' Name='SourceDir'>
+ <Directory Id='ProgramFilesFolder'>
+ <Directory Id='installdir32' Name='GME'>
+ <Directory Id='INSTALLDIR_PARADIGMS32' Name='Paradigms'>
+ <Directory Id='INSTALLDIR_PARADIGMS_METAGME_PARADIGM' Name='MetaGME'/>
+ <Directory Id='INSTALLDIR_PARADIGMS_UML_PARADIGM' Name='UML'/>
+ </Directory>
+ </Directory>
+ </Directory>
+ </Directory>
+
+ <DirectoryRef Id="INSTALLDIR_PARADIGMS_METAGME_PARADIGM">
+ <Component Id="MetaGME.mta" Win64="no">
+ <File Id="MetaGME.mta" Name="MetaGME.mta" Source="..\Paradigms\MetaGME\MetaGME.mta" />
+ <RegistryKey Root='HKLM' Key='Software\GME\Paradigms\MetaGME'>
+ <RegistryValue Name='CurrentVersion' Type='string' Value='$(var.GUIDSTRMETAGME)'/>
+ <RegistryKey Key='$(var.GUIDSTRMETAGME)'>
+ <RegistryValue Name='ConnStr' Type='string' Value='MGA=[#MetaGME.mta]'/>
+ </RegistryKey>
+ </RegistryKey>
+ </Component>
+ </DirectoryRef>
+
+ <DirectoryRef Id="INSTALLDIR_PARADIGMS_UML_PARADIGM">
+ <Component Id="UML.mta" Win64="no">
+ <File Id="UML.mta" Name="UML.mta" Source="..\Paradigms\UML\UML.mta" />
+ <RegistryKey Root='HKLM' Key='Software\GME\Paradigms\UML'>
+ <RegistryValue Name='CurrentVersion' Type='string' Value='$(var.GUIDSTRUML)'/>
+ <RegistryKey Key='$(var.GUIDSTRUML)'>
+ <RegistryValue Name='ConnStr' Type='string' Value='MGA=[#UML.mta]'/>
+ </RegistryKey>
+ </RegistryKey>
+ </Component>
+ </DirectoryRef>
+ </Module>
+</Wix>
More information about the gme-commit
mailing list