[Commits] (vajda) PyLucene and UUIDext are now building in 'internal' on OS X.

commits at osafoundation.org commits at osafoundation.org
Wed Apr 14 14:26:12 PDT 2004


Commit by: vajda
Modified files:
internal/Makefile None 1.1
internal/Makefile.inc None 1.1
internal/PyLucene/lucene-1.3-final-src.tar.gz None 1.1
internal/PyLucene/.cvsignore 1.1 1.2
internal/PyLucene/Makefile 1.10 1.11
internal/PyLucene/Makefile.dev 1.3 1.4
internal/PyLucene/Makefile.linux 1.2 1.3
internal/PyLucene/Makefile.mingw 1.2 1.3
internal/PyLucene/Makefile.osx 1.1 1.2
internal/UUIDext/Makefile None 1.1
internal/UUIDext/.cvsignore 1.3 1.4

Log message:
PyLucene and UUIDext are now building in 'internal' on OS X.


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/internal/Makefile?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/Makefile.inc?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/PyLucene/lucene-1.3-final-src.tar.gz?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/PyLucene/.cvsignore.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/internal/PyLucene/Makefile.diff?r1=text&tr1=1.10&r2=text&tr2=1.11
http://cvs.osafoundation.org/index.cgi/internal/PyLucene/Makefile.dev.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/internal/PyLucene/Makefile.linux.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/internal/PyLucene/Makefile.mingw.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/internal/PyLucene/Makefile.osx.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/internal/UUIDext/Makefile?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/internal/UUIDext/.cvsignore.diff?r1=text&tr1=1.3&r2=text&tr2=1.4

Index: internal/UUIDext/.cvsignore
diff -u internal/UUIDext/.cvsignore:1.3 internal/UUIDext/.cvsignore:1.4
--- internal/UUIDext/.cvsignore:1.3	Mon Sep 22 14:47:57 2003
+++ internal/UUIDext/.cvsignore	Wed Apr 14 14:25:41 2004
@@ -1,4 +1,3 @@
-build build_release build_debug
-Makefile
-*.pyc
-*.pyo
+build_*
+*.pyc *.pyo
+*.gz

Index: internal/PyLucene/.cvsignore
diff -u internal/PyLucene/.cvsignore:1.1 internal/PyLucene/.cvsignore:1.2
--- internal/PyLucene/.cvsignore:1.1	Mon Mar 15 11:48:40 2004
+++ internal/PyLucene/.cvsignore	Wed Apr 14 14:25:40 2004
@@ -1,3 +1,4 @@
-*.gz
-lucene-*
+PyLucene-release.tar.gz
+PyLucene-debug.tar.gz
+lucene-1.3-final
 build_*

Index: internal/PyLucene/Makefile.linux
diff -u internal/PyLucene/Makefile.linux:1.2 internal/PyLucene/Makefile.linux:1.3
--- internal/PyLucene/Makefile.linux:1.2	Mon Mar 15 23:05:02 2004
+++ internal/PyLucene/Makefile.linux	Wed Apr 14 14:25:40 2004
@@ -15,7 +15,6 @@
 
 SRCDIR = .
 BINDIR = build_$(mode)
-RELDIR = ../../$(mode)
 
 CLASSES = $(BINDIR)/classes
 CC = $(GCJ)/bin/gcc
@@ -24,7 +23,6 @@
 JCCH = $(GCJ)/bin/gcjh
 
 LUCENE = $(SRCDIR)/lucene-$(VERSION)
-DB = $(SRCDIR)/../db/db-$(DBVERSION)
 
 PYTHON_INC = $(RELDIR)/include/python2.3
 PYTHON_SITE = $(RELDIR)/lib/python2.3/site-packages
@@ -51,7 +49,7 @@
 	$(JCC) -fjni $(CCFLAGS) -c -o $(BINDIR)/db.o --classpath=$(CLASSES) $(DB_SRCS)
 
 $(BINDIR)/libdb_java-4.2.so:
-	$(CC) -shared -o $(BINDIR)/libdb_java-4.2.so $(CCFLAGS) -I$(DB) -I$(DB)/build_$(mode) -I$(RELDIR)/db/include $(DB)/libdb_java/db_java_wrap.c ../../$(mode)/db/lib/libdb-4.2.so
+	$(CC) -shared -o $(BINDIR)/libdb_java-4.2.so $(CCFLAGS) -I$(DB) -I$(DB)/build_$(mode) -I$(RELDIR)/db/include $(DB)/libdb_java/db_java_wrap.c $(RELDIR)/db/lib/libdb-4.2.so
 
 $(BINDIR)/store.o: $(BINDIR)/db.o $(BINDIR)/lucene.o
 	$(JCC) -C -d $(CLASSES) --classpath=$(CLASSES) $(STORE_SRCS)
