Changeset: 1a439b62bdb3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1a439b62bdb3
Modified Files:
NT/rules.msc
buildtools/doc/HowToRelease.rst
configure.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: Mar2011
Log Message:
Symbol HAVE_SWIG is nowhere actually used.
diffs (117 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -315,9 +315,6 @@
!IFDEF HAVE_RUBYGEM
HAVE_RUBYGEM_FALSE=^#
!ENDIF
-!IFDEF HAVE_SWIG
-HAVE_SWIG_FALSE=^#
-!ENDIF
!IFDEF PROFILING
PROFILING_FALSE=^#
!ENDIF
@@ -354,7 +351,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/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1418,7 +1418,6 @@
esac
fi
AC_SUBST(SWIG)
-AM_CONDITIONAL(HAVE_SWIG, test x"$SWIG" != xno)
have_perl=auto
PERL=perl
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
@@ -25,7 +25,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
@@ -25,7 +25,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
@@ -25,7 +25,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
@@ -25,7 +25,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
@@ -105,7 +105,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
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -233,7 +233,6 @@
'HAVE_RUBYGEM' : "@HAVE_RUBYGEM_FALSE@",
'HAVE_SPHINXCLIENT' : "@HAVE_SPHINXCLIENT_FALSE@",
'HAVE_SQL' : "@HAVE_SQL_FALSE@",
- 'HAVE_SWIG' : "@HAVE_SWIG_FALSE@",
'HAVE_TESTING' : "@HAVE_TESTING_FALSE@",
'LINK_STATIC' : "@LINK_STATIC_FALSE@",
'NATIVE_WIN32' : "@NATIVE_WIN32_FALSE@",
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
