Changeset: 235b741b4142 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=235b741b4142
Modified Files:
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj
geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj
geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery64.vdproj
pathfinder/NT/MonetDB4-XQuery64/MonetDB4-XQuery-Installer.vdproj
sql/NT/MonetDB5-SQL/MonetDB5-SQL-Installer.vdproj
sql/NT/MonetDB5-SQL64/MonetDB5-SQL-Installer.vdproj
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 645 to 300 lines):
diff -r 48e9b1665879 -r 235b741b4142
MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj
--- a/MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj Fri Aug 13 09:27:01
2010 +0200
+++ b/MonetDB/NT/MonetDB-Common/MonetDB-Common.vdproj Fri Aug 13 09:29:08
2010 +0200
@@ -187,7 +187,7 @@
{
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0F567DEF0CA64069BF1409C4AC7228E3"
{
- "SourcePath" = "8:C:\\bzip2-1.0.5.win32\\bin\\libbz2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win32\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -227,7 +227,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_29FE781523A94CBDA5CD53F7A319B4D8"
{
- "SourcePath" = "8:C:\\openssl-0.9.8k.win32\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -267,7 +267,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61B2E04FDCD84F34A63853B93B1DCD7B"
{
- "SourcePath" = "8:C:\\zlib-1.2.3.win32\\bin\\zlib1.dll"
+ "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -287,7 +287,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_926BCA1A727C4F29B3DA99D425D895EA"
{
- "SourcePath" = "8:C:\\openssl-0.9.8k.win32\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -447,7 +447,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DE40D199E1B2498F84A1EB70CBD21614"
{
- "SourcePath" = "8:C:\\iconv-1.11.1.win32\\bin\\iconv.dll"
+ "SourcePath" =
"8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll"
"TargetName" = "8:iconv.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
diff -r 48e9b1665879 -r 235b741b4142
MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj
--- a/MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj Fri Aug 13 09:27:01
2010 +0200
+++ b/MonetDB/NT/MonetDB-Common/MonetDB-Common64.vdproj Fri Aug 13 09:29:08
2010 +0200
@@ -207,7 +207,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_43E49CA0EC774DEF94E2596DAC7364FB"
{
- "SourcePath" = "8:C:\\openssl-0.9.8k.win64\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win64\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -247,7 +247,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61B2E04FDCD84F34A63853B93B1DCD7B"
{
- "SourcePath" = "8:C:\\zlib-1.2.3.win64\\bin\\zlib1.dll"
+ "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win64\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -267,7 +267,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_61BDF3C1EF544447820D9544098DD817"
{
- "SourcePath" = "8:C:\\openssl-0.9.8k.win64\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win64\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -407,7 +407,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DC301A823AB94F7D92F5D30466B8E3B0"
{
- "SourcePath" = "8:C:\\bzip2-1.0.5.win64\\bin\\libbz2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win64\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
@@ -447,7 +447,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DE40D199E1B2498F84A1EB70CBD21614"
{
- "SourcePath" = "8:C:\\iconv-1.11.1.win64\\bin\\iconv.dll"
+ "SourcePath" =
"8:C:\\Libraries\\iconv-1.11.1.win64\\bin\\iconv.dll"
"TargetName" = "8:iconv.dll"
"Tag" = "8:"
"Folder" = "8:_AC71646495814C55B03F69019B5070C2"
diff -r 48e9b1665879 -r 235b741b4142 buildtools/conf/winrules.msc
--- a/buildtools/conf/winrules.msc Fri Aug 13 09:27:01 2010 +0200
+++ b/buildtools/conf/winrules.msc Fri Aug 13 09:29:08 2010 +0200
@@ -131,7 +131,10 @@
!IFNDEF LIBZLIB
LIBZLIB = C:\zlib-1.2.3.win$(bits)
!ENDIF
-Z_LIBS = "$(LIBZLIB)\lib\zlib1$(DEBUGLIB).lib"
+!IFNDEF LIBZLIBFILE
+LIBZLIBFILE=zlib1
+!ENDIF
+Z_LIBS = "$(LIBZLIB)\lib\$(LIBZLIBFILE)$(DEBUGLIB).lib"
Z_CFLAGS = -DHAVE_LIBZ "-I$(LIBZLIB)\include"
!ENDIF
diff -r 48e9b1665879 -r 235b741b4142
clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
---
a/clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
Fri Aug 13 09:27:01 2010 +0200
+++
b/clients/src/odbc/winsetup/MonetDB-ODBC-Installer/MonetDB-ODBC-Installer.vdproj
Fri Aug 13 09:29:08 2010 +0200
@@ -236,7 +236,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_17D7FB69076E415C8973295D502161C5"
{
- "SourcePath" = "8:C:\\iconv-1.11.1.win32\\bin\\iconv.dll"
+ "SourcePath" =
"8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll"
"TargetName" = "8:iconv.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -256,7 +256,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E74F1B1BDE548A7922BAD968E690A3A"
{
- "SourcePath" = "8:C:\\bzip2-1.0.5.win32\\bin\\libbz2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win32\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -316,7 +316,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4F0D2367141846EFA634DA35B05CDA4D"
{
- "SourcePath" = "8:C:\\zlib-1.2.3.win32\\bin\\zlib1.dll"
+ "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -356,7 +356,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_84999A6BF369454381F5ACB44DAAD420"
{
- "SourcePath" = "8:C:\\openssl-0.9.8k.win32\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -416,7 +416,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B4FE8AF57D0147A5926576F3D73B9B3B"
{
- "SourcePath" = "8:C:\\openssl-0.9.8k.win32\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
diff -r 48e9b1665879 -r 235b741b4142
clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj
---
a/clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj
Fri Aug 13 09:27:01 2010 +0200
+++
b/clients/src/odbc/winsetup/MonetDB-ODBC-Installer64/MonetDB-ODBC-Installer.vdproj
Fri Aug 13 09:29:08 2010 +0200
@@ -236,7 +236,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_384504E5D4D445A293780227B8A5F5A9"
{
- "SourcePath" = "8:C:\\bzip2-1.0.5.win64\\bin\\libbz2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win64\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -256,7 +256,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3E644A6D208A478BA418B7C7A75E1306"
{
- "SourcePath" = "8:C:\\openssl-0.9.8k.win64\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win64\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -276,7 +276,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_3FE349BC355F467887AC63E16F3818BC"
{
- "SourcePath" = "8:C:\\iconv-1.11.1.win64\\bin\\iconv.dll"
+ "SourcePath" =
"8:C:\\Libraries\\iconv-1.11.1.win64\\bin\\iconv.dll"
"TargetName" = "8:iconv.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -316,7 +316,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_53E87680864A4C9DB17A3856539DC3C5"
{
- "SourcePath" = "8:C:\\zlib-1.2.3.win64\\bin\\zlib1.dll"
+ "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win64\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -456,7 +456,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DABB0525FFE244EBAA33222279A6056C"
{
- "SourcePath" = "8:C:\\openssl-0.9.8k.win64\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win64\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
diff -r 48e9b1665879 -r 235b741b4142
geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj
--- a/geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj Fri Aug 13 09:27:01
2010 +0200
+++ b/geom/NT/MonetDB5-Geom/MonetDB5-Geom-Module.vdproj Fri Aug 13 09:29:08
2010 +0200
@@ -231,7 +231,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268"
{
- "SourcePath" = "8:C:\\geos-3.1.1.win32\\bin\\geos_c.dll"
+ "SourcePath" = "8:C:\\Libraries\\geos-3.2.2.win32\\bin\\geos_c.dll"
"TargetName" = "8:geos_c.dll"
"Tag" = "8:"
"Folder" = "8:_4D9CE65EDD774551869CFD46B59B4F9E"
diff -r 48e9b1665879 -r 235b741b4142
geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj
--- a/geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj Fri Aug 13
09:27:01 2010 +0200
+++ b/geom/NT/MonetDB5-Geom64/MonetDB5-Geom-Module.vdproj Fri Aug 13
09:29:08 2010 +0200
@@ -151,7 +151,7 @@
{
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0729672A47604EE69F8B5461528D646F"
{
- "SourcePath" = "8:C:\\geos-3.1.1.win64\\bin\\geos_c.dll"
+ "SourcePath" = "8:C:\\Libraries\\geos-3.2.2.win64\\bin\\geos_c.dll"
"TargetName" = "8:geos_c.dll"
"Tag" = "8:"
"Folder" = "8:_4D9CE65EDD774551869CFD46B59B4F9E"
diff -r 48e9b1665879 -r 235b741b4142
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj Fri Aug
13 09:27:01 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery-Installer.vdproj Fri Aug
13 09:29:08 2010 +0200
@@ -2282,7 +2282,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_778EBECF7BCE467FB89B54CB42701480"
{
- "SourcePath" = "8:C:\\libxml2-2.6.32+.win32\\bin\\libxml2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win32\\bin\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3222,7 +3222,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C464E85622B641E5A8EEA48F39228B0C"
{
- "SourcePath" = "8:C:\\Pthreads\\lib\\pthreadVC2.dll"
+ "SourcePath" = "8:C:\\Libraries\Pthreads\\lib\\pthreadVC2.dll"
"TargetName" = "8:pthreadVC2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3482,7 +3482,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DAB1358F0AA74CC8839012A6B71EF76B"
{
- "SourcePath" = "8:C:\\openssl-0.9.8k.win32\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3622,7 +3622,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E0C6DFAFFAA944FCA4FFA7C25D796B02"
{
- "SourcePath" = "8:C:\\bzip2-1.0.5.win32\\bin\\libbz2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win32\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3682,7 +3682,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E4A29EC2213B4C99B49B7AC34E99F880"
{
- "SourcePath" = "8:C:\\iconv-1.11.1.win32\\bin\\iconv.dll"
+ "SourcePath" =
"8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll"
"TargetName" = "8:iconv.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3802,7 +3802,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_F2475BA1CBF34E1AB3C0B377601747D4"
{
- "SourcePath" = "8:C:\\openssl-0.9.8k.win32\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3902,7 +3902,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_FA7195B4D61549B2B006D7B3CB22838E"
{
- "SourcePath" = "8:C:\\zlib-1.2.3.win32\\bin\\zlib1.dll"
+ "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
diff -r 48e9b1665879 -r 235b741b4142
pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj
--- a/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj Fri Aug 13
09:27:01 2010 +0200
+++ b/pathfinder/NT/MonetDB4-XQuery/MonetDB4-XQuery.vdproj Fri Aug 13
09:29:08 2010 +0200
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
