Changeset: 1b7ef943b6a7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1b7ef943b6a7
Modified Files:
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/rules.msc
configure.ag
geom/Makefile.ag
template/conf/Tests/monetdb-template-conds.stable.out.32bit
template/conf/Tests/monetdb-template-conds.stable.out.64bit
template/conf/Tests/monetdb-template-conds.stable.out.Debian4.0.32bit
template/conf/Tests/monetdb-template-conds.stable.out.SunOS5.11.32bit
template/conf/monetdb-template-config.in
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Mar2011 branch.
diffs (truncated from 310 to 300 lines):
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
@@ -543,6 +543,12 @@
}
"Entry"
{
+ "MsmKey" = "8:_79904C664C574CFCB7FABC1C257088EA"
+ "OwnerKey" = "8:_UNDEFINED"
+ "MsmSig" = "8:_UNDEFINED"
+ }
+ "Entry"
+ {
"MsmKey" = "8:_79913254858B4D8E9D7B5ADFB32DEA88"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -741,12 +747,6 @@
}
"Entry"
{
- "MsmKey" = "8:_A01C9992A9EB46F8A00066802B230545"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_A163A151799044B18699C00EDFEB597E"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2995,6 +2995,26 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
+
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_79904C664C574CFCB7FABC1C257088EA"
+ {
+ "SourcePath" = "8:lib\\monetdb5\\batxml.mal"
+ "TargetName" = "8:batxml.mal"
+ "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}:_79913254858B4D8E9D7B5ADFB32DEA88"
{
"SourcePath" = "8:lib\\monetdb5\\opt_joinpath.mal"
@@ -3635,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
@@ -23,3 +23,17 @@
TESTS = RunMtest
TESTS_ENVIRONMENT = $(SHELL)
+
+scripts_sh = {
+ EXT = ""
+ COND = NOT_WIN32
+ NOINST
+ SOURCES = RunMapprove.in RunMtest.in
+}
+
+scripts_bat = {
+ EXT = bat
+ COND = NATIVE_WIN32
+ NOINST
+ SOURCES = RunMapprove.bat.in Runmclient.bat.in RunMtest.bat.in
+}
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1286,7 +1286,6 @@
esac
fi
AC_SUBST(SWIG)
-AM_CONDITIONAL(HAVE_SWIG, test x"$SWIG" != xno)
have_perl=auto
PERL=perl
diff --git a/gdk/gdk_batop.mx b/gdk/gdk_batop.mx
--- a/gdk/gdk_batop.mx
+++ b/gdk/gdk_batop.mx
@@ -228,7 +228,7 @@
}
if (toff != ~(size_t) 0) {
b->T->varsized = 1;
- n->H->varsized = 1;
+ n->T->varsized = 1;
b->T->type = TYPE_str;
}
return NULL;
diff --git a/geom/Makefile.ag b/geom/Makefile.ag
--- a/geom/Makefile.ag
+++ b/geom/Makefile.ag
@@ -22,3 +22,17 @@
TESTS = RunMtest
TESTS_ENVIRONMENT = $(SHELL)
+
+scripts_sh = {
+ EXT = ""
+ COND = NOT_WIN32
+ NOINST
+ SOURCES = RunMapprove.in RunMtest.in
+}
+
+scripts_bat = {
+ EXT = bat
+ COND = NATIVE_WIN32
+ NOINST
+ SOURCES = RunMapprove.bat.in RunMserver.bat.in RunMtest.bat.in
+}
diff --git a/monetdb5/Makefile.ag b/monetdb5/Makefile.ag
--- a/monetdb5/Makefile.ag
+++ b/monetdb5/Makefile.ag
@@ -29,3 +29,17 @@
TESTS = RunMtest
TESTS_ENVIRONMENT = $(SHELL)
+
+scripts_sh = {
+ EXT = ""
+ COND = NOT_WIN32
+ NOINST
+ SOURCES = RunMapprove.in RunMserver.in RunMtest.in
+}
+
+scripts_bat = {
+ EXT = bat
+ COND = NATIVE_WIN32
+ NOINST
+ SOURCES = RunMapprove.bat.in RunMserver.bat.in RunMtest.bat.in
+}
diff --git a/sql/Makefile.ag b/sql/Makefile.ag
--- a/sql/Makefile.ag
+++ b/sql/Makefile.ag
@@ -37,3 +37,17 @@
TESTS = RunMtest
TESTS_ENVIRONMENT = $(SHELL)
+
+scripts_sh = {
+ EXT = ""
+ COND = NOT_WIN32
+ NOINST
+ SOURCES = RunMapprove.in RunMserver.in RunMtest.in
+}
+
+scripts_bat = {
+ EXT = bat
+ COND = NATIVE_WIN32
+ NOINST
+ SOURCES = RunMapprove.bat.in RunMserver.bat.in RunMtest.bat.in
+}
diff --git a/template/Makefile.ag b/template/Makefile.ag
--- a/template/Makefile.ag
+++ b/template/Makefile.ag
@@ -21,3 +21,10 @@
TESTS = RunMtest
TESTS_ENVIRONMENT = $(SHELL)
+
+scripts_sh = {
+ EXT = ""
+ COND = NOT_WIN32
+ NOINST
+ SOURCES = RunMapprove.in RunMtest.in
+}
diff --git a/template/conf/Tests/monetdb-template-conds.stable.out.32bit
b/template/conf/Tests/monetdb-template-conds.stable.out.32bit
--- a/template/conf/Tests/monetdb-template-conds.stable.out.32bit
+++ b/template/conf/Tests/monetdb-template-conds.stable.out.32bit
@@ -24,7 +24,6 @@
HAVE_PERL_SWIG=#
HAVE_PYTHON=#
HAVE_RUBYGEM=#
-HAVE_SWIG=#
LINK_STATIC=
NATIVE_WIN32=
NEED_MX=#
diff --git a/template/conf/Tests/monetdb-template-conds.stable.out.64bit
b/template/conf/Tests/monetdb-template-conds.stable.out.64bit
--- a/template/conf/Tests/monetdb-template-conds.stable.out.64bit
+++ b/template/conf/Tests/monetdb-template-conds.stable.out.64bit
@@ -24,7 +24,6 @@
HAVE_PERL_SWIG=#
HAVE_PYTHON=#
HAVE_RUBYGEM=#
-HAVE_SWIG=#
LINK_STATIC=
NATIVE_WIN32=
NEED_MX=#
diff --git
a/template/conf/Tests/monetdb-template-conds.stable.out.Debian4.0.32bit
b/template/conf/Tests/monetdb-template-conds.stable.out.Debian4.0.32bit
--- a/template/conf/Tests/monetdb-template-conds.stable.out.Debian4.0.32bit
+++ b/template/conf/Tests/monetdb-template-conds.stable.out.Debian4.0.32bit
@@ -24,7 +24,6 @@
HAVE_PERL_SWIG=#
HAVE_PYTHON=#
HAVE_RUBYGEM=#
-HAVE_SWIG=#
LINK_STATIC=
NATIVE_WIN32=
NEED_MX=#
diff --git
a/template/conf/Tests/monetdb-template-conds.stable.out.SunOS5.11.32bit
b/template/conf/Tests/monetdb-template-conds.stable.out.SunOS5.11.32bit
--- a/template/conf/Tests/monetdb-template-conds.stable.out.SunOS5.11.32bit
+++ b/template/conf/Tests/monetdb-template-conds.stable.out.SunOS5.11.32bit
@@ -24,7 +24,6 @@
HAVE_PERL_SWIG=#
HAVE_PYTHON=#
HAVE_RUBYGEM=#
-HAVE_SWIG=#
LINK_STATIC=
NATIVE_WIN32=
NEED_MX=#
diff --git a/template/conf/monetdb-template-config.in
b/template/conf/monetdb-template-config.in
--- a/template/conf/monetdb-template-config.in
+++ b/template/conf/monetdb-template-config.in
@@ -98,7 +98,6 @@
echo HAVE_PERL_SWIG=@HAVE_PERL_SWIG_FALSE@
echo HAVE_PYTHON=@HAVE_PYTHON_FALSE@
echo HAVE_RUBYGEM=@HAVE_RUBYGEM_FALSE@
- echo HAVE_SWIG=@HAVE_SWIG_FALSE@
echo LINK_STATIC=@LINK_STATIC_FALSE@
echo NATIVE_WIN32=@NATIVE_WIN32_FALSE@
echo NEED_MX=@NEED_MX_FALSE@
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
