[Commits] (vajda) started windows port of new build, Berkeley DB done

commits at osafoundation.org commits at osafoundation.org
Wed Mar 17 15:07:38 PST 2004


Commit by: vajda
Modified files:
external/Makefile.inc None 1.1
external/Makefile 1.8 1.9
external/persistence/db/Makefile 1.2 1.3
external/persistence/db/win32/Berkeley_DB.sln None 1.1
external/persistence/db/win32/build_all.vcproj None 1.1
external/persistence/db/win32/db_archive.vcproj None 1.1
external/persistence/db/win32/db_checkpoint.vcproj None 1.1
external/persistence/db/win32/db_deadlock.vcproj None 1.1
external/persistence/db/win32/db_dll.vcproj None 1.1
external/persistence/db/win32/db_dump.vcproj None 1.1
external/persistence/db/win32/db_java.vcproj None 1.1
external/persistence/db/win32/db_lib.vcproj None 1.1
external/persistence/db/win32/db_load.vcproj None 1.1
external/persistence/db/win32/db_perf.vcproj None 1.1
external/persistence/db/win32/db_printlog.vcproj None 1.1
external/persistence/db/win32/db_recover.vcproj None 1.1
external/persistence/db/win32/db_stat.vcproj None 1.1
external/persistence/db/win32/db_static.vcproj None 1.1
external/persistence/db/win32/db_tcl.vcproj None 1.1
external/persistence/db/win32/db_test.vcproj None 1.1
external/persistence/db/win32/db_upgrade.vcproj None 1.1
external/persistence/db/win32/db_verify.vcproj None 1.1
external/persistence/db/win32/ex_access.vcproj None 1.1
external/persistence/db/win32/ex_btrec.vcproj None 1.1
external/persistence/db/win32/ex_env.vcproj None 1.1
external/persistence/db/win32/ex_lock.vcproj None 1.1
external/persistence/db/win32/ex_mpool.vcproj None 1.1
external/persistence/db/win32/ex_repquote.vcproj None 1.1
external/persistence/db/win32/ex_tpcb.vcproj None 1.1
external/persistence/db/win32/excxx_access.vcproj None 1.1
external/persistence/db/win32/excxx_btrec.vcproj None 1.1
external/persistence/db/win32/excxx_env.vcproj None 1.1
external/persistence/db/win32/excxx_lock.vcproj None 1.1
external/persistence/db/win32/excxx_mpool.vcproj None 1.1
external/persistence/db/win32/excxx_tpcb.vcproj None 1.1

Log message:
started windows port of new build, Berkeley DB done


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/Makefile.inc?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/Makefile.diff?r1=text&tr1=1.8&r2=text&tr2=1.9
http://cvs.osafoundation.org/index.cgi/external/persistence/db/Makefile.diff?r1=text&tr1=1.2&r2=text&tr2=1.3
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/Berkeley_DB.sln?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/build_all.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/db_archive.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/db_checkpoint.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/db_deadlock.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/db_dll.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/db_dump.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/db_java.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/db_lib.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/db_load.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/db_perf.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/db_printlog.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/db_recover.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/db_stat.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/db_static.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/db_tcl.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/db_test.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/db_upgrade.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/db_verify.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/ex_access.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/ex_btrec.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/ex_env.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/ex_lock.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/ex_mpool.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/ex_repquote.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/ex_tpcb.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/excxx_access.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/excxx_btrec.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/excxx_env.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/excxx_lock.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/excxx_mpool.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/external/persistence/db/win32/excxx_tpcb.vcproj?rev=1.1&content-type=text/vnd.viewcvs-markup

Index: external/Makefile
diff -u external/Makefile:1.8 external/Makefile:1.9
--- external/Makefile:1.8	Wed Mar 17 13:17:22 2004
+++ external/Makefile	Wed Mar 17 15:07:06 2004
@@ -1,12 +1,7 @@
 
 VERSION=0.3-0
 
-ifeq ($(DEBUG),1)
-SNAP=debug
-else
-SNAP=release
-DEBUG=0
-endif
+include Makefile.inc
 
 SYSTEMS=persistence/db \
         python \
