X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Frules;h=f7fd2094a5e2af9bdeee56f4e78ab4ab686e28bb;hb=a28b37428b92b4dda8c8cd05ba6717f2424832cd;hp=fa4981a5ed2e5dca8c0e1020c8290dda36eedd01;hpb=b4754939cc2c9aba292c9f29300893d89b6acd83;p=lilypond.git

diff --git a/debian/rules b/debian/rules
index fa4981a5ed..f7fd2094a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,55 +5,138 @@
 # version 2 or later for copying conditions.  There is NO warranty.
 #
 
-export MAILADDRESS = lilypond@packages.debian.org
+include VERSION
 
-# fontconfig blows chunks if it can't write to $HOME; and some
-# buildds set it to a bogus value.
-export HOME = /tmp
+export MAILADDRESS = lilypond@packages.debian.org
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
 CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
 ifneq (,$(filter $(DEB_HOST_ARCH), i386 kfreebsd-i386))
   config_opt = --disable-optimising
   CFLAGS := $(filter-out -O%, $(CFLAGS))
   CXXFLAGS := $(filter-out -O%, $(CXXFLAGS))
+else
+ifneq (,$(filter $(DEB_BUILD_OPTIONS),noopt))
+  config_opt = --disable-optimising
 else
   config_opt = --enable-optimising
 endif
+endif
 
 DOC_OPTIONS := WEB_TARGETS="offline"
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	DOC_OPTIONS := $(DOC_OPTIONS) CPU_COUNT=$(firstword $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))))
+	guile_make_args := -j$(firstword $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))))
 endif
 
-%:
-	dh $@ --parallel --with autotools-dev --with python2
+########################################################################
+# START: Definitions from the old guile-1.8 (1.8.8+1-10) package
+########################################################################
+
+# Make sure the build process doesn't touch the real HOME.
+export HOME := $(CURDIR)/no-trespassing
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifeq (alpha,$(shell dpkg-architecture -qDEB_HOST_ARCH))
+  # The -O2 option breaks make check on alpha right now.
+  guile_deb_cflags := -Os -g
+else ifeq (sh4,$(shell dpkg-architecture -qDEB_HOST_ARCH))
+  # Renesas SH(sh4) needs -mieee.  Without it, test-conversion fails.
+  # (Bug: 531378)
+  guile_deb_cflags := -O2 -g -mieee
+else
+  guile_deb_cflags := -O2 -g
+endif
+
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTALL_PROGRAM += -s
+endif
 
+guile_configure_args = \
+  --host=$(DEB_HOST_GNU_TYPE) \
+  --build=$(DEB_BUILD_GNU_TYPE) \
+  --with-threads=no \
+  --disable-error-on-warning \
+  --prefix=/usr
 
-override_dh_auto_configure: 
-	dh_auto_configure -- --disable-checking --enable-debugging $(config_opt)
+ifeq (hurd-i386,$(shell dpkg-architecture -qDEB_HOST_ARCH))
+  guile_configure_args += LIBS=-lpthread
+endif
+
+########################################################################
+# END: Definitions from the old guile-1.8 (1.8.8+1-10) package
+########################################################################
+
+export PATH := $(CURDIR)/out/guile/usr/bin:$(PATH)
+export LD_LIBRARY_PATH := $(CURDIR)/out/guile/usr/lib:$(LD_LIBRARY_PATH)
+export GUILE_LOAD_PATH := $(CURDIR)/out/guile/usr/share/guile/1.8
+export LILYPOND_VERSION := $(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)
+
+%.reloc: %.reloc.in
+	sed < $< > $@ \
+		-e 's!@LILYPOND_VERSION@!$(LILYPOND_VERSION)!g'
+
+%.sh: %.sh.in
+	sed < $< > $@ \
+		-e 's!@DEB_HOST_MULTIARCH@!$(DEB_HOST_MULTIARCH)!g' \
+		-e 's!@LILYPOND_VERSION@!$(LILYPOND_VERSION)!g'
+
+%:
+	dh $@ --parallel --with autotools-dev --with python2 --with quilt
+
+## we need to nuke the parser files, because if there is a mismatch
+## between upstreams bison and our bison, the build will fail epically
+override_dh_auto_configure:
+	$(eval unexport GUILE_LOAD_PATH)
+	cd guile18 && ./autogen.sh
+	cd guile18 && CFLAGS="$(guile_deb_cflags)" ./configure ${guile_configure_args}
+	cd guile18 && $(MAKE) ${guile_make_args}
+	$(MAKE) -C guile18 install DESTDIR=$(CURDIR)/out/guile
+	rm -f lily/out/parser.*
+	GUILE_LOAD_PATH=$(GUILE_LOAD_PATH) \
+		dh_auto_configure -- --disable-checking --enable-debugging $(config_opt)
 
 override_dh_auto_build-indep:
 	dh_auto_build
 	$(MAKE) doc $(DOC_OPTIONS)
 
