Changeset: 50b1866a6728 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=50b1866a6728
Added Files:
NT/mkgeomwxs.py
NT/mkodbcwxs.py
NT/mksqlwxs.py
Removed Files:
NT/installer32/MonetDB-ODBC-Driver.sln
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.sln
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.sln
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer32/cv64-32.sh
NT/installer64/MonetDB-ODBC-Driver.sln
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.sln
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.sln
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/installer64/cv32-64.sh
NT/installer64/fixmsi.py
Modified Files:
NT/Makefile
buildtools/conf/banner.bmp
buildtools/doc/windowsbuild.rst
vertoo.config
Branch: default
Log Message:
Build installers using the WiX Toolset.
We create the input file (*.wxs) using a script so that we shouldn't
have to edit anything whenever a MAL or SQL file gets added or
removed.
THIS NEEDS TO BE THOROUGHLY TESTED!
diffs (truncated from 15358 to 300 lines):
diff --git a/NT/Makefile b/NT/Makefile
--- a/NT/Makefile
+++ b/NT/Makefile
@@ -9,12 +9,15 @@
TOPDIR = .
srcdir = $(TOPDIR)\..
+# location of NT directory
+NT = $(srcdir)\NT
+
prefix = $(MAKEDIR)
# ensure "all" is first target
all: _all
-!INCLUDE "$(TOPDIR)\..\NT\rules.msc"
+!INCLUDE "$(NT)\rules.msc"
_all: update_winconfig_conds_py "$(srcdir)\Makefile.msc" monetdb_config.h
unistd.h .monetdb
$(MAKE) /nologo /f "$(srcdir)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" all
@@ -22,14 +25,15 @@ all: _all
install: targetdirs all
$(MAKE) /nologo /f "$(srcdir)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" install
$(INSTALL) .monetdb "$(sysconfdir)"
- $(INSTALL) ..\NT\installer$(bits)\*.sln "$(prefix)"
- $(INSTALL) ..\NT\installer$(bits)\*.vdproj "$(prefix)"
+ $(PYTHON) $(NT)\mksqlwxs.py $(VERSION) "$(MAKE_INCLUDEFILE)"
"$(prefix)" > "$(prefix)\MonetDB5-SQL-Installer.wxs"
+ $(PYTHON) $(NT)\mkgeomwxs.py $(VERSION) "$(MAKE_INCLUDEFILE)"
"$(prefix)" > "$(prefix)\MonetDB5-Geom-Installer.wxs"
+ $(PYTHON) $(NT)\mkodbcwxs.py $(VERSION) "$(MAKE_INCLUDEFILE)"
"$(prefix)" > "$(prefix)\MonetDB-ODBC-Installer.wxs"
$(srcdir)\Makefile.msc: "$(srcdir)\Makefile.ag"
cd "$(srcdir)"&&set PYTHONPATH=buildtools\autogen&&$(PYTHON)
buildtools\autogen\autogen.py
-monetdb_config.h: "$(TOPDIR)\winconfig_conds.py"
"$(srcdir)\NT\monetdb_config.h.in"
- $(CONFIGURE) "$(srcdir)\NT\monetdb_config.h.in" > monetdb_config.h
+monetdb_config.h: "$(TOPDIR)\winconfig_conds.py" "$(NT)\monetdb_config.h.in"
+ $(CONFIGURE) "$(NT)\monetdb_config.h.in" > monetdb_config.h
unistd.h:
$(ECHO) #ifndef UNISTD_H > unistd.h
diff --git a/NT/installer32/MonetDB-ODBC-Driver.sln
b/NT/installer32/MonetDB-ODBC-Driver.sln
deleted file mode 100644
--- a/NT/installer32/MonetDB-ODBC-Driver.sln
+++ /dev/null
@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "MonetDB-ODBC-Installer",
"MonetDB-ODBC-Installer.vdproj", "{33AE0CC1-169E-4168-978A-0CDDD1E6A51A}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Default = Debug|Default
- Release|Default = Release|Default
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {33AE0CC1-169E-4168-978A-0CDDD1E6A51A}.Debug|Default.ActiveCfg
= Debug
- {33AE0CC1-169E-4168-978A-0CDDD1E6A51A}.Debug|Default.Build.0 =
Debug
-
{33AE0CC1-169E-4168-978A-0CDDD1E6A51A}.Release|Default.ActiveCfg = Release
- {33AE0CC1-169E-4168-978A-0CDDD1E6A51A}.Release|Default.Build.0
= Release
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
deleted file mode 100644
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ /dev/null
@@ -1,1225 +0,0 @@
-"DeployProject"
-{
-"VSVersion" = "3:800"
-"ProjectType" = "8:{978C614F-708E-4E1A-B201-565925725DBA}"
-"IsWebType" = "8:FALSE"
-"ProjectName" = "8:MonetDB-ODBC-Installer"
-"LanguageId" = "3:1033"
-"CodePage" = "3:1252"
-"UILanguageId" = "3:1033"
-"SccProjectName" = "8:"
-"SccLocalPath" = "8:"
-"SccAuxPath" = "8:"
-"SccProvider" = "8:"
- "Hierarchy"
- {
- "Entry"
- {
- "MsmKey" = "8:_14F4BC1A7F54458D91CFA4A0BD174604"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_17D7FB69076E415C8973295D502161C5"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_2E74F1B1BDE548A7922BAD968E690A3A"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_2FB9A57E3DD7443F97A7C8B0DBF82DB5"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_3517E482BC7F4EFC88537C979178E768"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_4F0D2367141846EFA634DA35B05CDA4D"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_5CCCB992693C48C0BFEF4B0EFBBD884A"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_779449EF5BAD4B068A50802402E52278"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_8ADC98E4D05143999FFC87CAB78E68C9"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_B1B1C0011D7945F892A77F529772EA72"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_BC1CD3A227FA4EB7B035DFA62EF4D82C"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_CB89303C19364CECA36BDC911637BE9C"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_D98E545D77674640AD32C43168E2F93D"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_E763DA578AC34798B710589F4C224BDE"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_E78854C05F3D4756B29D929C6E751845"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- }
- "Configurations"
- {
- "Debug"
- {
- "DisplayName" = "8:Debug"
- "IsDebugOnly" = "11:TRUE"
- "IsReleaseOnly" = "11:FALSE"
- "OutputFilename" = "8:Debug\\MonetDB-ODBC-Installer.msi"
- "PackageFilesAs" = "3:2"
- "PackageFileSize" = "3:-2147483648"
- "CabType" = "3:1"
- "Compression" = "3:2"
- "SignOutput" = "11:FALSE"
- "CertificateFile" = "8:"
- "PrivateKeyFile" = "8:"
- "TimeStampServer" = "8:"
- "InstallerBootstrapper" = "3:2"
- "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
- {
- "Enabled" = "11:TRUE"
- "PromptEnabled" = "11:TRUE"
- "PrerequisitesLocation" = "2:1"
- "Url" = "8:"
- "ComponentsUrl" = "8:"
- "Items"
- {
- }
- }
- }
- "Release"
- {
- "DisplayName" = "8:Release"
- "IsDebugOnly" = "11:FALSE"
- "IsReleaseOnly" = "11:TRUE"
- "OutputFilename" = "8:Release\\MonetDB-ODBC-Installer.msi"
- "PackageFilesAs" = "3:2"
- "PackageFileSize" = "3:-2147483648"
- "CabType" = "3:1"
- "Compression" = "3:2"
- "SignOutput" = "11:FALSE"
- "CertificateFile" = "8:"
- "PrivateKeyFile" = "8:"
- "TimeStampServer" = "8:"
- "InstallerBootstrapper" = "3:2"
- "BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
- {
- "Enabled" = "11:TRUE"
- "PromptEnabled" = "11:TRUE"
- "PrerequisitesLocation" = "2:1"
- "Url" = "8:"
- "ComponentsUrl" = "8:"
- "Items"
- {
- }
- }
- }
- }
- "Deployable"
- {
- "CustomAction"
- {
-
"{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_B2FF38FB524E4822B2CB552C567A665C"
- {
- "Name" = "8:odbcinstall.exe"
- "Condition" = "8:"
- "Object" = "8:_8ADC98E4D05143999FFC87CAB78E68C9"
- "FileType" = "3:2"
- "InstallAction" = "3:4"
- "Arguments" = "8:/Uninstall"
- "EntryPoint" = "8:"
- "Sequence" = "3:1"
- "Identifier" = "8:_A534073F_3038_4A56_99CA_AF20FAA522B4"
- "InstallerClass" = "11:FALSE"
- "CustomActionData" = "8:"
- }
-
"{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_B80CC898EB0D41EF9097C9E930B7E8FA"
- {
- "Name" = "8:odbcinstall.exe"
- "Condition" = "8:"
- "Object" = "8:_8ADC98E4D05143999FFC87CAB78E68C9"
- "FileType" = "3:2"
- "InstallAction" = "3:1"
- "Arguments" = "8:/Install"
- "EntryPoint" = "8:"
- "Sequence" = "3:1"
- "Identifier" = "8:_8F5331F2_490A_4238_82A1_C2D26D356998"
- "InstallerClass" = "11:FALSE"
- "CustomActionData" = "8:"
- }
- }
- "DefaultFeature"
- {
- "Name" = "8:DefaultFeature"
- "Title" = "8:"
- "Description" = "8:"
- }
- "ExternalPersistence"
- {
- "LaunchCondition"
- {
- }
- }
- "File"
- {
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_14F4BC1A7F54458D91CFA4A0BD174604"
- {
- "SourcePath" = "8:monetdb.ico"
- "TargetName" = "8:monetdb.ico"
- "Tag" = "8:"
- "Folder" = "8:_E71AEF246CD8428C98B2ECCFE2014056"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_17D7FB69076E415C8973295D502161C5"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
