Changeset: 2d14e09ebcd7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2d14e09ebcd7
Added Files:
        clients/Tests/MAL-signatures_all.malC
        clients/Tests/MAL-signatures_fits_geom.malC.src
        clients/Tests/MAL-signatures_fits_geom.stable.err
        clients/Tests/MAL-signatures_fits_geom.stable.out
        clients/Tests/MAL-signatures_fits_geom.stable.out.int128
        clients/Tests/MAL-signatures_geom.malC.src
        clients/Tests/MAL-signatures_geom.stable.err
        clients/Tests/MAL-signatures_geom.stable.out
        clients/Tests/MAL-signatures_geom.stable.out.int128
        clients/Tests/SQL-dump_all.sql
        clients/Tests/SQL-dump_geom.sql.src
        clients/Tests/SQL-dump_geom.stable.err
        clients/Tests/SQL-dump_geom.stable.out
        clients/Tests/SQL-dump_geom.stable.out.32bit
        clients/Tests/SQL-dump_geom.stable.out.64bit.oid32
        clients/Tests/SQL-dump_geom.stable.out.int128
        clients/Tests/SQL-dump_geom.stable.out.oid32.int128
        
sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.nomito
        sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.sql
        
sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.err
        
sql/test/BugTracker-2014/Tests/select-distinct-order-limit.Bug-3527.stable.out
Removed Files:
        clients/Tests/MAL-signatures.malC
        clients/Tests/MAL-signatures.stable.err
        clients/Tests/MAL-signatures.stable.out
        clients/Tests/MAL-signatures.stable.out.int128
        clients/Tests/MAL-signatures_R.malC.src
        clients/Tests/MAL-signatures_R.stable.err
        clients/Tests/MAL-signatures_R.stable.out
        clients/Tests/MAL-signatures_R.stable.out.int128
        clients/Tests/MAL-signatures_all.malC.src
        clients/Tests/MAL-signatures_bam.malC.src
        clients/Tests/MAL-signatures_bam.stable.err
        clients/Tests/MAL-signatures_bam.stable.out
        clients/Tests/MAL-signatures_bam.stable.out.int128
        clients/Tests/MAL-signatures_gsl.malC.src
        clients/Tests/MAL-signatures_gsl.stable.err
        clients/Tests/MAL-signatures_gsl.stable.out
        clients/Tests/MAL-signatures_gsl.stable.out.int128
        clients/Tests/MAL-signatures_nocfitsio.malC.src
        clients/Tests/MAL-signatures_nocfitsio.stable.err
        clients/Tests/MAL-signatures_nocfitsio.stable.out
        clients/Tests/MAL-signatures_nocfitsio.stable.out.int128
        clients/Tests/SQL-dump.sql
        clients/Tests/SQL-dump.stable.err
        clients/Tests/SQL-dump.stable.out
        clients/Tests/SQL-dump.stable.out.32bit
        clients/Tests/SQL-dump.stable.out.64bit.oid32
        clients/Tests/SQL-dump.stable.out.64bit.oid32.int128
        clients/Tests/SQL-dump.stable.out.int128
        clients/Tests/SQL-dump.timeout
        clients/Tests/SQL-dump_all.sql.src
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
        clients/Tests/All
        clients/Tests/MAL-signatures_all.stable.out
        clients/Tests/MAL-signatures_all.stable.out.int128
        clients/Tests/MAL-signatures_none.malC.src
        clients/Tests/MAL-signatures_none.stable.out
        clients/Tests/MAL-signatures_none.stable.out.int128
        clients/Tests/SQL-dump_none.sql.src
        clients/Tests/exports.stable.out
        configure.ag
        gdk/gdk.h
        gdk/gdk_firstn.c
        monetdb5/extras/rapi/Tests/All
        monetdb5/extras/rapi/Tests/rapi07.malC
        monetdb5/extras/rapi/Tests/rapi07.stable.out
        monetdb5/extras/rapi/Tests/rapi08.malC
        monetdb5/extras/rapi/Tests/rapi08.stable.out
        monetdb5/extras/rapi/rapi.c
        monetdb5/extras/rapi/rapi.mal
        monetdb5/mal/Tests/tst1225.mal
        monetdb5/mal/Tests/tst1225.stable.out
        monetdb5/mal/Tests/tst220.mal
        monetdb5/mal/Tests/tst220.stable.out
        monetdb5/mal/Tests/tst2510.mal
        monetdb5/mal/Tests/tst2510.stable.out
        monetdb5/mal/mal_interpreter.c
        monetdb5/mal/mal_parser.c
        monetdb5/mal/mal_resolve.c
        monetdb5/modules/atoms/json.c
        monetdb5/modules/atoms/json.h
        monetdb5/modules/atoms/json.mal
        monetdb5/modules/kernel/algebra.c
        monetdb5/modules/kernel/algebra.mal
        monetdb5/modules/mal/Tests/pqueue.mal
        monetdb5/modules/mal/Tests/pqueue.stable.out
        monetdb5/modules/mal/Tests/pqueue2.mal
        monetdb5/modules/mal/Tests/pqueue2.stable.out
        monetdb5/modules/mal/Tests/pqueue3.mal
        monetdb5/modules/mal/Tests/pqueue3.stable.out
        monetdb5/modules/mal/bbp.c
        monetdb5/optimizer/Tests/common.mal
        monetdb5/optimizer/Tests/common.stable.out
        monetdb5/optimizer/Tests/reorder01.mal
        monetdb5/optimizer/Tests/reorder01.stable.out
        monetdb5/optimizer/Tests/tst4631.mal
        monetdb5/optimizer/Tests/tst4631.stable.out
        monetdb5/optimizer/Tests/tst4730.mal
        monetdb5/optimizer/Tests/tst4730.stable.out
        monetdb5/optimizer/opt_support.c
        monetdb5/scheduler/run_pipeline.c
        monetdb5/tests/gdkTests/Tests/firstn.mal
        sql/backends/monet5/embeddedclient.c.in
        sql/backends/monet5/generator/Tests/generator00.sql
        sql/backends/monet5/generator/Tests/generator00.stable.out
        sql/backends/monet5/sql_gencode.c
        sql/backends/monet5/sql_scenario.c
        sql/benchmarks/tpch/Tests/02-explain.stable.out
        sql/benchmarks/tpch/Tests/03-explain.stable.out
        sql/benchmarks/tpch/Tests/10-explain.stable.out
        sql/benchmarks/tpch/Tests/18-explain.stable.out
        sql/benchmarks/tpch/Tests/21-explain.stable.out
        sql/storage/bat/bat_logger.c
        sql/storage/store.c
        
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
        sql/test/BugTracker-2014/Tests/All
        testing/Mtest.py.in
        testing/README
