- 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
This is the changelog for developers, != changelog for the end user
that we distribute with the binaries. (see changelog)
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)
03/03/2007
namespace
(THIS IS A TRANSITIONAL REVISION, DO NOT USE, WAIT FOR UPDATED DEPS)
--- /dev/null
+<?xml version="1.0"?>
+<component>
+ <file name="libcairo-2.dll"/>
+</component>
<dir name="locale">
<dir name="en@IPA">
<dir name="LC_MESSAGES">
<dir name="locale">
<dir name="en@IPA">
<dir name="LC_MESSAGES">
</dir>
<dir name="share">
<dir name="themes">
</dir>
<dir name="share">
<dir name="themes">
+++ /dev/null
-<?xml version="1.0"?>
-<component>
- <file name="msvcr71.dll"/>
-</component>
--- /dev/null
+<?xml version="1.0"?>
+<component>
+ <file name="msvcr80.dll"/>
+ <file name="msvcm80.dll"/>
+ <file name="msvcp80.dll"/>
+ <file name="msvcrt.dll"/>
+ <file name="GtkRadiant.exe.manifest"/>
+ <file name="Microsoft.VC80.CRT.Manifest"/>
+</component>
<component>
<file name="libpango-1.0-0.dll"/>
<file name="libpangowin32-1.0-0.dll"/>
<component>
<file name="libpango-1.0-0.dll"/>
<file name="libpangowin32-1.0-0.dll"/>
+ <file name="libpangocairo-1.0-0.dll"/>
<dir name="etc">
<dir name="pango">
<file name="pango.aliases"/>
<file name="pango.modules"/>
</dir>
</dir>
<dir name="etc">
<dir name="pango">
<file name="pango.aliases"/>
<file name="pango.modules"/>
</dir>
</dir>
<dir name="lib">
<dir name="pango">
<dir name="1.4.0">
<dir name="lib">
<dir name="pango">
<dir name="1.4.0">
<component name=".\components\q3map2_docs.xml" root="..\..\tools\quake3\q3map2" />
<component name=".\components\q2map.xml" root="..\..\install" />
<component name=".\components\bspc.xml" root="bin" />
<component name=".\components\q3map2_docs.xml" root="..\..\tools\quake3\q3map2" />
<component name=".\components\q2map.xml" root="..\..\install" />
<component name=".\components\bspc.xml" root="bin" />
- <component name=".\components\iconv.xml" root="..\..\..\iconv-1.9\bin" />
+ <component name=".\components\iconv.xml" root="..\..\install" />
<component name=".\components\intl.xml" root="..\..\..\gtk2-2.10\install" />
<component name=".\components\glib2.xml" root="..\..\install" />
<component name=".\components\atk.xml" root="..\..\install" />
<component name=".\components\intl.xml" root="..\..\..\gtk2-2.10\install" />
<component name=".\components\glib2.xml" root="..\..\install" />
<component name=".\components\atk.xml" root="..\..\install" />
+ <component name=".\components\cairo.xml" root="..\..\install" />
<component name=".\components\pango.xml" root="..\..\install" />
<component name=".\components\gtk2.xml" root="..\..\install" />
<component name=".\components\gtkglext.xml" root="..\..\..\gtk2-2.10\install" />
<component name=".\components\pango.xml" root="..\..\install" />
<component name=".\components\gtk2.xml" root="..\..\install" />
<component name=".\components\gtkglext.xml" root="..\..\..\gtk2-2.10\install" />
os.system("msidb -d " + msiWorkName + " -a archive.cab")
os.system("del archive.cab")
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):
msiNameQuoted = "\"" + msiName + "\""
if(os.path.exists(os.path.join(".\\", msiName)) and os.system("del " + msiNameQuoted) != 0):
-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}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msiquery", "msiquery.vcproj", "{7E8B9772-912C-4E32-88E2-62F9DE03C33C}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Release|Win32 = Release|Win32
- 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
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
EndGlobalSection
EndGlobal
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
+ ProjectGUID="{7E8B9772-912C-4E32-88E2-62F9DE03C33C}"
- SccProjectName=""
- SccLocalPath="">
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="2"
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\Release/msiquery.tlb"
+ HeaderFileName=""
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\..\Python-2.3.3\Include,..\..\..\..\Python-2.3.3\PC"
+ AdditionalIncludeDirectories="C:\Python25\include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
- EnableFunctionLevelLinking="TRUE"
- UsePrecompiledHeader="2"
+ EnableFunctionLevelLinking="true"
+ UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Release/msiquery.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
PrecompiledHeaderFile=".\Release/msiquery.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- CompileAs="0"/>
+ SuppressStartupBanner="true"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
- Name="VCCustomBuildTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
AdditionalOptions="/export:initmsiquery"
<Tool
Name="VCLinkerTool"
AdditionalOptions="/export:initmsiquery"
- AdditionalDependencies="odbc32.lib odbccp32.lib python23.lib msi.lib"
+ AdditionalDependencies="odbc32.lib odbccp32.lib python25.lib msi.lib"
OutputFile=".\Release/msiquery.dll"
LinkIncremental="1"
OutputFile=".\Release/msiquery.dll"
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
- AdditionalLibraryDirectories="..\..\..\..\Python-2.3.3\PCbuild"
+ SuppressStartupBanner="true"
+ AdditionalLibraryDirectories="C:\Python25\libs"
ModuleDefinitionFile=".\msiquery.def"
ProgramDatabaseFile=".\Release/msiquery.pdb"
SubSystem="2"
ImportLibrary=".\Release/msiquery.lib"
ModuleDefinitionFile=".\msiquery.def"
ProgramDatabaseFile=".\Release/msiquery.pdb"
SubSystem="2"
ImportLibrary=".\Release/msiquery.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\Release/msiquery.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="copy $(TargetPath) ..\"/>
- Name="VCPreBuildEventTool"/>
+ Name="VCALinkTool"
+ />
- Name="VCPreLinkEventTool"/>
+ Name="VCManifestTool"
+ />
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"/>
+ Name="VCXDCMakeTool"
+ />
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCBscMakeTool"
+ />
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCFxCopTool"
+ />
- Name="VCWebDeploymentTool"/>
+ Name="VCAppVerifierTool"
+ />
- Name="VCManagedWrapperGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(TargetPath) ..\"
+ />
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
ConfigurationType="2"
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\Debug"
IntermediateDirectory=".\Debug"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- ATLMinimizesCRunTimeLibraryUsage="FALSE">
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="true"
+ SuppressStartupBanner="true"
+ TargetEnvironment="1"
+ TypeLibraryName=".\Debug/msiquery.tlb"
+ HeaderFileName=""
+ />
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\Python-2.3.3\Include,..\..\..\..\Python-2.3.3\PC"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
RuntimeLibrary="3"
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\Python-2.3.3\Include,..\..\..\..\Python-2.3.3\PC"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
RuntimeLibrary="3"
- UsePrecompiledHeader="2"
+ UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Debug/msiquery.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
WarningLevel="3"
PrecompiledHeaderFile=".\Debug/msiquery.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
DebugInformationFormat="4"
DebugInformationFormat="4"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
- Name="VCCustomBuildTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
Name="VCLinkerTool"
AdditionalOptions="/export:initmsiquery"
AdditionalDependencies="odbc32.lib odbccp32.lib python23_d.lib msi.lib"
OutputFile=".\Debug/msiquery_d.dll"
LinkIncremental="1"
<Tool
Name="VCLinkerTool"
AdditionalOptions="/export:initmsiquery"
AdditionalDependencies="odbc32.lib odbccp32.lib python23_d.lib msi.lib"
OutputFile=".\Debug/msiquery_d.dll"
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\..\..\..\Python-2.3.3\PCbuild"
ModuleDefinitionFile=".\msiquery.def"
AdditionalLibraryDirectories="..\..\..\..\Python-2.3.3\PCbuild"
ModuleDefinitionFile=".\msiquery.def"
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
ProgramDatabaseFile=".\Debug/msiquery_d.pdb"
SubSystem="2"
ImportLibrary=".\Debug/msiquery_d.lib"
ProgramDatabaseFile=".\Debug/msiquery_d.pdb"
SubSystem="2"
ImportLibrary=".\Debug/msiquery_d.lib"
- TargetMachine="1"/>
- <Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="TRUE"
- SuppressStartupBanner="TRUE"
- TargetEnvironment="1"
- TypeLibraryName=".\Debug/msiquery.tlb"
- HeaderFileName=""/>
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="copy $(TargetPath) ..\"/>
- Name="VCPreBuildEventTool"/>
+ Name="VCALinkTool"
+ />
- Name="VCPreLinkEventTool"/>
+ Name="VCManifestTool"
+ />
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
+ Name="VCXDCMakeTool"
+ />
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCBscMakeTool"
+ />
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCFxCopTool"
+ />
- Name="VCWebDeploymentTool"/>
+ Name="VCAppVerifierTool"
+ />
- Name="VCManagedWrapperGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ CommandLine="copy $(TargetPath) ..\"
+ />
</Configuration>
</Configurations>
<References>
</Configuration>
</Configurations>
<References>
<Files>
<Filter
Name="Source Files"
<Files>
<Filter
Name="Source Files"
- Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90">
+ Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
+ >
- RelativePath=".\msiquery.c">
+ RelativePath=".\msiquery.c"
+ >
- RelativePath="msiquery.def">
+ RelativePath="msiquery.def"
+ >
</File>
</Filter>
<Filter
Name="Header Files"
</File>
</Filter>
<Filter
Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;fi;fd">
+ Filter="h;hpp;hxx;hm;inl;fi;fd"
+ >
</Filter>
<Filter
Name="Resource Files"
</Filter>
<Filter
Name="Resource Files"
- Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe">
+ Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"
+ >
</Filter>
</Files>
<Globals>
</Filter>
</Files>
<Globals>