Changeset: f60618611f92 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f60618611f92
Modified Files:
NT/Makefile
NT/installer32/MonetDB-ODBC-Driver.sln
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB4-XQuery-Installer.sln
NT/installer32/MonetDB4-XQuery-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/installer64/MonetDB-ODBC-Driver.sln
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB4-XQuery-Installer.sln
NT/installer64/MonetDB4-XQuery-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
clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Driver.sln
clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Driver.sln
clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj
geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.sln
geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj
geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.sln
geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.sln
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.sln
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.sln
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.sln
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
Moved Windows installers to NT directory and install them.
diffs (truncated from 59201 to 300 lines):
diff -r 6d0187e529e2 -r f60618611f92 NT/Makefile
--- a/NT/Makefile Fri Jan 14 14:27:11 2011 +0100
+++ b/NT/Makefile Fri Jan 14 14:27:50 2011 +0100
@@ -29,6 +29,9 @@
install: targetdirs all
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" install
+ $(INSTALL) ..\NT\installer$(bits)\*.sln "$(prefix)"
+ $(INSTALL) ..\NT\installer$(bits)\*.vdproj "$(prefix)"
+ -if exist "C:\Program Files (x86)" if $(bits)==32 C:\cygwin\bin\sed.exe
-i "s/Program Files/Program Files (x86)/" "$(prefix)"\*.vdproj
$(SRCDIR)\Makefile.msc: "$(SRCDIR)\Makefile.ag"
cd "$(SRCDIR)"&&set PYTHONPATH=buildtools\autogen&&python
buildtools\autogen\autogen.py
diff -r 6d0187e529e2 -r f60618611f92 NT/installer32/MonetDB-ODBC-Driver.sln
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/NT/installer32/MonetDB-ODBC-Driver.sln Fri Jan 14 14:27:50 2011 +0100
@@ -0,0 +1,19 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+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 -r 6d0187e529e2 -r f60618611f92
NT/installer32/MonetDB-ODBC-Installer.vdproj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj Fri Jan 14 14:27:50
2011 +0100
@@ -0,0 +1,1250 @@
+"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:_42425D9BCD9641D3ABC839D5A29358DE"
+ "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:_84999A6BF369454381F5ACB44DAAD420"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_8ADC98E4D05143999FFC87CAB78E68C9"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_931FDCC4685C438DB61DFA8D32DF80D1"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
+ "MsmKey" = "8:_B4FE8AF57D0147A5926576F3D73B9B3B"
+ "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:_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"
+ {
+ "SourcePath" =
"8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll"
+ "TargetName" = "8:iconv.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
+ "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}:_2E74F1B1BDE548A7922BAD968E690A3A"
+ {
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win32\\bin\\libbz2.dll"
+ "TargetName" = "8:libbz2.dll"
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
