Changeset: 0833dbb8c20a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0833dbb8c20a
Modified Files:
NT/rules.msc
buildtools/doc/HowToRelease.rst
buildtools/doc/windowsbuild.rst
monetdb5/tests/mapi/Tests/All
sql/test/mapi/Tests/All
testing/Mtest.py.in
Branch: Aug2011
Log Message:
removed obsolete occurances of HAVE_PERL_DEVEL & HAVE_PERL_SWIG:
changeset 1de9069bd830 removed AM_CONDITIONALs HAVE_PERL_DEVEL & HAVE_PERL_SWIG
from configure.ag;
hence, we also remove the remaining (now obsolete) occurances of them.
diffs (107 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -277,15 +277,9 @@
!IFDEF HAVE_PCRE
HAVE_PCRE_FALSE=^#
!ENDIF
-!IFDEF HAVE_PERL_DEVEL
-HAVE_PERL_DEVEL_FALSE=^#
-!ENDIF
!IFDEF HAVE_PERL
HAVE_PERL_FALSE=^#
!ENDIF
-!IFDEF HAVE_PERL_SWIG
-HAVE_PERL_SWIG_FALSE=^#
-!ENDIF
!IFDEF HAVE_PHP
HAVE_PHP_FALSE=^#
!ENDIF
@@ -318,9 +312,7 @@
"HAVE_OPENSSL_FALSE=$(HAVE_OPENSSL_FALSE)" \
"HAVE_ODBC_FALSE=$(HAVE_ODBC_FALSE)" \
"HAVE_PCRE_FALSE=$(HAVE_PCRE_FALSE)" \
- "HAVE_PERL_DEVEL_FALSE=$(HAVE_PERL_DEVEL_FALSE)" \
"HAVE_PERL_FALSE=$(HAVE_PERL_FALSE)" \
- "HAVE_PERL_SWIG_FALSE=$(HAVE_PERL_SWIG_FALSE)" \
"HAVE_PHP_FALSE=$(HAVE_PHP_FALSE)" \
"HAVE_PYTHON_FALSE=$(HAVE_PYTHON_FALSE)" \
"HAVE_RAPTOR_FALSE=$(HAVE_RAPTOR_FALSE)" \
diff --git a/buildtools/doc/HowToRelease.rst b/buildtools/doc/HowToRelease.rst
--- a/buildtools/doc/HowToRelease.rst
+++ b/buildtools/doc/HowToRelease.rst
@@ -112,13 +112,11 @@
Use these ``nmake`` options for a 32 bit compile: ``NDEBUG=1
HAVE_JAVA=1 HAVE_JAVAJDBC=1 HAVE_PYTHON=1 HAVE_PHP=1 HAVE_PCRE=1
- HAVE_MONETDB5=1 HAVE_PERL=1 HAVE_PERL_SWIG=1 HAVE_PERL_DEVEL=1
- HAVE_LIBXML2=1 HAVE_MONETDB5_XML=1``
+ HAVE_MONETDB5=1 HAVE_PERL=1 HAVE_LIBXML2=1 HAVE_MONETDB5_XML=1``
Use these ``nmake`` options for a 64 bit compile: ``bits=64 NDEBUG=1
HAVE_MONETDB5=1 HAVE_JAVA=1 HAVE_JAVAJDBC=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``
+ HAVE_PERL=1 HAVE_LIBXML2=1 HAVE_MONETDB5_XML=1``
- Create PGP signatures and SHA1 checksums::
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -536,9 +536,7 @@
We have used ActiveState__'s ActivePerl__ distribution (release
5.12.1.1201). Just install the 32 or 64 bit version and compile the
-clients component with the additional ``nmake`` flags ``HAVE_PERL=1
-HAVE_PERL_DEVEL=1 HAVE_PERL_SWIG=1`` (the latter flag only if SWIG_ is
-also installed).
+clients component with the additional ``nmake`` flags ``HAVE_PERL=1``.
__ http://www.perl.org/
__ http://www.activestate.com/
@@ -757,10 +755,6 @@
- ``HAVE_RAPTOR=1`` - the raptor library is available;
- ``HAVE_OPENSSL=1`` - the OpenSSL library is available;
- ``HAVE_PERL=1`` - Perl is available;
-- ``HAVE_PERL_DEVEL=1`` - Perl development is possible (include files
- and libraries are available--also need ``HAVE_PERL=1``);
-- ``HAVE_PERL_SWIG=1`` - Perl development is possible and SWIG is
- available (also need ``HAVE_PERL=1``);
- ``HAVE_PHP=1`` - PHP is available.
In addition, you can add a parameter which points to a file with extra
diff --git a/monetdb5/tests/mapi/Tests/All b/monetdb5/tests/mapi/Tests/All
--- a/monetdb5/tests/mapi/Tests/All
+++ b/monetdb5/tests/mapi/Tests/All
@@ -6,4 +6,4 @@
smack00
smack01
smack01-slow
-HAVE_PERL_SWIG?perl_dbi
+HAVE_PERL?perl_dbi
diff --git a/sql/test/mapi/Tests/All b/sql/test/mapi/Tests/All
--- a/sql/test/mapi/Tests/All
+++ b/sql/test/mapi/Tests/All
@@ -5,7 +5,7 @@
sample4
smack00
smack01
-HAVE_PERL_SWIG?perl_dbi
+HAVE_PERL?perl_dbi
HAVE_PYTHON?python_dbapi
HAVE_PHP?php_monetdb
utf8test
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -221,9 +221,7 @@
'HAVE_MSEED' : "@HAVE_MSEED_FALSE@",
'HAVE_ODBC' : "@HAVE_ODBC_FALSE@",
'HAVE_PCRE' : "@HAVE_PCRE_FALSE@",
- 'HAVE_PERL_DEVEL' : "@HAVE_PERL_DEVEL_FALSE@",
'HAVE_PERL' : "@HAVE_PERL_FALSE@",
- 'HAVE_PERL_SWIG' : "@HAVE_PERL_SWIG_FALSE@",
'HAVE_PYTHON' : "@HAVE_PYTHON_FALSE@",
'HAVE_RAPTOR' : "@HAVE_RAPTOR_FALSE@",
'HAVE_RUBYGEM' : "@HAVE_RUBYGEM_FALSE@",
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