@@ -90,6 +88,7 @@
 	install PyLucene.py $(PYTHON_SITE)
 	install $(BINDIR)/_PyLucene.so $(PYTHON_SITE)
 	install $(BINDIR)/libdb_java-4.2.so $(RELDIR)/db/lib
+	mkdir -p $(RELDIR)/lib
 	install $(GCJ)/lib/libgcj.so.4 $(RELDIR)/lib
 	install $(GCJ)/lib/libstdc++.so.5 $(RELDIR)/lib
 	install $(GCJ)/lib/libgcc_s.so.1 $(RELDIR)/lib

Index: internal/PyLucene/Makefile
diff -u internal/PyLucene/Makefile:1.10 internal/PyLucene/Makefile:1.11
--- internal/PyLucene/Makefile:1.10	Thu Mar 25 14:15:55 2004
+++ internal/PyLucene/Makefile	Wed Apr 14 14:25:40 2004
@@ -1,9 +1,10 @@
 
+include ../Makefile.inc
+
 VERSION=1.3-final
-PYLUCENE=$(BUILD_ROOT)/persistence/PyLucene
+PYLUCENE=$(INTERNAL)/PyLucene
 LUCENE=$(PYLUCENE)/lucene-$(VERSION)
-
-include $(BUILD_ROOT)/Makefile.inc
+DB=$(EXTERNAL)/persistence/db/db-4.2.52
 
 ifeq ($(DEBUG),1)
 COMP_OPT=DEBUG=1
@@ -30,15 +31,17 @@
 
 ifeq ($(OS),Cygwin)
 
-build: apply
+build: sources apply
 	MAKEFLAGS=; \
 	$(MAKE) -f $(OS_MAKE) GCJ=`cygpath -aw $(GCJ_HOME)` $(COMP_OPT) \
-                              DBVERSION=4.2.52 VERSION=$(VERSION) \
+                              DB=`cygpath -aw $(DB)` \
+                              RELDIR=`cygpath -aw $(BUILD_ROOT)/$(SNAP)` \
+                              VERSION=$(VERSION) \
                               all install
 
 snap: 
 	cd $(BUILD_ROOT); \
-        tar -cvzf $(PYLUCENE)/$(SNAP).tar.gz \
+        tar -cvzf $(PYLUCENE)/PyLucene-$(SNAP).tar.gz \
                   $(SNAP)/$(SITE)/PyLucene.py \
                   $(SNAP)/$(SITE)/_PyLucene$(_SUFFIX).pyd \
                   $(SNAP)/bin/libdb_java42$(SUFFIX).dll
@@ -49,7 +52,7 @@
 
 snap: 
 	cd $(BUILD_ROOT); \
-        tar -cvzf $(PYLUCENE)/$(SNAP).tar.gz \
+        tar -cvzf $(PYLUCENE)/PyLucene-$(SNAP).tar.gz \
                   $(SNAP)/$(SITE)/PyLucene.py \
                   $(SNAP)/$(SITE)/_PyLucene.so \
                   $(SNAP)/db/lib/libdb_java-4.2.jnilib \
@@ -62,7 +65,7 @@
 
 snap: 
 	cd $(BUILD_ROOT); \
-        tar -cvzf $(PYLUCENE)/$(SNAP).tar.gz \
+        tar -cvzf $(PYLUCENE)/PyLucene-$(SNAP).tar.gz \
                   $(SNAP)/$(SITE)/PyLucene.py \
                   $(SNAP)/$(SITE)/_PyLucene.so \
                   $(SNAP)/db/lib/libdb_java-4.2.so \
@@ -72,20 +75,23 @@
 
 endif
 
-build: apply
+build: sources apply
 	MAKEFLAGS=; \
 	$(MAKE) -f $(OS_MAKE) GCJ=$(GCJ_HOME) $(COMP_OPT) \
-                              DBVERSION=4.2.52 VERSION=$(VERSION) \
+                              DB=$(DB) VERSION=$(VERSION) \
+                              RELDIR=$(BUILD_ROOT)/$(SNAP) \
                               all install
 
 endif
 
+sources:
+	if [ ! -d lucene-$(VERSION) ]; then \
+            tar xvzf lucene-$(VERSION)-src.tar.gz; \
+        fi
+
 apply: patches
 	patch -Nup0 < patches; echo ok
 	make -C $(BUILD_ROOT)/persistence/db apply
-
-expand: lucene-$(VERSION)-src.tar.gz
-	tar xvzf lucene-$(VERSION)-src.tar.gz
 
 clean:
 	rm -rf $(BUILD)

