Changeset: fc57e18b618e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fc57e18b618e
Modified Files:
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/rules.msc
configure.ag
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (truncated from 707 to 300 lines):
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
@@ -250,7 +250,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E74F1B1BDE548A7922BAD968E690A3A"
{
- "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win32-vs10\\bin\\libbz2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win32-vs10\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -330,7 +330,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_84999A6BF369454381F5ACB44DAAD420"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32-vs10\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win32-vs10\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -370,7 +370,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B4FE8AF57D0147A5926576F3D73B9B3B"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32-vs10\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win32-vs10\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -231,7 +231,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268"
{
- "SourcePath" =
"8:C:\\Libraries\\geos-3.2.2.win32-vs10\\bin\\geos_c.dll"
+ "SourcePath" =
"8:C:\\Libraries\\geos-3.3.0.win32-vs10\\bin\\geos_c.dll"
"TargetName" = "8:geos_c.dll"
"Tag" = "8:"
"Folder" = "8:_4D9CE65EDD774551869CFD46B59B4F9E"
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -1321,7 +1321,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0607DD25BFA34B92B0BF84584D3D8BCA"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32-vs10\\lib\\libeay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win32-vs10\\lib\\libeay32.lib"
"TargetName" = "8:libeay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1441,7 +1441,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0D84516ED4054FEA84A5E2C60F42AFE3"
{
- "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win32-vs10\\bin\\libbz2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win32-vs10\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1541,7 +1541,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_13440C2EDE6842BF8D9F24F554EEB87F"
{
- "SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win32-vs10\\lib\\libxml2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.8.win32-vs10\\lib\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1981,7 +1981,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2CC8B012C0CB4DFC8F2223F62310125F"
{
- "SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win32-vs10\\lib\\libxml2.lib"
+ "SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.8.win32-vs10\\lib\\libxml2.lib"
"TargetName" = "8:libxml2.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2521,7 +2521,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_52DCEC5806254D3F9246489B9C5DFC27"
{
- "SourcePath" = "8:C:\\Program Files\\PCRE-vs10\\bin\\pcre.dll"
+ "SourcePath" =
"8:C:\\Libraries\\pcre-8.13.win32-vs10\\bin\\pcre.dll"
"TargetName" = "8:pcre.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3221,7 +3221,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_929EE4AE7E524A1CBC69C7718D412876"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32-vs10\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win32-vs10\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3501,7 +3501,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A3D31DA50E0F4AE1873E390D5B7F1F33"
{
- "SourcePath" = "8:C:\\Program Files\\PCRE-vs10\\lib\\pcre.lib"
+ "SourcePath" =
"8:C:\\Libraries\\pcre-8.13.win32-vs10\\lib\\pcre.lib"
"TargetName" = "8:pcre.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3901,7 +3901,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BA22F04D137D421199EB04EE1D228A8F"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32-vs10\\lib\\ssleay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win32-vs10\\lib\\ssleay32.lib"
"TargetName" = "8:ssleay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -4041,7 +4041,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C3D9984F15D64164AECDEFF66981A97E"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win32-vs10\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win32-vs10\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -4161,7 +4161,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CA3CFDD1291E474EAE85329E4C5E5D45"
{
- "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win32-vs10\\lib\\libbz2.lib"
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win32-vs10\\lib\\libbz2.lib"
"TargetName" = "8:libbz2.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -250,7 +250,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E74F1B1BDE548A7922BAD968E690A3A"
{
- "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win64-vs10\\bin\\libbz2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win64-vs10\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -330,7 +330,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_84999A6BF369454381F5ACB44DAAD420"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win64-vs10\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win64-vs10\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -370,7 +370,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B4FE8AF57D0147A5926576F3D73B9B3B"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win64-vs10\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win64-vs10\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -231,7 +231,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268"
{
- "SourcePath" =
"8:C:\\Libraries\\geos-3.2.2.win64-vs10\\bin\\geos_c.dll"
+ "SourcePath" =
"8:C:\\Libraries\\geos-3.3.0.win64-vs10\\bin\\geos_c.dll"
"TargetName" = "8:geos_c.dll"
"Tag" = "8:"
"Folder" = "8:_4D9CE65EDD774551869CFD46B59B4F9E"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -1241,7 +1241,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0607DD25BFA34B92B0BF84584D3D8BCA"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win64-vs10\\lib\\libeay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win64-vs10\\lib\\libeay32.lib"
"TargetName" = "8:libeay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1381,7 +1381,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0D84516ED4054FEA84A5E2C60F42AFE3"
{
- "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win64-vs10\\bin\\libbz2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win64-vs10\\bin\\libbz2.dll"
"TargetName" = "8:libbz2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1401,7 +1401,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_13440C2EDE6842BF8D9F24F554EEB87F"
{
- "SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win64-vs10\\lib\\libxml2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.8.win64-vs10\\lib\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1721,7 +1721,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2CC8B012C0CB4DFC8F2223F62310125F"
{
- "SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.7.win64-vs10\\lib\\libxml2.lib"
+ "SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.8.win64-vs10\\lib\\libxml2.lib"
"TargetName" = "8:libxml2.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2121,7 +2121,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_52DCEC5806254D3F9246489B9C5DFC27"
{
- "SourcePath" = "8:C:\\Program Files\\PCRE-vs10\\bin\\pcre.dll"
+ "SourcePath" =
"8:C:\\Libraries\\pcre-8.13.win64-vs10\\bin\\pcre.dll"
"TargetName" = "8:pcre.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3121,7 +3121,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_929EE4AE7E524A1CBC69C7718D412876"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win64-vs10\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win64-vs10\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3361,7 +3361,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A3D31DA50E0F4AE1873E390D5B7F1F33"
{
- "SourcePath" = "8:C:\\Program Files\\PCRE-vs10\\lib\\pcre.lib"
+ "SourcePath" =
"8:C:\\Libraries\\pcre-8.13.win64-vs10\\lib\\pcre.lib"
"TargetName" = "8:pcre.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3681,7 +3681,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BA22F04D137D421199EB04EE1D228A8F"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win64-vs10\\lib\\ssleay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win64-vs10\\lib\\ssleay32.lib"
"TargetName" = "8:ssleay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3801,7 +3801,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C3D9984F15D64164AECDEFF66981A97E"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0a.win64-vs10\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.0d.win64-vs10\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3941,7 +3941,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CA3CFDD1291E474EAE85329E4C5E5D45"
{
- "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.5.win64-vs10\\lib\\libbz2.lib"
+ "SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win64-vs10\\lib\\libbz2.lib"
"TargetName" = "8:libbz2.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -288,11 +288,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) ENABLE_DATACELL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_ANT
- $(ECHO) HAVE_ANT_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) HAVE_ANT_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF HAVE_CFITSIO
$(ECHO) "HAVE_CFITSIO_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
@@ -413,8 +408,8 @@ create_winconfig_conds_new_py:
update_winconfig_conds_py: create_winconfig_conds_new_py
if not exist "$(TOPDIR)\winconfig_conds.py" $(CP)
"$(TOPDIR)\winconfig_conds_new.py" "$(TOPDIR)\winconfig_conds.py"
- C:\cygwin\bin\cmp.exe -s "$(TOPDIR)\winconfig_conds_new.py"
"$(TOPDIR)\winconfig_conds.py"
- if ERRORLEVEL 1 $(CP) "$(TOPDIR)\winconfig_conds_new.py"
"$(TOPDIR)\winconfig_conds.py"
+ C:\cygwin\bin\cmp.exe -s "$(TOPDIR)\winconfig_conds_new.py"
"$(TOPDIR)\winconfig_conds.py" || \
+ $(CP) "$(TOPDIR)\winconfig_conds_new.py" "$(TOPDIR)\winconfig_conds.py"
CONFIGURE=$(PYTHON) $(CONFIGURE_PY) \
"$(TOPDIR)\winconfig_conds.py" \
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -15,18 +15,20 @@
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
