Changeset: fb5c2b65214e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fb5c2b65214e
Modified Files:
configure.ag
gdk/gdk_batop.mx
Branch: headless
Log Message:
Merge with default branch.
diffs (truncated from 522 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -426,6 +426,7 @@
%{_bindir}/monetdbd
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/log/monetdb
%dir %attr(775,monetdb,monetdb) %{_localstatedir}/run/monetdb
+%config(noreplace) %{_localstatedir}/monetdb5/dbfarm/.merovingian_properties
%{_libdir}/monetdb5/autoload/*_sql.mal
%{_libdir}/monetdb5/lib_sql.so
%{_libdir}/monetdb5/*.sql
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
@@ -483,12 +483,6 @@
}
"Entry"
{
- "MsmKey" = "8:_6C605D6DB31644C1B23703C74D5B6228"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_6CFF978DAFC84A13A71E567B2ADFDD47"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -513,12 +507,6 @@
}
"Entry"
{
- "MsmKey" = "8:_6FA09793BDB642349D5BBEB312B3C9A1"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_701BE534B39D4EEAB9CD049BF655DAC3"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -759,12 +747,6 @@
}
"Entry"
{
- "MsmKey" = "8:_A01C9992A9EB46F8A00066802B230545"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_A163A151799044B18699C00EDFEB597E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2813,26 +2795,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C605D6DB31644C1B23703C74D5B6228"
- {
- "SourcePath" = "8:lib\\monetdb5\\autoload\\05_xml.mal"
- "TargetName" = "8:05_xml.mal"
- "Tag" = "8:"
- "Folder" = "8:_A4A821D237B943CFACE8D54F3F3971E3"
- "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}:_6CFF978DAFC84A13A71E567B2ADFDD47"
{
"SourcePath" = "8:lib\\monetdb5\\opt_mapreduce.mal"
@@ -2913,26 +2875,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6FA09793BDB642349D5BBEB312B3C9A1"
- {
- "SourcePath" = "8:lib\\monetdb5\\lib_xml.dll"
- "TargetName" = "8:lib_xml.dll"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "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}:_701BE534B39D4EEAB9CD049BF655DAC3"
{
"SourcePath" = "8:lib\\monetdb5\\createdb\\22_clients.sql"
@@ -3713,26 +3655,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A01C9992A9EB46F8A00066802B230545"
- {
- "SourcePath" = "8:lib\\monetdb5\\lib_batxml.dll"
- "TargetName" = "8:lib_batxml.dll"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "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}:_A163A151799044B18699C00EDFEB597E"
{
"SourcePath" = "8:lib\\monetdb5\\calc.mal"
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
@@ -483,12 +483,6 @@
}
"Entry"
{
- "MsmKey" = "8:_6C605D6DB31644C1B23703C74D5B6228"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_6CFF978DAFC84A13A71E567B2ADFDD47"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -513,12 +507,6 @@
}
"Entry"
{
- "MsmKey" = "8:_6FA09793BDB642349D5BBEB312B3C9A1"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_701BE534B39D4EEAB9CD049BF655DAC3"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -759,12 +747,6 @@
}
"Entry"
{
- "MsmKey" = "8:_A01C9992A9EB46F8A00066802B230545"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_A163A151799044B18699C00EDFEB597E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2813,26 +2795,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6C605D6DB31644C1B23703C74D5B6228"
- {
- "SourcePath" = "8:lib\\monetdb5\\autoload\\05_xml.mal"
- "TargetName" = "8:05_xml.mal"
- "Tag" = "8:"
- "Folder" = "8:_A4A821D237B943CFACE8D54F3F3971E3"
- "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}:_6CFF978DAFC84A13A71E567B2ADFDD47"
{
"SourcePath" = "8:lib\\monetdb5\\opt_mapreduce.mal"
@@ -2913,26 +2875,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_6FA09793BDB642349D5BBEB312B3C9A1"
- {
- "SourcePath" = "8:lib\\monetdb5\\lib_xml.dll"
- "TargetName" = "8:lib_xml.dll"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "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}:_701BE534B39D4EEAB9CD049BF655DAC3"
{
"SourcePath" = "8:lib\\monetdb5\\createdb\\22_clients.sql"
@@ -3713,26 +3655,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A01C9992A9EB46F8A00066802B230545"
- {
- "SourcePath" = "8:lib\\monetdb5\\lib_batxml.dll"
- "TargetName" = "8:lib_batxml.dll"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "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}:_A163A151799044B18699C00EDFEB597E"
{
"SourcePath" = "8:lib\\monetdb5\\calc.mal"
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -303,9 +303,6 @@
!IFDEF HAVE_RUBYGEM
HAVE_RUBYGEM_FALSE=^#
!ENDIF
-!IFDEF HAVE_SWIG
-HAVE_SWIG_FALSE=^#
-!ENDIF
!IFDEF PROFILING
PROFILING_FALSE=^#
!ENDIF
@@ -336,7 +333,6 @@
"HAVE_PYTHON_FALSE=$(HAVE_PYTHON_FALSE)" \
"HAVE_RAPTOR_FALSE=$(HAVE_RAPTOR_FALSE)" \
"HAVE_RUBYGEM_FALSE=$(HAVE_RUBYGEM_FALSE)" \
- "HAVE_SWIG_FALSE=$(HAVE_SWIG_FALSE)" \
"JDBCCLIENT_JAR=$(JDBCCLIENT_JAR)" \
"LIBICONV=$(LIBICONV)" \
"LIBXML2=$(LIBXML2)" \
diff --git a/buildtools/doc/HowToRelease.rst b/buildtools/doc/HowToRelease.rst
--- a/buildtools/doc/HowToRelease.rst
+++ b/buildtools/doc/HowToRelease.rst
@@ -118,13 +118,13 @@
In both cases, use these ``nmake`` options for a 32 bit compile:
``NDEBUG=1 HAVE_JAVA=1 HAVE_JAVAJDBC=1 HAVE_JAVAXRPC=1 HAVE_PYTHON=1
- HAVE_SWIG=1 HAVE_PHP=1 HAVE_PCRE=1 HAVE_MONETDB4=1 HAVE_MONETDB5=1
+ HAVE_PHP=1 HAVE_PCRE=1 HAVE_MONETDB4=1 HAVE_MONETDB5=1
HAVE_PERL=1 HAVE_PERL_SWIG=1 HAVE_PERL_DEVEL=1 HAVE_LIBXML2=1
HAVE_MONETDB5_XML=1``
Use these ``nmake`` options for a 64 bit compile: ``bits=64 NDEBUG=1
HAVE_MONETDB4=1 HAVE_MONETDB5=1 HAVE_JAVA=1 HAVE_JAVAJDBC=1
- HAVE_JAVAXRPC=1 HAVE_PYTHON=1 HAVE_SWIG=1 HAVE_PCRE=1 HAVE_PERL=1
+ HAVE_JAVAXRPC=1 HAVE_PYTHON=1 HAVE_PCRE=1 HAVE_PERL=1
HAVE_PERL_SWIG=1 HAVE_PERL_DEVEL=1 HAVE_LIBXML2=1 HAVE_MONETDB5_XML=1``
- Create PGP signatures and SHA1 checksums::
diff --git a/clients/Makefile.ag b/clients/Makefile.ag
--- a/clients/Makefile.ag
+++ b/clients/Makefile.ag
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
