mirror of
https://github.com/UberGames/GtkRadiant.git
synced 2024-11-22 20:02:42 +00:00
- 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
This commit is contained in:
namespace
parent
35afb8e83e
commit
643984aa39
10 changed files with 196 additions and 106 deletions
7
CHANGES
7
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)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0"?>
|
||||
<component>
|
||||
<file name="msvcr71.dll"/>
|
||||
<file name="libcairo-2.dll"/>
|
||||
</component>
|
||||
|
|
@ -23,6 +23,7 @@
|
|||
</dir>
|
||||
</dir>
|
||||
</dir>
|
||||
<!--
|
||||
<dir name="locale">
|
||||
<dir name="en@IPA">
|
||||
<dir name="LC_MESSAGES">
|
||||
|
|
@ -35,6 +36,7 @@
|
|||
</dir>
|
||||
</dir>
|
||||
</dir>
|
||||
-->
|
||||
</dir>
|
||||
<dir name="share">
|
||||
<dir name="themes">
|
||||
|
|
|
|||
9
setup/win32/components/msvcr80.xml
Normal file
9
setup/win32/components/msvcr80.xml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<?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>
|
||||
|
|
@ -2,12 +2,14 @@
|
|||
<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="lib">
|
||||
<dir name="pango">
|
||||
<dir name="1.4.0">
|
||||
|
|
@ -17,4 +19,5 @@
|
|||
</dir>
|
||||
</dir>
|
||||
</dir>
|
||||
-->
|
||||
</component>
|
||||
|
|
|
|||
|
|
@ -8,10 +8,11 @@
|
|||
<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\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" />
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -1,152 +1,215 @@
|
|||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Version="8,00"
|
||||
Name="msiquery"
|
||||
ProjectGUID="{7E8B9772-912C-4E32-88E2-62F9DE03C33C}"
|
||||
RootNamespace="msiquery"
|
||||
SccProjectName=""
|
||||
SccLocalPath="">
|
||||
>
|
||||
<Platforms>
|
||||
<Platform
|
||||
Name="Win32"/>
|
||||
Name="Win32"
|
||||
/>
|
||||
</Platforms>
|
||||
<ToolFiles>
|
||||
</ToolFiles>
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory=".\Release"
|
||||
IntermediateDirectory=".\Release"
|
||||
ConfigurationType="2"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
UseOfMFC="0"
|
||||
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"
|
||||
AdditionalIncludeDirectories="..\..\..\..\Python-2.3.3\Include,..\..\..\..\Python-2.3.3\PC"
|
||||
AdditionalIncludeDirectories="C:\Python25\include"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
|
||||
StringPooling="TRUE"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
EnableFunctionLevelLinking="TRUE"
|
||||
UsePrecompiledHeader="2"
|
||||
EnableFunctionLevelLinking="true"
|
||||
UsePrecompiledHeader="0"
|
||||
PrecompiledHeaderFile=".\Release/msiquery.pch"
|
||||
AssemblerListingLocation=".\Release/"
|
||||
ObjectFile=".\Release/"
|
||||
ProgramDataBaseFileName=".\Release/"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="TRUE"
|
||||
CompileAs="0"/>
|
||||
SuppressStartupBanner="true"
|
||||
CompileAs="0"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<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"
|
||||
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"
|
||||
TargetMachine="1"/>
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
MkTypLibCompatible="TRUE"
|
||||
SuppressStartupBanner="TRUE"
|
||||
TargetEnvironment="1"
|
||||
TypeLibraryName=".\Release/msiquery.tlb"
|
||||
HeaderFileName=""/>
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
CommandLine="copy $(TargetPath) ..\"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="NDEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
CommandLine="copy $(TargetPath) ..\"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
OutputDirectory=".\Debug"
|
||||
IntermediateDirectory=".\Debug"
|
||||
ConfigurationType="2"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
UseOfMFC="0"
|
||||
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"
|
||||
UsePrecompiledHeader="2"
|
||||
UsePrecompiledHeader="0"
|
||||
PrecompiledHeaderFile=".\Debug/msiquery.pch"
|
||||
AssemblerListingLocation=".\Debug/"
|
||||
ObjectFile=".\Debug/"
|
||||
ProgramDataBaseFileName=".\Debug/"
|
||||
WarningLevel="3"
|
||||
SuppressStartupBanner="TRUE"
|
||||
SuppressStartupBanner="true"
|
||||
DebugInformationFormat="4"
|
||||
CompileAs="0"/>
|
||||
CompileAs="0"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"/>
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1033"
|
||||
/>
|
||||
<Tool
|
||||
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"
|
||||
SuppressStartupBanner="TRUE"
|
||||
SuppressStartupBanner="true"
|
||||
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"
|
||||
TargetMachine="1"/>
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
MkTypLibCompatible="TRUE"
|
||||
SuppressStartupBanner="TRUE"
|
||||
TargetEnvironment="1"
|
||||
TypeLibraryName=".\Debug/msiquery.tlb"
|
||||
HeaderFileName=""/>
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
CommandLine="copy $(TargetPath) ..\"/>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
PreprocessorDefinitions="_DEBUG"
|
||||
Culture="1033"/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCWebDeploymentTool"/>
|
||||
<Tool
|
||||
Name="VCManagedWrapperGeneratorTool"/>
|
||||
<Tool
|
||||
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
|
||||
CommandLine="copy $(TargetPath) ..\"
|
||||
/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
<References>
|
||||
|
|
@ -154,21 +217,26 @@
|
|||
<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"
|
||||
>
|
||||
<File
|
||||
RelativePath=".\msiquery.c">
|
||||
RelativePath=".\msiquery.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="msiquery.def">
|
||||
RelativePath="msiquery.def"
|
||||
>
|
||||
</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="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>
|
||||
|
|
|
|||
BIN
setup/win32/msiquery.pyd
Normal file
BIN
setup/win32/msiquery.pyd
Normal file
Binary file not shown.
Loading…
Reference in a new issue