From eb46577f58dac48267d22ad752518d46acc82c14 Mon Sep 17 00:00:00 2001 From: Thomas Hallgren Date: Tue, 5 Mar 2019 16:19:46 +0100 Subject: [PATCH] debian/rules bug fix: the RGL was not included in .deb packages The problem was that the RGL was both built and copied to the destdir during the build step, which caused it to be deleted before the install step. It is now copied to destdir during the install step. --- debian/changelog | 6 ++++++ debian/rules | 35 +++++++++++++++++++---------------- gf.cabal | 2 +- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index a11a6d5d9..709070841 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gf (3.10-2) xenial bionic cosmic; urgency=low + + * GF 3.10 + + -- Thomas Hallgren Fri, 5 Mar 2019 16:00:00 +0100 + gf (3.10-1) xenial bionic cosmic; urgency=low * GF 3.10 diff --git a/debian/rules b/debian/rules index 3afb7ab72..428801e94 100755 --- a/debian/rules +++ b/debian/rules @@ -13,21 +13,6 @@ override_dh_shlibdeps: dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info -override_dh_auto_build: - cd src/runtime/python && EXTRA_INCLUDE_DIRS=$(CURDIR)/src/runtime/c EXTRA_LIB_DIRS=$(CURDIR)/src/runtime/c/.libs python setup.py build - cd src/runtime/java && make CFLAGS="-I$(CURDIR)/src/runtime/c -L$(CURDIR)/src/runtime/c/.libs" INSTALL_PATH=/usr/lib - echo LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs - LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs cabal build - LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs cabal copy --destdir=$(CURDIR)/debian/gf # create www directory - PATH=$(CURDIR)/dist/build/gf:$$PATH && export GF_LIB_PATH="$$(dirname $$(find "$(CURDIR)/debian/gf" -name www))/lib" && echo "GF_LIB_PATH=$$GF_LIB_PATH" && mkdir -p "$$GF_LIB_PATH" && ( cd ../gf-rgl && make build && make copy ) && LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs cabal build - make html - -override_dh_auto_clean: - rm -fr dist/build - -cd src/runtime/python && rm -fr build - -cd src/runtime/java && make clean - -cd src/runtime/c && make clean - override_dh_auto_configure: cd src/runtime/c && bash setup.sh configure --prefix=/usr cd src/runtime/c && bash setup.sh build @@ -35,13 +20,31 @@ override_dh_auto_configure: cabal install --only-dependencies cabal configure --prefix=/usr -fserver -fc-runtime --extra-lib-dirs=$(CURDIR)/src/runtime/c/.libs --extra-include-dirs=$(CURDIR)/src/runtime/c +SET_LDL=LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs + +override_dh_auto_build: + cd src/runtime/python && EXTRA_INCLUDE_DIRS=$(CURDIR)/src/runtime/c EXTRA_LIB_DIRS=$(CURDIR)/src/runtime/c/.libs python setup.py build + cd src/runtime/java && make CFLAGS="-I$(CURDIR)/src/runtime/c -L$(CURDIR)/src/runtime/c/.libs" INSTALL_PATH=/usr/lib + echo $(SET_LDL) + $(SET_LDL) cabal build # builds gf, fails to build example grammars + PATH=$(CURDIR)/dist/build/gf:$$PATH && make -C ../gf-rgl build + GF_LIB_PATH=$(CURDIR)/../gf-rgl/dist $(SET_LDL) cabal build # have RGL now, ok to build example grammars + make html + override_dh_auto_install: - LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs cabal copy --destdir=$(CURDIR)/debian/gf + $(SET_LDL) cabal copy --destdir=$(CURDIR)/debian/gf # creates www directory + export GF_LIB_PATH="$$(dirname $$(find "$(CURDIR)/debian/gf" -name www))/lib" && echo "GF_LIB_PATH=$$GF_LIB_PATH" && mkdir -p "$$GF_LIB_PATH" && make -C ../gf-rgl copy cd src/runtime/c && bash setup.sh copy prefix=$(CURDIR)/debian/gf/usr cd src/runtime/python && python setup.py install --prefix=$(CURDIR)/debian/gf/usr cd src/runtime/java && make INSTALL_PATH=$(CURDIR)/debian/gf/usr/lib install D="`find debian/gf -name site-packages`" && [ -n "$$D" ] && cd $$D && cd .. && mv site-packages dist-packages +override_dh_auto_clean: + rm -fr dist/build + -cd src/runtime/python && rm -fr build + -cd src/runtime/java && make clean + -cd src/runtime/c && make clean + override_dh_auto_test: ifneq (nocheck,$(filter nocheck,$(DEB_BUILD_OPTIONS))) true diff --git a/gf.cabal b/gf.cabal index 36a673e17..1f8a8caac 100644 --- a/gf.cabal +++ b/gf.cabal @@ -1,5 +1,5 @@ name: gf -version: 3.10 +version: 3.10-git cabal-version: >= 1.22 build-type: Custom