diff options
| author | Thomas Hallgren <th-github@altocumulus.org> | 2018-11-30 00:47:10 +0100 |
|---|---|---|
| committer | Thomas Hallgren <th-github@altocumulus.org> | 2018-11-30 00:47:10 +0100 |
| commit | 5ef390f18859662fc4ff76e2ec0933151e505bc9 (patch) | |
| tree | 1bdd2dc4160bc94caa2f7cb932764f6d2ef12f74 | |
| parent | fa5c6a2949046785c848f98f82f57e44ab617c75 (diff) | |
| parent | d0bc36835893d048b48366e48884bec78c305509 (diff) | |
Merge branch 'master' of https://github.com/GrammaticalFramework/gf-core
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | WebSetup.hs | 5 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | debian/rules | 2 |
4 files changed, 12 insertions, 3 deletions
@@ -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/WebSetup.hs b/WebSetup.hs index f6f76107d..fd55439b4 100644 --- a/WebSetup.hs +++ b/WebSetup.hs @@ -104,9 +104,10 @@ setupWeb dest (pkg,lbi) = do copy_pgf (pgf,subdir,_) = do let src = gfo_dir </> pgf let dst = grammars_dir </> pgf - putStrLn $ "Installing "++dst ex <- doesFileExist src - if ex then copyFile src dst else return () + if ex then do putStrLn $ "Installing "++dst + copyFile src dst + else putStrLn $ "Not installing "++dst gf_logo = "gf0.png" 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 <hallgren@chalmers.se> 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 index 14cad5c19..3afb7ab72 100644..100755 --- 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: |