@@ -41,17 +36,9 @@
         SOAPpy/SOAPpy-0.10.2.tar.gz \
         pychecker/pychecker-0.8.13.tar.gz
 
-.PHONY: default env sources expand binaries clean all $(SYSTEMS)
+.PHONY: sources expand binaries $(SYSTEMS)
 
 default: all
-
-env:
-ifeq ($(BUILD_ROOT),)
-	echo BUILD_ROOT is not set && false
-endif
-ifeq ($(GCJ_HOME),)
-	echo GCJ_HOME is not set && false
-endif
 
 sources:
 	tar -cvf sources-$(VERSION).tar $(SOURCES)

Index: external/persistence/db/Makefile
diff -u external/persistence/db/Makefile:1.2 external/persistence/db/Makefile:1.3
--- external/persistence/db/Makefile:1.2	Mon Mar 15 12:20:35 2004
+++ external/persistence/db/Makefile	Wed Mar 17 15:07:06 2004
@@ -3,24 +3,53 @@
 DB=$(BUILD_ROOT)/persistence/db
 SRC=$(DB)/db-$(VERSION)
 
-ifeq ($(DEBUG),1)
+include ../../Makefile.inc
 
-CONF_DBG=--enable-debug
-PREFIX=$(BUILD_ROOT)/debug
-SNAP=debug
+
+ifeq ($(OS),Cygwin)
+
+BUILD=build_win32
+
+$(SRC)/$(BUILD)/Berkeley_DB.sln:
+	(cd win32; tar -cf - *.sln *.vcproj) | (cd $(SRC)/$(BUILD); tar -xf -)
+
+build: compile install
+
+compile: $(SRC)/$(BUILD)/Berkeley_DB.sln
+	cd $(SRC)/$(BUILD); \
+        devenv.com Berkeley_DB.sln /project build_all /build $(Snap)
+
+install:
+	mkdir -p $(PREFIX)/bin/db
+	mkdir -p $(PREFIX)/include
+	mkdir -p $(PREFIX)/lib
+	(cd $(SRC)/dbinc; tar cf - cxx_*.h) | (cd $(PREFIX)/include; tar xvf -)
+	(cd $(SRC)/$(BUILD); tar cf - *.h) | (cd $(PREFIX)/include; tar xvf -)
+	(cd $(SRC)/$(BUILD)/$(Snap); tar cf - *.dll) | (cd $(PREFIX)/bin; tar xvf -)
+	(cd $(SRC)/$(BUILD)/$(Snap); tar cf - *.exe) | (cd $(PREFIX)/bin/db; tar xvf -)
+	(cd $(SRC)/$(BUILD)/$(Snap); tar cf - *.lib *.exp) | (cd $(PREFIX)/lib; tar xvf -)
+
+clean:
+	cd $(SRC)/$(BUILD); \
+        devenv.com Berkeley_DB.sln /project build_all /clean $(Snap); \
+        rm Berkeley_DB.sln
+
+snap: 
+	cd $(BUILD_ROOT); \
+        tar -cvzf $(DB)/$(SNAP).tar.gz \
+                  $(SNAP)/bin/libdb*.dll \
+                  $(SNAP)/bin/db/db_*.exe
 
 else
 
+ifeq ($(DEBUG),1)
+CONF_DBG=--enable-debug
+else
 CONF_DBG=
-PREFIX=$(BUILD_ROOT)/release
-SNAP=release
-
 endif
 
-BUILD=build_$(SNAP)
-
 
-default: all
+BUILD=build_$(SNAP)
 
 $(SRC)/$(BUILD)/Makefile: patches
 	patch -Nup0 < patches; echo ok; \
@@ -34,11 +63,13 @@
 expand: db-$(VERSION).tar.gz
 	tar xvzf db-$(VERSION).tar.gz
 
+clean:
+	cd $(SRC); rm -rf $(BUILD)
+
 snap: 
 	cd $(BUILD_ROOT); \
         tar -cvzf $(DB)/$(SNAP).tar.gz $(SNAP)/db/bin $(SNAP)/db/lib
 
-clean:
-	cd $(SRC); rm -rf $(BUILD)
+endif
 
 all: build



More information about the Commits mailing list