[Commits] (vajda) new build binaries now even run Chandler on windows

commits at osafoundation.org commits at osafoundation.org
Sat Mar 20 17:51:58 PST 2004


Commit by: vajda
Modified files:
external/egenix-mx/xcludes None 1.1
external/egenix-mx/Makefile 1.5 1.6
external/persistence/PyLucene/Makefile 1.7 1.8
external/persistence/db/Makefile 1.7 1.8
external/persistence/db/patches 1.1 1.2
external/python/Makefile 1.14 1.15

Log message:
new build binaries now even run Chandler on windows


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/egenix-mx/xcludes?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/egenix-mx/Makefile.diff?r1=text&tr1=1.5&r2=text&tr2=1.6
http://cvs.osafoundation.org/index.cgi/external/persistence/PyLucene/Makefile.diff?r1=text&tr1=1.7&r2=text&tr2=1.8
http://cvs.osafoundation.org/index.cgi/external/persistence/db/Makefile.diff?r1=text&tr1=1.7&r2=text&tr2=1.8
http://cvs.osafoundation.org/index.cgi/external/persistence/db/patches.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/external/python/Makefile.diff?r1=text&tr1=1.14&r2=text&tr2=1.15

Index: external/persistence/db/Makefile
diff -u external/persistence/db/Makefile:1.7 external/persistence/db/Makefile:1.8
--- external/persistence/db/Makefile:1.7	Sat Mar 20 10:56:11 2004
+++ external/persistence/db/Makefile	Sat Mar 20 17:51:27 2004
@@ -13,7 +13,7 @@
 $(SRC)/$(BUILD)/Berkeley_DB.sln:
 	(cd win32; tar -cf - *.sln *.vcproj) | (cd $(SRC)/$(BUILD); tar -xf -)
 
-build: compile install
+build: apply compile install
 
 compile: $(SRC)/$(BUILD)/Berkeley_DB.sln
 	cd $(SRC)/$(BUILD); \
@@ -49,8 +49,7 @@
 
 BUILD=build_$(SNAP)
 
-$(SRC)/$(BUILD)/Makefile: patches
-	patch -Nup0 < patches; echo ok; \
+$(SRC)/$(BUILD)/Makefile: apply
 	cd $(SRC); mkdir -p $(BUILD); cd $(BUILD); \
 	../dist/configure --prefix=$(PREFIX)/db \
                           --enable-cxx $(CONF_DBG)
@@ -66,6 +65,9 @@
         tar -cvzf $(DB)/$(SNAP).tar.gz $(SNAP)/db/bin $(SNAP)/db/lib
 
 endif
+
+apply: patches
+	patch -Nup0 < patches; echo ok
 
 expand: db-$(VERSION).tar.gz
 	tar xvzf db-$(VERSION).tar.gz

Index: external/persistence/db/patches
diff -u external/persistence/db/patches:1.1 external/persistence/db/patches:1.2
--- external/persistence/db/patches:1.1	Mon Mar 15 12:43:30 2004
+++ external/persistence/db/patches	Sat Mar 20 17:51:27 2004
@@ -21,3 +21,18 @@
  
  ##################################################
  # Creating individual dependencies and actions for building class
+--- db-4.2.52/libdb_java/db_java_wrap.c	2003-12-03 13:10:36.000000000 -0800
++++ db-4.2.52-patched/libdb_java/db_java_wrap.c	2004-03-20 17:13:46.827006400 -0800
+@@ -16,6 +16,12 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#if defined(GCJ) && defined(WIN32) /* gcj jni doesn't use __stdcall */
++#undef JNIEXPORT
++#undef JNICALL
++#define JNIEXPORT
++#define JNICALL
++#endif
+ 
+ /* Support for throwing Java exceptions */
+ typedef enum {

Index: external/egenix-mx/Makefile
diff -u external/egenix-mx/Makefile:1.5 external/egenix-mx/Makefile:1.6
--- external/egenix-mx/Makefile:1.5	Thu Mar 18 10:02:51 2004
+++ external/egenix-mx/Makefile	Sat Mar 20 17:51:25 2004
@@ -22,7 +22,8 @@
 snap: 
 	cd $(BUILD_ROOT); \
         tar -cvzf $(EGENIX)/$(SNAP).tar.gz \
-                  $(SNAP)/$(SITE)/mx
+                  $(SNAP)/$(SITE)/mx \
+            -X xcludes
 
 clean:
 	cd $(SRC); rm -rf $(BUILD)

Index: external/persistence/PyLucene/Makefile
diff -u external/persistence/PyLucene/Makefile:1.7 external/persistence/PyLucene/Makefile:1.8
--- external/persistence/PyLucene/Makefile:1.7	Thu Mar 18 18:14:31 2004
+++ external/persistence/PyLucene/Makefile	Sat Mar 20 17:51:26 2004
@@ -70,6 +70,7 @@
 
 apply: patches
 	patch -Nup0 < patches; echo ok
+	make -C $(BUILD_ROOT)/persistence/db apply
 
 build: apply
 	MAKEFLAGS=; \

Index: external/python/Makefile
diff -u external/python/Makefile:1.14 external/python/Makefile:1.15
--- external/python/Makefile:1.14	Sat Mar 20 10:56:45 2004
+++ external/python/Makefile	Sat Mar 20 17:51:28 2004
@@ -83,7 +83,8 @@
 	cd $(BUILD_ROOT); \
         tar -cvzf $(PYTHON)/$(SNAP).tar.gz \
                   $(SNAP)/bin/python*.* $(SNAP)/bin/libs \
-                  $(SNAP)/bin/DLLs $(SNAP)/bin/Include $(SNAP)/bin/Lib
+                  $(SNAP)/bin/DLLs $(SNAP)/bin/Include $(SNAP)/bin/Lib \
+            -X $(PYTHON)/xcludes
 
 else
 



More information about the Commits mailing list