-override_dh_auto_install-indep:
+override_dh_auto_install-indep: debian/guile.reloc
 	$(MAKE) install-doc $(DOC_OPTIONS) prefix=$(CURDIR)/debian/tmp/usr/
 	$(MAKE) install-info $(DOC_OPTIONS) prefix=$(CURDIR)/debian/tmp/usr
 	rm -rf $(CURDIR)/debian/tmp/usr/share/omf
 	rm -rf $(CURDIR)/debian/tmp/usr/share/doc/lilypond/html/input
+	perl debian/move_info_images_from_html_doc $(CURDIR)/debian/tmp/usr/share/info/ $(CURDIR)/debian/tmp/usr/share/doc/lilypond/html/Documentation/
+	perl debian/symlink_html_images_to_info_images $(CURDIR)/debian/tmp/usr/share/info/lilypond
+	perl debian/remove_w3c_callback $(CURDIR)/debian/tmp/usr/share/doc/lilypond/ $(CURDIR)/debian/tmp/usr/share/info/
 
 ## Unfortunately, lilypond is kind of broken, and installs the wrong
 ## info documentation (missing images) if we call their makefile
 ## directly. They also don't provide an install rule which doesn't
 ## install the documentation, which we don't care about for the
 ## architecture dependent build
-override_dh_auto_install-arch:
+override_dh_auto_install-arch: debian/lilypond.sh debian/lilypond-invoke-editor.sh
 	for dir in `echo */*makefile|xargs -n 1 dirname|grep -v Documentation`; do \
 		$(MAKE) --no-builtin-rules PACKAGE=LILYPOND package=lilypond -C $$dir install $(DOC_OPTIONS) prefix=$(CURDIR)/debian/tmp/usr/; \
-	done;
-
+	done
+	sed -i -e '1s!$(CURDIR)/out/guile/usr/bin/guile!/usr/bin/guile!' \
+		debian/tmp/usr/bin/lilypond-invoke-editor
+
+## we need to nuke the parser files, because if there is a mismatch
+## between upstreams bison and our bison, the build will fail epically
+override_dh_auto_clean:
+	rm -rf no-trespassing
+	-$(MAKE) -C guile18 maintainer-clean
+	rm -f lily/out/parser.*
+	dh_auto_clean --no-parallel
 
 ## we need to install only the png, jpg, css, ly and english html
 ## files into the doc-html package, and only the english pdfs into the
@@ -78,11 +161,11 @@ override_dh_install:
 	dh_install --list-missing
 
 override_dh_python2:
-	dh_python2
-	dh_python2 usr/share/lilypond/2.16.0/python/
+	dh_python2 --verbose
+	dh_python2 --verbose usr/share/lilypond/$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_LEVEL)/python/
 
 override_dh_compress:
-	dh_compress -X.ly
+	dh_compress -X.ly -X.pdf
 
 override_dh_installdocs:
 	dh_installdocs
@@ -90,7 +173,17 @@ override_dh_installdocs:
 		package=`basename $$a .doc-base-special`; \
 		install -d debian/$$package/usr/share/doc-base; \
 		install -m0644 $$a debian/$$package/usr/share/doc-base/$$package; \
-	done;
+	done
+
+override_dh_shlibdeps:
+	$(eval unexport LD_LIBRARY_PATH)
+	dh_shlibdeps -lusr/lib/$(DEB_HOST_MULTIARCH)/lilypond/$(LILYPOND_VERSION)/guile
+
+override_dh_auto_test:
+ifneq (,$(filter $(DEB_BUILD_OPTIONS),nocheck))
+	$(MAKE) test-baseline
+	$(MAKE) test
+endif
 
 ## this rule will update debian/control and the per-language install
 ## files; all of the files it generates/modifies should be included in