[Pkg-cli-libs-commits] [SCM] db4o branch, master, updated. debian/7.4.121.14026+dfsg-3-22-g8e3de09

Jo Shields directhex at apebox.org
Sun Aug 14 19:04:46 UTC 2011 

The following commit has been merged in the master branch:
commit 4a8a48a0e955f6312e702327d66ea93e3e5aa51d
Author: Jo Shields <directhex at apebox.org>
Date:   Sun Aug 14 18:23:00 2011 +0100

    Convert build system to a pure xbuild setup, and refresh install files
    to use the xbuild build locations.

diff --git a/debian/db4o.pc b/debian/db4o.pc
deleted file mode 100644
index 955a61d..0000000
--- a/debian/db4o.pc
+++ /dev/null
@@ -1,8 +0,0 @@
-prefix=/usr
-libdir=${prefix}/lib
-pkglibdir=${libdir}/cli/
-
-Name: db4o
-Description: db4o - native OODBMS for CLI
-Version: #PACKAGE_ABI_VERSION#
-Libs: -r:${pkglibdir}/Db4objects.Db4o-#PACKAGE_ABI_VERSION#/Db4objects.Db4o.dll -r:${pkglibdir}/Db4objects.Db4o.NativeQueries-#PACKAGE_ABI_VERSION#/Db4objects.Db4o.NativeQueries.dll -r:${pkglibdir}/Db4objects.Db4o.Instrumentation-#PACKAGE_ABI_VERSION#/Db4objects.Db4o.Instrumentation.dll -r:${pkglibdir}/Db4objects.Db4o.Linq-#PACKAGE_ABI_VERSION#/Db4objects.Db4o.Linq.dll
diff --git a/debian/db4o.pc.in b/debian/db4o.pc.in
new file mode 100644
index 0000000..db44b97
--- /dev/null
+++ b/debian/db4o.pc.in
@@ -0,0 +1,8 @@
+prefix=/usr
+libdir=${prefix}/lib
+pkglibdir=${libdir}/cli/
+
+Name: db4o
+Description: db4o - native OODBMS for CLI
+Version: #PACKAGE_ABI_VERSION#
+Libs: -r:${pkglibdir}/Db4objects.Db4o-#PACKAGE_ABI_VERSION#/Db4objects.Db4o.dll -r:${pkglibdir}/Db4objects.Db4o.Linq-#PACKAGE_ABI_VERSION#/Db4objects.Db4o.Linq.dll -r:${pkglibdir}/Db4objects.Db4o.Instrumentation-#PACKAGE_ABI_VERSION#/Db4objects.Db4o.Instrumentation.dll -r:${pkglibdir}/Db4objects.Db4o.CS-#PACKAGE_ABI_VERSION#/Db4objects.Db4o.CS.dll -r:${pkglibdir}/Db4objects.Db4o.NativeQueries-#PACKAGE_ABI_VERSION#/Db4objects.Db4o.NativeQueries.dll -r:${pkglibdir}/Db4objects.Db4o.Optional-#PACKAGE_ABI_VERSION#/Db4objects.Db4o.Optional.dll
diff --git a/debian/db4otool.install b/debian/db4otool.install
index c7c4000..f21040a 100644
--- a/debian/db4otool.install
+++ b/debian/db4otool.install
@@ -1,4 +1,3 @@
-usr/bin/
-usr/lib/db4o/*.exe					/usr/lib/db4o/
-usr/lib/db4o/Mono.Cecil.dll				/usr/lib/db4o/
-
+debian/db4otool						/usr/bin/
+src/Db4oTool/Db4oTool/bin/Release/Db4oTool.exe*		/usr/lib/db4o/
+/usr/lib/cecil-flowanalysis/*				/usr/lib/db4o/
diff --git a/debian/libdb4o-cil-dev.install b/debian/libdb4o-cil-dev.install
index 56d88e6..7ccafcb 100644
--- a/debian/libdb4o-cil-dev.install
+++ b/debian/libdb4o-cil-dev.install
@@ -1 +1 @@
-usr/lib/pkgconfig
+debian/db4o.pc		/usr/lib/pkgconfig/
diff --git a/debian/libdb4o-doc.docs b/debian/libdb4o-doc.docs
index 9f50353..30d29de 100644
--- a/debian/libdb4o-doc.docs
+++ b/debian/libdb4o-doc.docs
@@ -1 +1 @@
-debian/tmp/usr/share/db4o/doc/*
+doc/*
diff --git a/debian/libdb4o8.0-cil.install b/debian/libdb4o8.0-cil.install
index 0fef32f..262a81b 100644
--- a/debian/libdb4o8.0-cil.install
+++ b/debian/libdb4o8.0-cil.install
@@ -1,9 +1,11 @@
-usr/lib/db4o/Mono.Cecil.dll				/usr/lib/cli/Db4objects.Db4o-8.0/
-usr/lib/db4o/Db4objects.Db4o.dll			/usr/lib/cli/Db4objects.Db4o-8.0/
-usr/lib/db4o/Db4objects.Db4o.Linq.dll			/usr/lib/cli/Db4objects.Db4o.Linq-8.0/
-usr/lib/db4o/Mono.Cecil.dll				/usr/lib/cli/Db4objects.Db4o.Linq-8.0/
-usr/lib/db4o/Db4objects.Db4o.Instrumentation.dll	/usr/lib/cli/Db4objects.Db4o.Instrumentation-8.0/
-usr/lib/db4o/Mono.Cecil.dll				/usr/lib/cli/Db4objects.Db4o.Instrumentation-8.0/
-usr/lib/db4o/Db4objects.Db4o.NativeQueries.dll		/usr/lib/cli/Db4objects.Db4o.NativeQueries-8.0/
-usr/lib/db4o/Mono.Cecil.dll				/usr/lib/cli/Db4objects.Db4o.NativeQueries-8.0/
-
+src/Db4objects.Db4o/bin/Release/Db4objects.Db4o.dll*					/usr/lib/cli/Db4objects.Db4o-8.0/
+src/Db4objects.Db4o.Linq/bin/Release/Db4objects.Db4o.Linq.dll*				/usr/lib/cli/Db4objects.Db4o.Linq-8.0/
+/usr/lib/mono.reflection/Mono.Reflection.dll*						/usr/lib/cli/Db4objects.Db4o.Linq-8.0/
+src/Db4objects.Db4o.Instrumentation/bin/Release/Db4objects.Db4o.Instrumentation.dll*	/usr/lib/cli/Db4objects.Db4o.Instrumentation-8.0/
+/usr/lib/cecil-flowanalysis/Cecil.FlowAnalysis.dll*					/usr/lib/cli/Db4objects.Db4o.Instrumentation-8.0/
+/usr/lib/cecil-flowanalysis/Mono.Cecil.dll*						/usr/lib/cli/Db4objects.Db4o.Instrumentation-8.0/
+src/Db4objects.Db4o.CS/bin/Release/Db4objects.Db4o.CS.dll*				/usr/lib/cli/Db4objects.Db4o.CS-8.0/
+src/Db4objects.Db4o.NativeQueries/bin/Release/Db4objects.Db4o.NativeQueries.dll*	/usr/lib/cli/Db4objects.Db4o.NativeQueries-8.0/
+/usr/lib/cecil-flowanalysis/Cecil.FlowAnalysis.dll*					/usr/lib/cli/Db4objects.Db4o.NativeQueries-8.0/
+/usr/lib/cecil-flowanalysis/Mono.Cecil.dll*						/usr/lib/cli/Db4objects.Db4o.NativeQueries-8.0/
+src/Db4objects.Db4o.Optional/bin/Release/Db4objects.Db4o.Optional.dll*			/usr/lib/cli/Db4objects.Db4o.Optional-8.0/
diff --git a/debian/libdb4o8.0-cil.installcligac b/debian/libdb4o8.0-cil.installcligac
index 04329bd..c8137fd 100644
--- a/debian/libdb4o8.0-cil.installcligac
+++ b/debian/libdb4o8.0-cil.installcligac
@@ -1,4 +1,6 @@
 /usr/lib/cli/Db4objects.Db4o-8.0/Db4objects.Db4o.dll
 /usr/lib/cli/Db4objects.Db4o.Linq-8.0/Db4objects.Db4o.Linq.dll
 /usr/lib/cli/Db4objects.Db4o.Instrumentation-8.0/Db4objects.Db4o.Instrumentation.dll
+/usr/lib/cli/Db4objects.Db4o.CS-8.0/Db4objects.Db4o.CS.dll
 /usr/lib/cli/Db4objects.Db4o.NativeQueries-8.0/Db4objects.Db4o.NativeQueries.dll
+/usr/lib/cli/Db4objects.Db4o.Optional-8.0/Db4objects.Db4o.Optional.dll
diff --git a/debian/monodoc-db4o-manual.install b/debian/monodoc-db4o-manual.install
index 0efb76d..569c2c5 100644
--- a/debian/monodoc-db4o-manual.install
+++ b/debian/monodoc-db4o-manual.install
@@ -1 +1,3 @@
-/usr/lib/monodoc/sources/
+tmp/Db4objects.Db4o.tree	/usr/lib/monodoc/sources/
+debian/Db4objects.Db4o.source	/usr/lib/monodoc/sources/
+tmp/Db4objects.Db4o.zip		/usr/lib/monodoc/sources/
diff --git a/debian/rules b/debian/rules
index c7b6a0d..e120297 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,63 +8,26 @@ DEB_CLI_API_VERSION = 8.0.184.15484
 include /usr/share/cli-common/cli.make
 
 override_dh_auto_build:
-	[ -d $(CURDIR)/src/bin ] || mkdir -p $(CURDIR)/src/bin
-	cp $(shell pkg-config --variable=Libraries mono-cecil) $(CURDIR)/src/bin/
-
-	dh_auto_build -D src -- MCS=/usr/bin/mono-csc core instr nq tool linq
-	mdoc update \
-	  -i $(CURDIR)/src/bin/Db4objects.Db4o.dll.xml \
-	  -o $(CURDIR)/src/bin/monodocer \
-	  $(CURDIR)/src/bin/Db4objects.Db4o.dll
+	xbuild /property:Configuration=Release /property:DefineConstants="MONO" /property:DocumentationFile="Db4objects.Db4o.dll.xml" src/Db4o-2010.sln
+	mdoc update \ 
+	  -i $(CURDIR)/src/Db4objects.Db4o/Db4objects.Db4o.dll.xml \
+	  -o $(CURDIR)/tmp/monodocer \
+	  $(CURDIR)/src/Db4objects.Db4o/bin/Release/Db4objects.Db4o.dll
 	mdoc assemble \
 	  -f ecma \
-	  -o $(CURDIR)/src/bin/Db4objects.Db4o \
-	  $(CURDIR)/src/bin/monodocer
+	  -o $(CURDIR)/tmp/Db4objects.Db4o \
+	  $(CURDIR)/tmp/monodocer
 
 override_dh_auto_clean:
-	dh_auto_clean -D src
-	rm -rf src/bin
+	xbuild /property:Configuration=Release /property:DefineConstants="MONO" /target:Clean src/Db4o-2010.sln
+	rm -rf tmp
+	rm -f debian/db4o.pc
+	find src -type d -name bin -exec rm -rf {} \;
+	find src -type d -name obj -exec rm -rf {} \;
 
 override_dh_auto_install:
-	# <$(MAKE) install>
-
-	# db4o libs / admin tool
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib/db4o
-	cp $(CURDIR)/src/bin/*.dll $(CURDIR)/debian/tmp/usr/lib/db4o/
-	cp $(CURDIR)/src/bin/*.exe $(CURDIR)/debian/tmp/usr/lib/db4o/
-	
-	# db4otool shell wrapper
-	mkdir -p $(CURDIR)/debian/tmp/usr/bin
-	cp $(CURDIR)/debian/db4otool $(CURDIR)/debian/tmp/usr/bin/
-	chmod +x $(CURDIR)/debian/tmp/usr/bin/db4otool
-
-	# db4o docs
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/db4o
-	cp -r $(CURDIR)/doc $(CURDIR)/debian/tmp/usr/share/db4o/
-
-	# db4o monodoc docs
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib/monodoc/sources/
-	cp $(CURDIR)/debian/Db4objects.Db4o.source \
-	   $(CURDIR)/src/bin/Db4objects.Db4o.tree \
-	   $(CURDIR)/src/bin/Db4objects.Db4o.zip \
-	   $(CURDIR)/debian/tmp/usr/lib/monodoc/sources/
-
-	# </$(MAKE) install>
-
-	# convert db4o.chm to HTML
-        # no don't, we can't build this any more
-	#extract_chmLib $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/db4o.chm $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/html/
-	#ln -s html/R_Project.htm $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/html/index.html
-	#mkdir -p $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/chm
-	#mv $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/db4o.chm \
-	#   $(CURDIR)/debian/tmp/usr/share/db4o/doc/api/chm/
-		
-	# pkg-config
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib/pkgconfig
-	cp debian/db4o.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig/
-
-	perl -pe 's/#PACKAGE_ABI_VERSION#/$(DEB_CLI_ABI_VERSION)/g' -i \
-	  $(CURDIR)/debian/tmp/usr/lib/pkgconfig/db4o.pc
+	perl -pe 's/#PACKAGE_ABI_VERSION#/$(DEB_CLI_ABI_VERSION)/g' \
+	  $(CURDIR)/debian/db4o.pc.in > debian/db4o.pc
 	dh_auto_install
 
 override_dh_compress:

-- 
db4o

More information about the Pkg-cli-libs-commits mailing list