Index: internal/PyLucene/Makefile.osx
diff -u internal/PyLucene/Makefile.osx:1.1 internal/PyLucene/Makefile.osx:1.2
--- internal/PyLucene/Makefile.osx:1.1	Mon Mar 15 11:48:40 2004
+++ internal/PyLucene/Makefile.osx	Wed Apr 14 14:25:40 2004
@@ -15,7 +15,6 @@
 
 SRCDIR = .
 BINDIR = build_$(mode)
-RELDIR = ../../$(mode)
 
 CLASSES = $(BINDIR)/classes
 CC = $(GCJ)/bin/gcc
@@ -24,7 +23,6 @@
 JCCH = $(GCJ)/bin/gcjh
 
 LUCENE = $(SRCDIR)/lucene-$(VERSION)
-DB = $(SRCDIR)/../db/db-$(DBVERSION)
 PYTHON = $(RELDIR)/Library/Frameworks/Python.framework/Versions/2.3
 
 PYTHON_INC = $(PYTHON)/include/python2.3
@@ -54,7 +52,7 @@
 # with gcc 3.4-20040107, libdb_java crashes when compiled with -O2
 
 $(BINDIR)/libdb_java-4.2.jnilib:
-	$(CC) -shared -bundle -o $(BINDIR)/libdb_java-4.2.jnilib -O $(LDFLAGS) -I$(GCJ)/include -I$(DB) -I$(DB)/build_$(mode) -I$(RELDIR)/db/include $(DB)/libdb_java/db_java_wrap.c ../../$(mode)/db/lib/libdb-4.2.dylib
+	$(CC) -shared -bundle -o $(BINDIR)/libdb_java-4.2.jnilib -O $(LDFLAGS) -I$(GCJ)/include -I$(DB) -I$(DB)/build_$(mode) -I$(RELDIR)/db/include $(DB)/libdb_java/db_java_wrap.c $(RELDIR)/db/lib/libdb-4.2.dylib
 
 $(BINDIR)/store.o: $(BINDIR)/db.o $(BINDIR)/lucene.o
 	$(JCC) -C -d $(CLASSES) --classpath=$(CLASSES) $(STORE_SRCS)
@@ -94,6 +92,7 @@
 	install $(BINDIR)/_PyLucene.so $(PYTHON_SITE)
 	install $(BINDIR)/libdb_java-4.2.jnilib $(RELDIR)/db/lib
 	install libdb_java-4.2.la.osx $(RELDIR)/db/lib/libdb_java-4.2.la
+	mkdir -p $(RELDIR)/lib
 	install $(GCJ)/lib/libgcj.4.dylib $(RELDIR)/lib
 	install $(GCJ)/lib/libstdc++.6.dylib $(RELDIR)/lib
 	install $(GCJ)/lib/libgcc_s.1.0.dylib $(RELDIR)/lib

Index: internal/PyLucene/Makefile.dev
diff -u internal/PyLucene/Makefile.dev:1.3 internal/PyLucene/Makefile.dev:1.4
--- internal/PyLucene/Makefile.dev:1.3	Tue Mar 30 17:40:05 2004
+++ internal/PyLucene/Makefile.dev	Wed Apr 14 14:25:40 2004
@@ -28,7 +28,7 @@
 JCCH = $(GCJ_HOME)/bin/gcjh
 
 LUCENE = $(SRCDIR)/lucene-$(VERSION)
-DB = $(SRCDIR)/../db/db-$(DBVERSION)
+DB = $(SRCDIR)/../external/persistence/db/db-$(DBVERSION)
 PYTHON = /Library/Frameworks/Python.framework/Versions/2.3
 
 PYTHON_INC = $(PYTHON)/include/python2.3

Index: internal/PyLucene/Makefile.mingw
diff -u internal/PyLucene/Makefile.mingw:1.2 internal/PyLucene/Makefile.mingw:1.3
--- internal/PyLucene/Makefile.mingw:1.2	Thu Mar 18 18:14:31 2004
+++ internal/PyLucene/Makefile.mingw	Wed Apr 14 14:25:40 2004
@@ -21,7 +21,6 @@
 
 SRCDIR = .
 BINDIR = build_$(mode)
-RELDIR = ..\..\$(mode)
 
 CLASSES = $(BINDIR)/classes
 CC = $(GCJ)\bin\gcc
@@ -30,7 +29,6 @@
 JCCH = $(GCJ)\bin\gcjh
 
 LUCENE = $(SRCDIR)\lucene-$(VERSION)
-DB = $(SRCDIR)\..\db\db-$(DBVERSION)
 
 PYTHON_INC = $(RELDIR)\bin\include
 PYTHON_SITE = $(RELDIR)\bin\Lib\site-packages



More information about the Commits mailing list