Changeset: de3a8719f614 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=de3a8719f614
Modified Files:
NT/Makefile
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB4-XQuery-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
clients/Makefile.ag
clients/NT/Makefile.ag
monetdb4/Makefile.ag
monetdb4/NT/Makefile.ag
monetdb5/Makefile.ag
monetdb5/NT/Makefile.ag
pathfinder/Makefile.ag
pathfinder/NT/Makefile.ag
sql/Makefile.ag
sql/NT/Makefile.ag
Branch: default
Log Message:
The 32 bit installers work again.
The result (i.e. the .msi files) have not yet been tested...
diffs (truncated from 7619 to 300 lines):
diff --git a/NT/Makefile b/NT/Makefile
--- a/NT/Makefile
+++ b/NT/Makefile
@@ -24,11 +24,12 @@
!INCLUDE "$(TOPDIR)\..\NT\rules.msc"
-all: "$(SRCDIR)\Makefile.msc" monetdb_config.h unistd.h inttypes.h
+all: "$(SRCDIR)\Makefile.msc" monetdb_config.h unistd.h inttypes.h .monetdb
$(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" 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)"
-if exist "C:\Program Files (x86)" if $(bits)==32 cd
"$(prefix)"&&C:\cygwin\bin\sed.exe -i "s/Program Files/Program Files (x86)/"
*.vdproj
@@ -61,6 +62,10 @@
$(ECHO) typedef int int32_t; >> inttypes.h
$(ECHO) typedef unsigned int uint32_t; >> inttypes.h
+.monetdb:
+ $(ECHO) user=monetdb> .monetdb
+ $(ECHO) password=monetdb>> .monetdb
+
targetdirs:
if not exist "$(bindir)" $(MKDIR) "$(bindir)"
if not exist "$(sbindir)" $(MKDIR) "$(sbindir)"
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -45,12 +45,6 @@
}
"Entry"
{
- "MsmKey" = "8:_42425D9BCD9641D3ABC839D5A29358DE"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_4F0D2367141846EFA634DA35B05CDA4D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -75,12 +69,6 @@
}
"Entry"
{
- "MsmKey" = "8:_931FDCC4685C438DB61DFA8D32DF80D1"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_B4FE8AF57D0147A5926576F3D73B9B3B"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -99,6 +87,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_D98E545D77674640AD32C43168E2F93D"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_E763DA578AC34798B710589F4C224BDE"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -294,26 +288,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_42425D9BCD9641D3ABC839D5A29358DE"
- {
- "SourcePath" = "8:lib\\libMapi.dll"
- "TargetName" = "8:libMapi.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}:_4F0D2367141846EFA634DA35B05CDA4D"
{
"SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll"
@@ -394,26 +368,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_931FDCC4685C438DB61DFA8D32DF80D1"
- {
- "SourcePath" = "8:lib\\libmutils.dll"
- "TargetName" = "8:libmutils.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}:_B4FE8AF57D0147A5926576F3D73B9B3B"
{
"SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\ssleay32.dll"
@@ -474,6 +428,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D98E545D77674640AD32C43168E2F93D"
+ {
+ "SourcePath" = "8:lib\\libmapi.dll"
+ "TargetName" = "8:libmapi.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}:_E763DA578AC34798B710589F4C224BDE"
{
"SourcePath" = "8:lib\\libMonetODBCs.dll"
diff --git a/NT/installer32/MonetDB4-XQuery-Installer.vdproj
b/NT/installer32/MonetDB4-XQuery-Installer.vdproj
--- a/NT/installer32/MonetDB4-XQuery-Installer.vdproj
+++ b/NT/installer32/MonetDB4-XQuery-Installer.vdproj
@@ -33,12 +33,6 @@
}
"Entry"
{
- "MsmKey" = "8:_050AB95BFF544D0EB04C54457B719F80"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_0631B58B8488483F9D280E38FBB646C5"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -387,12 +381,6 @@
}
"Entry"
{
- "MsmKey" = "8:_76ACE18448C84B76BD06F7A20D958888"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_778EBECF7BCE467FB89B54CB42701480"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -681,12 +669,6 @@
}
"Entry"
{
- "MsmKey" = "8:_CB3C9EC9B4FF49E9815AC97E05BB8A46"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_CBFFD783FC354873B5A5137667A6A5F5"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -711,6 +693,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_D0453158655041DCBE710008E8981EBE"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_D1E93ACABD2C4F8CBBB87B92E9857311"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1074,26 +1062,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_050AB95BFF544D0EB04C54457B719F80"
- {
- "SourcePath" = "8:share\\MonetDB\\xrpc\\admin\\cwi_logo.png"
- "TargetName" = "8:cwi_logo.png"
- "Tag" = "8:"
- "Folder" = "8:_71271857FB974539AB5464AFFDA316BD"
- "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}:_0631B58B8488483F9D280E38FBB646C5"
{
"SourcePath" = "8:lib\\MonetDB4\\restore.mil"
@@ -2254,26 +2222,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_76ACE18448C84B76BD06F7A20D958888"
- {
- "SourcePath" = "8:lib\\libMapi.dll"
- "TargetName" = "8:libMapi.dll"
- "Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
- "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}:_778EBECF7BCE467FB89B54CB42701480"
{
"SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win32\\lib\\libxml2.dll"
@@ -3214,26 +3162,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CB3C9EC9B4FF49E9815AC97E05BB8A46"
- {
- "SourcePath" = "8:lib\\libmutils.dll"
- "TargetName" = "8:libmutils.dll"
- "Tag" = "8:"
- "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
- "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}:_CBFFD783FC354873B5A5137667A6A5F5"
{
"SourcePath" = "8:lib\\MonetDB4\\lib_bitset.dll"
@@ -3314,6 +3242,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D0453158655041DCBE710008E8981EBE"
+ {
+ "SourcePath" = "8:lib\\libmapi.dll"
+ "TargetName" = "8:libmapi.dll"
+ "Tag" = "8:"
+ "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
+ "Condition" = "8:"
+ "Transitive" = "11:FALSE"
+ "Vital" = "11:TRUE"
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
