You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/03/03 22:00:59 UTC
svn commit: r918685 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: stsp
Date: Wed Mar 3 21:00:59 2010
New Revision: 918685
URL: http://svn.apache.org/viewvc?rev=918685&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Build Perl bindings by default.
Allow overriding ENABLE_* settings for bindings from command line.
Use correct BDB configure flags for various branches.
Expect http:// test repositories in /tmp instead of /tmp/svn.
Various whitespace and other small fixes.
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=918685&r1=918684&r2=918685&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Wed Mar 3 21:00:59 2010
@@ -28,9 +28,9 @@
# After the build, point your PATH to the Subversion build you want to use.
# Note that this Makefile requires GNU make.
-ENABLE_PYTHON_BINDINGS = yes
-ENABLE_RUBY_BINDINGS = yes
-ENABLE_PERL_BINDINGS = no
+ENABLE_PYTHON_BINDINGS ?= yes
+ENABLE_RUBY_BINDINGS ?= yes
+ENABLE_PERL_BINDINGS ?= yes
PWD = $(shell pwd)
@@ -94,7 +94,6 @@
HTTPD_SRCDIR = $(SRCDIR)/httpd-$(HTTPD_VER)
NEON_SRCDIR = $(SRCDIR)/neon-$(NEON_VER)
SERF_SRCDIR = $(SRCDIR)/serf-$(SERF_VER)
-SERF_SRCDIR = $(SRCDIR)/serf-$(SERF_VER)
SQLITE_SRCDIR = $(SRCDIR)/sqlite-$(SQLITE_VER)
SVN_SRCDIR = $(SVN_WC)
@@ -599,12 +598,20 @@
fi
touch $@
-ifeq ($(BRANCH),trunk)
-BDB_FLAG=db.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER)
-else ifeq ($(BRANCH_MAJOR),1.6)
-BDB_FLAG=db.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER)
-else
+ifeq ($(BRANCH_MAJOR),1.5)
+BDB_FLAG=$(PREFIX)/bdb
+else ifeq ($(BRANCH_MAJOR),1.4)
+BDB_FLAG=$(PREFIX)/bdb
+else ifeq ($(BRANCH_MAJOR),1.3)
BDB_FLAG=$(PREFIX)/bdb
+else ifeq ($(BRANCH_MAJOR),1.2)
+BDB_FLAG=$(PREFIX)/bdb
+else ifeq ($(BRANCH_MAJOR),1.1)
+BDB_FLAG=$(PREFIX)/bdb
+else ifeq ($(BRANCH_MAJOR),1.0)
+BDB_FLAG=$(PREFIX)/bdb
+else
+BDB_FLAG=db.h:$(PREFIX)/bdb/include:$(PREFIX)/bdb/lib:db-$(BDB_MAJOR_VER)
endif
# configure svn
@@ -713,10 +720,11 @@
echo " AuthUserFile $(HTTPD_CHECK_USERS)" >> $(HTTPD_CHECK_CONF)
echo " Require valid-user" >> $(HTTPD_CHECK_CONF)
echo "</Location>" >> $(HTTPD_CHECK_CONF)
- echo "# This Location lets you access repositories dropped in /tmp/svn/" >> $(HTTPD_CHECK_CONF)
+ echo "# This Location lets you access repositories dropped in /tmp/" >> $(HTTPD_CHECK_CONF)
echo "<Location /svn>" >> $(HTTPD_CHECK_CONF)
echo " DAV svn" >> $(HTTPD_CHECK_CONF)
- echo " SVNParentPath /tmp/svn" >> $(HTTPD_CHECK_CONF)
+ echo " SVNParentPath /tmp" >> $(HTTPD_CHECK_CONF)
+ echo " Allow from all" >> $(HTTPD_CHECK_CONF)
echo "</Location>" >> $(HTTPD_CHECK_CONF)
# We need this to make sure some targets below pick up the right libraries
@@ -725,23 +733,23 @@
.PHONY: start-svnserve stop-svnserve start-httpd stop-httpd
HTTPD_CMD = env LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) \
- $(PREFIX)/httpd/bin/apachectl -f conf/httpd-svn-check-$(WC).conf
+ $(PREFIX)/httpd/bin/apachectl \
+ -f conf/httpd-svn-check-$(WC).conf
HTTPD_START_CMD = $(HTTPD_CMD) -k start
HTTPD_STOP_CMD = $(HTTPD_CMD) -k stop
SVNSERVE_START_CMD = $(svn_builddir)/subversion/svnserve/svnserve \
- --listen-host 127.0.0.1 \
- --pid-file $(PWD)/svnserve-$(WC).pid \
- -d -r $(svn_builddir)/subversion/tests/cmdline
+ --listen-host 127.0.0.1 \
+ --pid-file $(PWD)/svnserve-$(WC).pid \
+ -d -r $(svn_builddir)/subversion/tests/cmdline
SVNSERVE_STOP_CMD = kill `cat $(PWD)/svnserve-$(WC).pid`
start-httpd: httpd-conf
$(HTTPD_START_CMD)
- @echo " make check BASE_URL=http://localhost:$(HTTPD_CHECK_PORT)"
- @echo "and"
- @echo " http://localhost:$(HTTPD_CHECK_PORT)/svn/\*"
- @echo " maps to"
- @echo " /tmp/svn/\*"
+ @echo "To run tests over http, run:"
+ @echo " make check BASE_URL=http://localhost:$(HTTPD_CHECK_PORT)"
+ @echo "The URL http://localhost:$(HTTPD_CHECK_PORT)/svn/"
+ @echo "lets you access repositories dropped into /tmp"
stop-httpd:
$(HTTPD_STOP_CMD)