Branch: geo
Log Message:

Merge with default branch.


diffs (truncated from 792572 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
@@ -230,7 +230,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_17D7FB69076E415C8973295D502161C5"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\iconv-1.11.1.win32-vs10\\bin\\iconv.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll"
             "TargetName" = "8:iconv.dll"
             "Tag" = "8:"
             "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -250,7 +250,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E74F1B1BDE548A7922BAD968E690A3A"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\bzip2-1.0.6.win32-vs10\\bin\\libbz2.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\bzip2-1.0.6.win32\\bin\\libbz2.dll"
             "TargetName" = "8:libbz2.dll"
             "Tag" = "8:"
             "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -290,7 +290,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4F0D2367141846EFA634DA35B05CDA4D"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\zlib-1.2.5.win32-vs10\\bin\\zlib1.dll"
+            "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll"
             "TargetName" = "8:zlib1.dll"
             "Tag" = "8:"
             "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -330,7 +330,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\libeay32.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.1g.win32\\bin\\libeay32.dll"
             "TargetName" = "8:libeay32.dll"
             "Tag" = "8:"
             "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -370,7 +370,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B1B1C0011D7945F892A77F529772EA72"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\ssleay32.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.1g.win32\\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
@@ -226,7 +226,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\geos-3.4.2.win32-vs10\\bin\\geos_c.dll"
+            "SourcePath" = "8:C:\\Libraries\\geos-3.4.2.win32\\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
@@ -1042,7 +1042,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_03431EDC85094776AD217020CB3E26D4"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\zlib-1.2.5.win32-vs10\\lib\\zdll.lib"
+            "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\lib\\zdll.lib"
             "TargetName" = "8:zdll.lib"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1182,7 +1182,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0D84516ED4054FEA84A5E2C60F42AFE3"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\bzip2-1.0.6.win32-vs10\\bin\\libbz2.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\bzip2-1.0.6.win32\\bin\\libbz2.dll"
             "TargetName" = "8:libbz2.dll"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1282,7 +1282,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_13440C2EDE6842BF8D9F24F554EEB87F"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\libxml2-2.7.8.win32-vs10\\lib\\libxml2.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\libxml2-2.7.8.win32\\lib\\libxml2.dll"
             "TargetName" = "8:libxml2.dll"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1442,7 +1442,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1AF238588D2D4EA5A416D48291406811"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\iconv-1.11.1.win32-vs10\\lib\\iconv.lib"
+            "SourcePath" = 
"8:C:\\Libraries\\iconv-1.11.1.win32\\lib\\iconv.lib"
             "TargetName" = "8:iconv.lib"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1682,7 +1682,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2C7B5DF9CBE642149692C67FC052ECA4"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\iconv-1.11.1.win32-vs10\\bin\\iconv.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\iconv-1.11.1.win32\\bin\\iconv.dll"
             "TargetName" = "8:iconv.dll"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1722,7 +1722,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2CC8B012C0CB4DFC8F2223F62310125F"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\libxml2-2.7.8.win32-vs10\\lib\\libxml2.lib"
+            "SourcePath" = 
"8:C:\\Libraries\\libxml2-2.7.8.win32\\lib\\libxml2.lib"
             "TargetName" = "8:libxml2.lib"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1742,7 +1742,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E0FEE7726DA47369758C263666F3DB1"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\lib\\libeay32.lib"
+            "SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.1g.win32\\lib\\libeay32.lib"
             "TargetName" = "8:libeay32.lib"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2002,7 +2002,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_45C820B6483D494EBFE6F9A28A30760C"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\ssleay32.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.1g.win32\\bin\\ssleay32.dll"
             "TargetName" = "8:ssleay32.dll"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2082,7 +2082,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_52DCEC5806254D3F9246489B9C5DFC27"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\pcre-8.13.win32-vs10\\bin\\pcre.dll"
+            "SourcePath" = "8:C:\\Libraries\\pcre-8.13.win32\\bin\\pcre.dll"
             "TargetName" = "8:pcre.dll"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2362,7 +2362,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_732094CE07974147A084EDD6A5F43C6F"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\lib\\ssleay32.lib"
+            "SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.1g.win32\\lib\\ssleay32.lib"
             "TargetName" = "8:ssleay32.lib"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2662,7 +2662,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_88661B3BC7724CF992AC6079E040DE3A"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\zlib-1.2.5.win32-vs10\\bin\\zlib1.dll"
+            "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll"
             "TargetName" = "8:zlib1.dll"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3062,7 +3062,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A3D31DA50E0F4AE1873E390D5B7F1F33"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\pcre-8.13.win32-vs10\\lib\\pcre.lib"
+            "SourcePath" = "8:C:\\Libraries\\pcre-8.13.win32\\lib\\pcre.lib"
             "TargetName" = "8:pcre.lib"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3522,7 +3522,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CA3CFDD1291E474EAE85329E4C5E5D45"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\bzip2-1.0.6.win32-vs10\\lib\\libbz2.lib"
+            "SourcePath" = 
"8:C:\\Libraries\\bzip2-1.0.6.win32\\lib\\libbz2.lib"
             "TargetName" = "8:libbz2.lib"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3902,7 +3902,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E80B0549492B4D76B7EB93941A6BF89D"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.1g.win32-vs10\\bin\\libeay32.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.1g.win32\\bin\\libeay32.dll"
             "TargetName" = "8:libeay32.dll"
             "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
@@ -230,7 +230,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_17D7FB69076E415C8973295D502161C5"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\iconv-1.11.1.win64-vs10\\bin\\iconv.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\iconv-1.11.1.win64\\bin\\iconv.dll"
             "TargetName" = "8:iconv.dll"
             "Tag" = "8:"
             "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -250,7 +250,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E74F1B1BDE548A7922BAD968E690A3A"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\bzip2-1.0.6.win64-vs10\\bin\\libbz2.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\bzip2-1.0.6.win64\\bin\\libbz2.dll"
             "TargetName" = "8:libbz2.dll"
             "Tag" = "8:"
             "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -290,7 +290,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4F0D2367141846EFA634DA35B05CDA4D"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\zlib-1.2.5.win64-vs10\\bin\\zlib1.dll"
+            "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win64\\bin\\zlib1.dll"
             "TargetName" = "8:zlib1.dll"
             "Tag" = "8:"
             "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -330,7 +330,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.1g.win64-vs10\\bin\\libeay32.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.1g.win64\\bin\\libeay32.dll"
             "TargetName" = "8:libeay32.dll"
             "Tag" = "8:"
             "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -370,7 +370,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B1B1C0011D7945F892A77F529772EA72"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.1g.win64-vs10\\bin\\ssleay32.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\openssl-1.0.1g.win64\\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
@@ -226,7 +226,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C07D912740F414490DD35D5A179D268"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\geos-3.4.2.win64-vs10\\bin\\geos_c.dll"
+            "SourcePath" = "8:C:\\Libraries\\geos-3.4.2.win64\\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
@@ -1042,7 +1042,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_03431EDC85094776AD217020CB3E26D4"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\zlib-1.2.5.win64-vs10\\lib\\zdll.lib"
+            "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win64\\lib\\zdll.lib"
             "TargetName" = "8:zdll.lib"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1182,7 +1182,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0D84516ED4054FEA84A5E2C60F42AFE3"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\bzip2-1.0.6.win64-vs10\\bin\\libbz2.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\bzip2-1.0.6.win64\\bin\\libbz2.dll"
             "TargetName" = "8:libbz2.dll"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1282,7 +1282,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_13440C2EDE6842BF8D9F24F554EEB87F"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\libxml2-2.7.8.win64-vs10\\lib\\libxml2.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\libxml2-2.7.8.win64\\lib\\libxml2.dll"
             "TargetName" = "8:libxml2.dll"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1442,7 +1442,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1AF238588D2D4EA5A416D48291406811"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\iconv-1.11.1.win64-vs10\\lib\\iconv.lib"
+            "SourcePath" = 
"8:C:\\Libraries\\iconv-1.11.1.win64\\lib\\iconv.lib"
             "TargetName" = "8:iconv.lib"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1682,7 +1682,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2C7B5DF9CBE642149692C67FC052ECA4"
             {
-            "SourcePath" = 
"8:C:\\Libraries\\iconv-1.11.1.win64-vs10\\bin\\iconv.dll"
+            "SourcePath" = 
"8:C:\\Libraries\\iconv-1.11.1.win64\\bin\\iconv.dll"
             "TargetName" = "8:iconv.dll"
             "Tag" = "8:"
             "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1722,7 +1722,7 @@
             }
             
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2CC8B012C0CB4DFC8F2223F62310125F"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to