[Commits] (vajda) batch of fixes after having done full build on g5

commits at osafoundation.org commits at osafoundation.org
Mon Mar 15 18:23:53 PST 2004


Commit by: vajda
Modified files:
external/.cvsignore 1.1 1.2
external/Makefile 1.3 1.4
external/SOAPpy/patches None 1.1
external/persistence/PyLucene/patches None 1.1
external/persistence/PyLucene/Makefile 1.2 1.3
external/persistence/dbxml/Makefile 1.2 1.3
external/persistence/libxslt/Makefile 1.2 1.3
external/persistence/pathan/Makefile 1.2 1.3
external/python/xcludes None 1.1
external/python/Makefile 1.2 1.3

Log message:
batch of fixes after having done full build on g5


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/.cvsignore.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/external/Makefile.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/external/SOAPpy/patches?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/PyLucene/patches?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/PyLucene/Makefile.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/external/persistence/dbxml/Makefile.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/external/persistence/libxslt/Makefile.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/external/persistence/pathan/Makefile.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/external/python/xcludes?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/python/Makefile.diff?r1=text&tr1=1.2&r2=text&tr2=1.3

Index: external/persistence/dbxml/Makefile
diff -u external/persistence/dbxml/Makefile:1.2 external/persistence/dbxml/Makefile:1.3
--- external/persistence/dbxml/Makefile:1.2	Mon Mar 15 12:20:40 2004
+++ external/persistence/dbxml/Makefile	Mon Mar 15 18:23:19 2004
@@ -29,7 +29,7 @@
 $(SRC)/$(BUILD)/Makefile:
 	cd $(SRC); mkdir -p $(BUILD); cd $(BUILD); \
 	../dist/configure --prefix=$(PREFIX)/dbxml \
-                          --with-berkeley-db=$(PREFIX)/db \
+                          --with-berkeleydb=$(PREFIX)/db \
                           --with-xerces=$(PREFIX) \
                           --with-pathan=$(PREFIX) \
                           $(CONF_DBG)
@@ -41,7 +41,7 @@
 	cd $(SRC)/$(BUILD); $(MAKE); $(MAKE) install; \
 	cd $(SRC)/src/python; \
 	$(PYTHON) setup.py build --build-base=$(BUILD) \
-                                 --with-berkeley-db=$(PREFIX)/db \
+                                 --with-berkeleydb=$(PREFIX)/db \
                                  --with-xerces=$(PREFIX) \
                                  --with-pathan=$(PREFIX) \
                                  $(DIST_DBG) \

Index: external/python/Makefile
diff -u external/python/Makefile:1.2 external/python/Makefile:1.3
--- external/python/Makefile:1.2	Mon Mar 15 12:20:51 2004
+++ external/python/Makefile	Mon Mar 15 18:23:22 2004
@@ -46,7 +46,8 @@
 snap: 
 	cd $(BUILD_ROOT); \
         tar -cvzf $(PYTHON)/$(SNAP).tar.gz \
-                  $(SNAP)/Library/Frameworks/Python.framework
+                  $(SNAP)/Library/Frameworks/Python.framework \
+            -X $(PYTHON)/xcludes
 
 clean:
 	cd $(SRC); rm -rf $(BUILD)

Index: external/persistence/PyLucene/Makefile
diff -u external/persistence/PyLucene/Makefile:1.2 external/persistence/PyLucene/Makefile:1.3
--- external/persistence/PyLucene/Makefile:1.2	Mon Mar 15 12:20:33 2004
+++ external/persistence/PyLucene/Makefile	Mon Mar 15 18:23:18 2004
@@ -29,8 +29,8 @@
                                 DBVERSION=4.2.52 VERSION=$(VERSION) \
                                 all install
 
-expand: lucene-$(VERSION).tar.gz
-	tar xvzf lucene-$(VERSION).tar.gz
+expand: lucene-$(VERSION)-src.tar.gz
+	tar xvzf lucene-$(VERSION)-src.tar.gz
 
 snap: 
 	cd $(BUILD_ROOT); \

