From 643984aa395440aafc45744ac81e5f9709592eac Mon Sep 17 00:00:00 2001 From: namespace Date: Sun, 4 Mar 2007 13:40:18 +0000 Subject: [PATCH] - Final update for installerfiles (Shaderman / namespace) - Removed installer.py validation checks since they are incompatible with Vista - Updated msiquery module to python 2.5 - Added msiquery module for python 2.5 git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@147 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- CHANGES | 7 + .../components/{msvcr71.xml => cairo.xml} | 2 +- setup/win32/components/gtk2.xml | 2 + setup/win32/components/msvcr80.xml | 9 + setup/win32/components/pango.xml | 3 + setup/win32/gtkradiant-1.5.0.xml | 3 +- setup/win32/installer.py | 20 +- setup/win32/msi/msiquery.sln | 26 +-- setup/win32/msi/msiquery.vcproj | 210 ++++++++++++------ setup/win32/msiquery.pyd | Bin 0 -> 9728 bytes 10 files changed, 186 insertions(+), 96 deletions(-) rename setup/win32/components/{msvcr71.xml => cairo.xml} (59%) create mode 100644 setup/win32/components/msvcr80.xml create mode 100644 setup/win32/msiquery.pyd diff --git a/CHANGES b/CHANGES index 4be96159..76f32548 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,13 @@ This is the changelog for developers, != changelog for the end user that we distribute with the binaries. (see changelog) +04/03/2007 +namespace +- Final update for installerfiles (Shaderman / namespace) +- Removed installer.py validation checks since they are incompatible with Vista +- Updated msiquery module to python 2.5 +- Added msiquery module for python 2.5 + 03/03/2007 namespace (THIS IS A TRANSITIONAL REVISION, DO NOT USE, WAIT FOR UPDATED DEPS) diff --git a/setup/win32/components/msvcr71.xml b/setup/win32/components/cairo.xml similarity index 59% rename from setup/win32/components/msvcr71.xml rename to setup/win32/components/cairo.xml index 6094b7db..49b12e52 100644 --- a/setup/win32/components/msvcr71.xml +++ b/setup/win32/components/cairo.xml @@ -1,4 +1,4 @@ - + diff --git a/setup/win32/components/gtk2.xml b/setup/win32/components/gtk2.xml index e71720b3..c8e61387 100644 --- a/setup/win32/components/gtk2.xml +++ b/setup/win32/components/gtk2.xml @@ -23,6 +23,7 @@ + diff --git a/setup/win32/components/msvcr80.xml b/setup/win32/components/msvcr80.xml new file mode 100644 index 00000000..f874fc71 --- /dev/null +++ b/setup/win32/components/msvcr80.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/setup/win32/components/pango.xml b/setup/win32/components/pango.xml index df16c6a1..28847287 100644 --- a/setup/win32/components/pango.xml +++ b/setup/win32/components/pango.xml @@ -2,12 +2,14 @@ + + diff --git a/setup/win32/gtkradiant-1.5.0.xml b/setup/win32/gtkradiant-1.5.0.xml index d964a59f..0b346f34 100644 --- a/setup/win32/gtkradiant-1.5.0.xml +++ b/setup/win32/gtkradiant-1.5.0.xml @@ -8,10 +8,11 @@ - + + diff --git a/setup/win32/installer.py b/setup/win32/installer.py index d3f923a9..05e95821 100644 --- a/setup/win32/installer.py +++ b/setup/win32/installer.py @@ -412,15 +412,17 @@ class MSIPackage: os.system("msidb -d " + msiWorkName + " -a archive.cab") os.system("del archive.cab") - print("running standard MSI validators ...") - if(os.system("msival2 " + msiWorkName + " darice.cub > darice.txt") != 0): - raise Exception("MSI VALIDATION ERROR: see darice.txt") - print("running Logo Program validators ...") - if(os.system("msival2 " + msiWorkName + " logo.cub > logo.txt") != 0): - raise Exception("MSI VALIDATION ERROR: see logo.txt") - print("running XP Logo Program validators ...") - if(os.system("msival2 " + msiWorkName + " XPlogo.cub > XPlogo.txt") != 0): - raise Exception("MSI VALIDATION ERROR: see XPlogo.txt") + + #print("running standard MSI validators ...") + #if(os.system("msival2 " + msiWorkName + " darice.cub > darice.txt") != 0): + # raise Exception("MSI VALIDATION ERROR: see darice.txt") + + #print("running Logo Program validators ...") + #if(os.system("msival2 " + msiWorkName + " logo.cub > logo.txt") != 0): + # raise Exception("MSI VALIDATION ERROR: see logo.txt") + #print("running XP Logo Program validators ...") + #if(os.system("msival2 " + msiWorkName + " XPlogo.cub > XPlogo.txt") != 0): + # raise Exception("MSI VALIDATION ERROR: see XPlogo.txt") msiNameQuoted = "\"" + msiName + "\"" if(os.path.exists(os.path.join(".\\", msiName)) and os.system("del " + msiNameQuoted) != 0): diff --git a/setup/win32/msi/msiquery.sln b/setup/win32/msi/msiquery.sln index adfd0210..27170171 100644 --- a/setup/win32/msi/msiquery.sln +++ b/setup/win32/msi/msiquery.sln @@ -1,21 +1,19 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msiquery", "msiquery.vcproj", "{7E8B9772-912C-4E32-88E2-62F9DE03C33C}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - Release = Release + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {7E8B9772-912C-4E32-88E2-62F9DE03C33C}.Debug.ActiveCfg = Debug|Win32 - {7E8B9772-912C-4E32-88E2-62F9DE03C33C}.Debug.Build.0 = Debug|Win32 - {7E8B9772-912C-4E32-88E2-62F9DE03C33C}.Release.ActiveCfg = Release|Win32 - {7E8B9772-912C-4E32-88E2-62F9DE03C33C}.Release.Build.0 = Release|Win32 + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7E8B9772-912C-4E32-88E2-62F9DE03C33C}.Debug|Win32.ActiveCfg = Debug|Win32 + {7E8B9772-912C-4E32-88E2-62F9DE03C33C}.Debug|Win32.Build.0 = Debug|Win32 + {7E8B9772-912C-4E32-88E2-62F9DE03C33C}.Release|Win32.ActiveCfg = Release|Win32 + {7E8B9772-912C-4E32-88E2-62F9DE03C33C}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/setup/win32/msi/msiquery.vcproj b/setup/win32/msi/msiquery.vcproj index af2f8ac4..504ef77c 100644 --- a/setup/win32/msi/msiquery.vcproj +++ b/setup/win32/msi/msiquery.vcproj @@ -1,152 +1,215 @@ + > + Name="Win32" + /> + + + ATLMinimizesCRunTimeLibraryUsage="false" + > + + + + + + SuppressStartupBanner="true" + CompileAs="0" + /> + + + Name="VCPreLinkEventTool" + /> - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + > + + + + + + CompileAs="0" + /> + + + Name="VCPreLinkEventTool" + /> - - + TargetMachine="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> + Name="VCPostBuildEventTool" + CommandLine="copy $(TargetPath) ..\" + /> @@ -154,21 +217,26 @@ + Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" + > + RelativePath=".\msiquery.c" + > + RelativePath="msiquery.def" + > + Filter="h;hpp;hxx;hm;inl;fi;fd" + > + Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" + > diff --git a/setup/win32/msiquery.pyd b/setup/win32/msiquery.pyd new file mode 100644 index 0000000000000000000000000000000000000000..63a40307f563237670042f2d9b56f90c25401713 GIT binary patch literal 9728 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 literal 0 HcmV?d00001 -- 2.39.2