Changeset: 1134cf059d52 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1134cf059d52
Modified Files:
HowToStart.rst
MonetDB.spec
NT/rules.msc
buildtools/conf/rules.mk
buildtools/doc/windowsbuild.rst
debian/control
Branch: Aug2011
Log Message:
removed build-requirement SWIG
Since changeset 1de9069bd830, we no longer require SWIG to build MonetDB.
diffs (87 lines):
diff --git a/HowToStart.rst b/HowToStart.rst
--- a/HowToStart.rst
+++ b/HowToStart.rst
@@ -93,7 +93,6 @@
configuration and if they are missing, the feature is just
missing:
- - swig
- perl
- php
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -49,7 +49,6 @@
BuildRequires: readline-devel
BuildRequires: ruby
BuildRequires: rubygems
-BuildRequires: swig
BuildRequires: unixODBC-devel
BuildRequires: zlib-devel
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -173,7 +173,6 @@
# install python, flex and bison on your systems
PYTHON = python
YACC = bison -b y -y
-SWIG = swig
ARCHIVER = lib
GENDLL =
diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk
--- a/buildtools/conf/rules.mk
+++ b/buildtools/conf/rules.mk
@@ -119,7 +119,3 @@
$(CP) $< $@
SUFFIXES-local: $(BUILT_SOURCES)
-
-distdir: check_dist
-check_dist:
- @if [ "$(SWIG)" = "no" ]; then echo "Cannot create distribution because
one of the necessary programs or libraries is missing"; echo "swig =
$(SWIG)"; exit 1; fi
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -557,18 +557,6 @@
__ http://www.php.net/
-.. _SWIG:
-
-SWIG (Simplified Wrapper and Interface Generator)
--------------------------------------------------
-
-We use SWIG__ to build interface files for Perl. You can download
-SWIG from http://www.swig.org/download.html. Get the latest swigwin
-ZIP file and extract it somewhere. It contains the ``swig.exe``
-binary.
-
-__ http://www.swig.org/
-
Java
----
@@ -702,8 +690,6 @@
set Path=%JAVA_HOME%\bin;%ProgramFiles%\Java\jre1.5.0_16\bin;%Path%
rem Apache Ant is optional, but required for Java compilation
set Path=%ProgramFiles%\apache-ant-1.7.1\bin;%Path%
- rem SWIG is optional
- set Path=%ProgramFiles%\swigwin-1.3.36;%Path%
For testing purposes it may be handy to add some more folders to the
``Path``. This includes the ``bin`` and ``lib`` folders of the
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@
Homepage: http://www.monetdb.org/
Vcs-Browser: http://dev.monetdb.org/hg/MonetDB/
Vcs-Hg: http://dev.monetdb.org/hg/MonetDB/
-Build-Depends: debhelper (>= 5), autotools-dev, cdbs, bison, flex, libbz2-dev,
libcurl4-gnutls-dev, libgeos-dev, libpcre3-dev, libperl-dev, libreadline5-dev,
libssl-dev, libxml2-dev, perl, python, ruby, rubygems, swig, unixodbc-dev,
uuid-dev, zlib1g-dev
+Build-Depends: debhelper (>= 5), autotools-dev, cdbs, bison, flex, libbz2-dev,
libcurl4-gnutls-dev, libgeos-dev, libpcre3-dev, libperl-dev, libreadline5-dev,
libssl-dev, libxml2-dev, perl, python, ruby, rubygems, unixodbc-dev, uuid-dev,
zlib1g-dev
# Build-Depends: libraptor1-dev
Standards-Version: 3.8.0
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