Index: external/Makefile
diff -u external/Makefile:1.3 external/Makefile:1.4
--- external/Makefile:1.3	Mon Mar 15 15:20:18 2004
+++ external/Makefile	Mon Mar 15 18:23:17 2004
@@ -43,6 +43,16 @@
 
 default: all
 
+env:
+	@if [ "$(BUILD_ROOT)" = "" ]; then \
+	    echo BUILD_ROOT is not set; \
+	    false; \
+        fi; \
+	if [ "$(GCJ_HOME)" = "" ]; then \
+	    echo GCJ_HOME is not set; \
+	    false; \
+        fi
+
 sources:
 	tar -cvf sources.tar $(SOURCES)
 
@@ -56,7 +66,7 @@
 	    (cd $$system; $(MAKE) expand); \
 	done
 
-binaries:
+binaries: env
 	@rm -f $(SNAP).tar $(SNAP).tar.gz; \
 	for system in $(SYSTEMS); \
 	do \
@@ -72,13 +82,13 @@
 	echo compressing $(SNAP).tar; \
         gzip $(SNAP).tar;
 
-all:
+all: env
 	@for system in $(SYSTEMS); \
 	do \
 	    (cd $$system; $(MAKE) DEBUG=$(DEBUG) all); \
 	done
 
-clean:
+clean: env
 	@for system in $(SYSTEMS); \
 	do \
 	    (cd $$system; $(MAKE) -k DEBUG=$(DEBUG) clean); \

Index: external/persistence/pathan/Makefile
diff -u external/persistence/pathan/Makefile:1.2 external/persistence/pathan/Makefile:1.3
--- external/persistence/pathan/Makefile:1.2	Mon Mar 15 12:20:47 2004
+++ external/persistence/pathan/Makefile	Mon Mar 15 18:23:21 2004
@@ -37,8 +37,8 @@
 	XERCESCROOT=$(XERCESC)/$(BUILD) $(MAKE); \
 	XERCESCROOT=$(XERCESC)/$(BUILD) $(MAKE) install
 
-expand: libpathan-$(VERSION)-2.tar.gz
-	tar xvzf libpathan-$(VERSION)-2.tar.gz
+expand: libpathan-$(VERSION)-2-src.tar.gz
+	tar xvzf libpathan-$(VERSION)-2-src.tar.gz
 
 snap: 
 	cd $(BUILD_ROOT); \

Index: external/persistence/libxslt/Makefile
diff -u external/persistence/libxslt/Makefile:1.2 external/persistence/libxslt/Makefile:1.3
--- external/persistence/libxslt/Makefile:1.2	Mon Mar 15 12:20:45 2004
+++ external/persistence/libxslt/Makefile	Mon Mar 15 18:23:20 2004
@@ -1,5 +1,6 @@
 
 VERSION=1.1.2
+LIBXML2VERSION=2.6.3
 LIBXSLT=$(BUILD_ROOT)/persistence/libxslt
 SRC=$(LIBXSLT)/libxslt-$(VERSION)
 
@@ -31,6 +32,9 @@
 	cd $(SRC); mkdir -p $(BUILD); cd $(BUILD); \
 	../configure --prefix=$(PREFIX) \
                      --srcdir=$(SRC) \
+                     --with-libxml-prefix=$(PREFIX) \
+                     --with-libxml-include-prefix=$(PREFIX) \
+                     --with-libxml-lib-prefix=$(PREFIX) \
                      --with-python=$(PREFIX)/Library/Frameworks/Python.framework/Versions/Current \
                      $(CONF_DBG)
 

Index: external/.cvsignore
diff -u external/.cvsignore:1.1 external/.cvsignore:1.2
--- external/.cvsignore:1.1	Mon Mar 15 11:48:34 2004
+++ external/.cvsignore	Mon Mar 15 18:23:17 2004
@@ -1,3 +1,3 @@
 debug debug.tar.gz
 release release.tar.gz
-source.tar
+sources.tar



More information about the Commits mailing list