[pkg-boost-commits] r14744 - boost/trunk/debian

Steven Michael Robbins smr at alioth.debian.org
Mon Mar 4 20:31:59 UTC 2013


Author: smr
Date: 2013-03-04 20:31:58 +0000 (Mon, 04 Mar 2013)
New Revision: 14744

Modified:
   boost/trunk/debian/rules
Log:
Simple reorganization; no change in functionality.

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2013-03-04 14:17:57 UTC (rev 14743)
+++ boost/trunk/debian/rules	2013-03-04 20:31:58 UTC (rev 14744)
@@ -1,22 +1,5 @@
 #! /usr/bin/make -f
 
-# set the number of build jobs
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	JOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-endif
-
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-
-version_full := $(shell dpkg-parsechangelog | grep Version | cut -d' ' -f2)
-version_upstream := $(shell echo $(version_full) | cut -d'-' -f1)
-version_major = $(shell echo $(version_upstream) | cut -d'.' -f1,2)
-
-PKGVERSION = $(version_major)
-SOVERSION = $(version_upstream)
-SHLIBS_VERSION = (>= $(version_full))
-
-pyversions = $(shell pyversions -rv) $(shell py3versions -rv)
-
 # Boost libraries for which we want separate packages
 boost_libs := chrono date-time exception filesystem graph-parallel \
 	graph iostreams locale math				   \
@@ -41,6 +24,149 @@
 	debian/libboost-python-dev.postinst \
 	debian/libboost-python-dev.prerm
 
+
+%:
+	dh $@
+
+override_dh_auto_configure: user-config.jam make-debhelper
+
+override_dh_auto_build: $(bjam) debian/bjam.1
+	$(JAM) --without-python                        
+	for pyver in $(pyversions); do \
+	 	pyid=$$(echo $$pyver | tr -d .); \
+		echo "Building Boost.Python for python version $$pyver"; \
+	 	$(JAM) --with-python --with-mpi --python-buildid=py$$pyid python=$$pyver; \
+	 	mv stage/lib/mpi.so stage/lib/mpi-py$$pyid.so; \
+	done
+
+	cd $(bbv2dir) && ./bootstrap.sh --with-toolset=gcc
+	cd tools/bcp && $(JAM)
+	cd tools/inspect/build && $(JAM)
+	cd tools/quickbook && $(JAM)
+	cd tools/wave/build && $(JAM)
+	cd tools/regression/build && $(JAM)
+	cd libs/python/pyste/install && python setup.py build
+
+override_dh_auto_clean: clean-debhelper
+	-cd tools && $(JAM) clean
+	-$(JAM) clean
+	-cd libs/python/pyste/install && python setup.py clean
+	rm -rf libs/python/pyste/install/build
+	rm -rf tools/jam/src/bootstrap
+	rm -rf tools/jam/src/bin.*
+	rm -ff tools/jam/src/bjam
+	rm -rf tools/regression/build/bin
+	rm -rf bin.v2 dist
+	rm -rf user-config.jam
+	rm -rf debian/bjam.1
+	dh_auto_clean
+
+override_dh_pysupport:
+	dh_python2
+	dh_python3
+
+override_dh_compress:
+	dh_compress -Xlibboost$(PKGVERSION)-doc/HTML
+
+override_dh_install:
+	$(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --without-python                        
+	for pyver in $(pyversions); do \
+		pyid=`echo $$pyver | tr -d .`; \
+		$(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --with-python --with-mpi --python-buildid=py$$pyid python=$$pyver; \
+	done
+
+	# Install Boost.Build v2 & jam
+	cd $(bbv2dir) && ./bjam install --prefix=$(CURDIR)/debian/tmp/usr
+	mv debian/tmp/usr/share/boost-build/example debian/boost-build-examples
+
+	install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate
+	install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-mpi-python$(PKGVERSION)-dev.rtupdate
+
+	find debian/tmp/usr/include debian/tmp/usr/share/boost-build -type f | xargs chmod 644
+	find debian/tmp -name .cvsignore | xargs rm -f
+	find debian -empty -type f | xargs rm -f
+
+	# package libboost-dbg
+
+	# package libboost$(PKGVERSION)-dev
+	dh_install -plibboost$(PKGVERSION)-dev \
+	   debian/tmp/usr/include/boost \
+	   usr/include
+	dh_install -plibboost$(PKGVERSION)-dev \
+	   debian/tmp/usr/bin/bjam \
+	   dist/bin/bcp \
+	   dist/bin/inspect \
+	   dist/bin/quickbook \
+	   usr/bin
+	dh_installman -plibboost$(PKGVERSION)-dev debian/bjam.1 debian/bcp.1 debian/inspect.1 debian/quickbook.1
+	dh_install -plibboost$(PKGVERSION)-dev tools/boostbook/xsl/* usr/share/boostbook/xsl
+	dh_install -plibboost$(PKGVERSION)-dev tools/boostbook/dtd/* usr/share/boostbook/dtd
+	dh_install -plibboost$(PKGVERSION)-dev debian/tmp/usr/share/boost-build
+
+	# package libboost-date-time$(PKGVERSION)-dev
+	dh_installdocs -plibboost-date-time$(PKGVERSION)-dev libs/date_time/data
+
+	# package libboost-doc
+	rm -rf $(htmldir)
+	mkdir -p $(htmldir) 
+	cat debian/documentation-files | xargs cp --parents --target-directory=$(htmldir)
+	find doc libs -name doc | xargs -n1 cp --archive --parents --target-directory=$(htmldir)
+	rm -rf $(htmldir)/boost
+	dh_link -plibboost$(PKGVERSION)-doc \
+	   usr/include/boost \
+	   usr/share/doc/libboost$(PKGVERSION)-doc/HTML/boost
+	# provide a constant symlink to the latest documents and examples
+	dh_link -plibboost$(PKGVERSION)-doc \
+	   usr/share/doc/libboost$(PKGVERSION)-doc/HTML \
+	   usr/share/doc/libboost-doc/HTML
+	dh_link -plibboost$(PKGVERSION)-doc \
+	   usr/share/doc/libboost$(PKGVERSION)-doc/examples \
+	   usr/share/doc/libboost-doc/examples
+
+	dh_installexamples -plibboost$(PKGVERSION)-doc debian/boost-build-examples
+	mkdir -p $(exampledir)
+	cat debian/example-files | xargs cp -a --parents --target-directory=$(exampledir)
+	find $(exampledir) -type f | xargs chmod 644
+
+	# package libboost-mpi-python$(SOVERSION)
+	dh_install -plibboost-mpi-python$(SOVERSION)
+	for pyver in $(pyversions); do \
+		pyid=`echo $$pyver | tr -d .`; \
+		dh_install -plibboost-mpi-python$(SOVERSION) libs/mpi/build/__init__.py usr/lib/python$$pyver/site-packages/boost; \
+		dh_installdirs -plibboost-mpi-python$(SOVERSION) usr/lib/python$$pyver/site-packages/boost; \
+		cp stage/lib/mpi-py$$pyid.so debian/libboost-mpi-python$(SOVERSION)/usr/lib/python$$pyver/site-packages/boost/mpi.so; \
+	done
+	# package libboost-mpi-python$(PKGVERSION)-dev
+	dh_install -plibboost-python$(PKGVERSION)-dev --autodest \
+	   debian/tmp/usr/share/python/runtime.d/libboost-mpi-python$(PKGVERSION)-dev.rtupdate
+	# package libboost-python$(PKGVERSION)-dev
+	dh_install -plibboost-python$(PKGVERSION)-dev --autodest \
+	   debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate
+
+	cd libs/python/pyste/install && python setup.py install --no-compile --prefix=$(pyste_prefix) --install-lib=$(pyste_prefix)/share/pyshared
+	mv $(pyste_prefix)/bin/pyste.py $(pyste_prefix)/bin/pyste
+	dh_installman -plibboost-python$(PKGVERSION)-dev debian/pyste.1
+
+	dh_install
+
+override_dh_strip:
+	dh_strip --dbg-package=libboost$(PKGVERSION)-dbg -X"-d-"
+
+# set the number of build jobs
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+	JOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+endif
+
+version_full := $(shell dpkg-parsechangelog | grep Version | cut -d' ' -f2)
+version_upstream := $(shell echo $(version_full) | cut -d'-' -f1)
+version_major = $(shell echo $(version_upstream) | cut -d'.' -f1,2)
+
+PKGVERSION = $(version_major)
+SOVERSION = $(version_upstream)
+
+pyversions = $(shell pyversions -rv) $(shell py3versions -rv)
+
+
 # Function to map Boost component name to set of shared library names
 # Input: Boost component name
 # Return: shared library names for the given Boost library
@@ -126,6 +252,8 @@
 TOOLSET_CONFIG="using gcc ;"
 BUILD_LONG_DOUBLE = yes
 
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
 ifeq ($(DEB_BUILD_ARCH), hppa)
 TOOLSET_CONFIG="using gcc : : : <compileflags>-mlong-calls <compileflags>-DBOOST_SP_USE_PTHREADS ;"
 BUILD_LONG_DOUBLE = no
@@ -160,44 +288,9 @@
 # With --ignore-site-config, can probably drop Build-Conflicts on boost-build.
 JAM = $(bjam) $(JOBS) -d2 $(JAM_OPT) --layout=system --ignore-site-config --user-config=$(CURDIR)/user-config.jam debug-symbols=on
 
-%:
-	dh $@
 
-override_dh_auto_configure: $(bjam) user-config.jam make-debhelper
 
-override_dh_auto_build: debian/bjam.1
-	$(JAM) --without-python                        
-	for pyver in $(pyversions); do \
-	 	pyid=$$(echo $$pyver | tr -d .); \
-		echo "Building Boost.Python for python version $$pyver"; \
-	 	$(JAM) --with-python --with-mpi --python-buildid=py$$pyid python=$$pyver; \
-	 	mv stage/lib/mpi.so stage/lib/mpi-py$$pyid.so; \
-	done
 
-	cd $(bbv2dir) && ./bootstrap.sh --with-toolset=gcc
-	cd tools/bcp && $(JAM)
-	cd tools/inspect/build && $(JAM)
-	cd tools/quickbook && $(JAM)
-	cd tools/wave/build && $(JAM)
-	cd tools/regression/build && $(JAM)
-	cd libs/python/pyste/install && python setup.py build
-
-override_dh_auto_clean: clean-debhelper
-	-cd tools && $(JAM) clean
-	-$(JAM) clean
-	-cd libs/python/pyste/install && python setup.py clean
-	rm -rf libs/python/pyste/install/build
-	rm -rf tools/jam/src/bootstrap
-	rm -rf tools/jam/src/bin.*
-	rm -ff tools/jam/src/bjam
-	rm -rf tools/regression/build/bin
-	rm -rf bin.v2 dist
-	rm -rf user-config.jam
-	rm -rf debian/bjam.1
-	dh_auto_clean
-
-
-
 $(bjam):
 	./bootstrap.sh --with-icu --prefix=$(CURDIR)/debian/tmp/usr \
 	  || cat bootstrap.log
@@ -229,93 +322,3 @@
 	@$(call cp_debhelper,libboost-python-dev,libboost-python$(PKGVERSION)-dev)
 	@$(call cp_debhelper,libboost-mpi-python-dev,libboost-mpi-python$(PKGVERSION)-dev)
 
-override_dh_pysupport:
-	dh_python2
-	dh_python3
-
-override_dh_compress:
-	dh_compress -Xlibboost$(PKGVERSION)-doc/HTML
-
-override_dh_install:
-	$(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --without-python                        
-	for pyver in $(pyversions); do \
-		pyid=`echo $$pyver | tr -d .`; \
-		$(JAM) --prefix=$(CURDIR)/debian/tmp/usr install --with-python --with-mpi --python-buildid=py$$pyid python=$$pyver; \
-	done
-
-	# Install Boost.Build v2 & jam
-	cd $(bbv2dir) && ./bjam install --prefix=$(CURDIR)/debian/tmp/usr
-	mv debian/tmp/usr/share/boost-build/example debian/boost-build-examples
-
-	install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate
-	install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-mpi-python$(PKGVERSION)-dev.rtupdate
-
-	find debian/tmp/usr/include debian/tmp/usr/share/boost-build -type f | xargs chmod 644
-	find debian/tmp -name .cvsignore | xargs rm -f
-	find debian -empty -type f | xargs rm -f
-
-	# package libboost-dbg
-
-	# package libboost$(PKGVERSION)-dev
-	dh_install -plibboost$(PKGVERSION)-dev \
-	   debian/tmp/usr/include/boost \
-	   usr/include
-	dh_install -plibboost$(PKGVERSION)-dev \
-	   debian/tmp/usr/bin/bjam \
-	   dist/bin/bcp \
-	   dist/bin/inspect \
-	   dist/bin/quickbook \
-	   usr/bin
-	dh_installman -plibboost$(PKGVERSION)-dev debian/bjam.1 debian/bcp.1 debian/inspect.1 debian/quickbook.1
-	dh_install -plibboost$(PKGVERSION)-dev tools/boostbook/xsl/* usr/share/boostbook/xsl
-	dh_install -plibboost$(PKGVERSION)-dev tools/boostbook/dtd/* usr/share/boostbook/dtd
-	dh_install -plibboost$(PKGVERSION)-dev debian/tmp/usr/share/boost-build
-
-	# package libboost-date-time$(PKGVERSION)-dev
-	dh_installdocs -plibboost-date-time$(PKGVERSION)-dev libs/date_time/data
-
-	# package libboost-doc
-	rm -rf $(htmldir)
-	mkdir -p $(htmldir) 
-	cat debian/documentation-files | xargs cp --parents --target-directory=$(htmldir)
-	find doc libs -name doc | xargs -n1 cp --archive --parents --target-directory=$(htmldir)
-	rm -rf $(htmldir)/boost
-	dh_link -plibboost$(PKGVERSION)-doc \
-	   usr/include/boost \
-	   usr/share/doc/libboost$(PKGVERSION)-doc/HTML/boost
-	# provide a constant symlink to the latest documents and examples
-	dh_link -plibboost$(PKGVERSION)-doc \
-	   usr/share/doc/libboost$(PKGVERSION)-doc/HTML \
-	   usr/share/doc/libboost-doc/HTML
-	dh_link -plibboost$(PKGVERSION)-doc \
-	   usr/share/doc/libboost$(PKGVERSION)-doc/examples \
-	   usr/share/doc/libboost-doc/examples
-
-	dh_installexamples -plibboost$(PKGVERSION)-doc debian/boost-build-examples
-	mkdir -p $(exampledir)
-	cat debian/example-files | xargs cp -a --parents --target-directory=$(exampledir)
-	find $(exampledir) -type f | xargs chmod 644
-
-	# package libboost-mpi-python$(SOVERSION)
-	dh_install -plibboost-mpi-python$(SOVERSION)
-	for pyver in $(pyversions); do \
-		pyid=`echo $$pyver | tr -d .`; \
-		dh_install -plibboost-mpi-python$(SOVERSION) libs/mpi/build/__init__.py usr/lib/python$$pyver/site-packages/boost; \
-		dh_installdirs -plibboost-mpi-python$(SOVERSION) usr/lib/python$$pyver/site-packages/boost; \
-		cp stage/lib/mpi-py$$pyid.so debian/libboost-mpi-python$(SOVERSION)/usr/lib/python$$pyver/site-packages/boost/mpi.so; \
-	done
-	# package libboost-mpi-python$(PKGVERSION)-dev
-	dh_install -plibboost-python$(PKGVERSION)-dev --autodest \
-	   debian/tmp/usr/share/python/runtime.d/libboost-mpi-python$(PKGVERSION)-dev.rtupdate
-	# package libboost-python$(PKGVERSION)-dev
-	dh_install -plibboost-python$(PKGVERSION)-dev --autodest \
-	   debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate
-
-	cd libs/python/pyste/install && python setup.py install --no-compile --prefix=$(pyste_prefix) --install-lib=$(pyste_prefix)/share/pyshared
-	mv $(pyste_prefix)/bin/pyste.py $(pyste_prefix)/bin/pyste
-	dh_installman -plibboost-python$(PKGVERSION)-dev debian/pyste.1
-
-	dh_install
-
-override_dh_strip:
-	dh_strip --dbg-package=libboost$(PKGVERSION)-dbg -X"-d-"




More information about the pkg-boost-commits mailing list