From d0bc36835893d048b48366e48884bec78c305509 Mon Sep 17 00:00:00 2001 From: Thomas Hallgren Date: Fri, 30 Nov 2018 00:17:45 +0100 Subject: [PATCH] Update `make deb` for the GF 3.10 release This includes adding commands in debian/rules to build and include the RGL and the example grammars in the debian package. --- Makefile | 2 +- debian/changelog | 6 ++++++ debian/rules | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) mode change 100644 => 100755 debian/rules diff --git a/Makefile b/Makefile index 80ecff061..93a8dc20b 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ html:: # number to the top of debian/changelog. # (Tested on Ubuntu 15.04. You need to install dpkg-dev & debhelper.) deb: - dpkg-buildpackage -b + dpkg-buildpackage -b -uc # Make an OS X Installer package pkg: diff --git a/debian/changelog b/debian/changelog index b3cb6db35..d163c4a03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gf (3.10-1) xenial bionic cosmic; urgency=low + + * GF 3.10 + + -- Thomas Hallgren Fri, 30 Nov 2018 20:00:00 +0100 + gf (3.9-1) vivid xenial zesty; urgency=low * GF 3.9 diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 index 14cad5c19..3afb7ab72 --- a/debian/rules +++ b/debian/rules @@ -18,6 +18,8 @@ override_dh_auto_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: