diff --git a/CHANGES b/CHANGES
index 4be9615..76f3254 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 6094b7d..49b12e5 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 e71720b..c8e6138 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 0000000..f874fc7
--- /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 df16c6a..2884728 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 d964a59..0b346f3 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 d3f923a..05e9582 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 adfd021..2717017 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 af2f8ac..504ef77 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="VCManagedResourceCompilerTool"
+ />
+
+
+ TargetMachine="1"
+ />
+ Name="VCALinkTool"
+ />
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+ CommandLine="copy $(TargetPath) ..\"
+ />
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+
+
+
+
+
+ CompileAs="0"
+ />
+ Name="VCManagedResourceCompilerTool"
+ />
+
+
+ TargetMachine="1"
+ />
+ Name="VCALinkTool"
+ />
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+ 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 0000000..63a4030
Binary files /dev/null and b/setup/win32/msiquery.pyd differ