[SCM] Vim packaging branch, debian, updated. upstream/7.1.285-113-g038d581

[James Vega]

The following commit has been merged in the debian branch:
commit 04309270ebf20b4be39307619b4b9b21c4c8762d
Author: James Vega <jamessan at debian.org>
Date:   Sat May 10 18:19:17 2008 -0400

    Use upstream's shadow target to allow parallel building.
    
    Upstream's makefile has a shadow target which copies/links the necessary files
    into a specified sub-directory.  Using that, we can now configure and build
    all the variants in parallel and thus remove .NOTPARALLEL from debian/rules.
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/debian/rules b/debian/rules
index 3dabc29..fe41dc0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -189,19 +189,20 @@ clean-vim-basic:
 	  rm -f debian/$$x; \
 	done
 	rm -f $(DOT_IN_DEPS)
-	rm -f src/vim.basic
+	rm -rf vim-basic
 
+clean-%: SHADOWDIR=$*
 clean-%:
 	for x in $(PER_VARIANT_FILES) ; do \
 	  rm -f debian/$*.$$x ; \
 	done
 	rm -f debian/lintian/$*
-	rm -f src/$(subst -,.,$*)
 	if [ "$*" = "vim-tiny" ]; then \
 	  rm -f $(DOT_IN_DEPS_TINY); \
 	fi
+	rm -rf $(SHADOWDIR)
 
-build:
+build: build-stamp-arch
 
 build-indep: build-stamp-indep
 build-stamp-indep:
@@ -215,30 +216,28 @@ build-stamp-arch: $(foreach v,$(VARIANTS),build-stamp-$(v))
 	dh_testdir
 	touch $@
 
+configure-stamp-%: SHADOWDIR=$*
 configure-stamp-%:
 	dh_testdir
 	@echo "*** DEBIAN *** CONFIGURING VARIANT $*"
+	$(MAKE) -C src shadow SHADOWDIR=$(SHADOWDIR)
 	if test -f src/auto/config.cache; then make distclean; fi
-	LDFLAGS="-Wl,--as-needed" CFLAGS="$(CFLAGS_$(*))" ./configure $(CFGFLAGS_$(*))
+	cd $(SHADOWDIR) && LDFLAGS="-Wl,--as-needed" CFLAGS="$(CFLAGS_$(*))" ./configure $(CFGFLAGS_$(*))
 	touch $@
 
 build-stamp-%: CURCFLAGS=$(CFLAGS_$*)
+build-stamp-%: SHADOWDIR=$*
 build-stamp-%: configure-stamp-%
 	dh_testdir
 	@echo "*** DEBIAN *** BUILDING VARIANT $*"
-	$(MAKE) CFLAGS="$(CURCFLAGS)"
-	mv src/vim src/$(subst -,.,$*)
+	$(MAKE) -C $(SHADOWDIR) CFLAGS="$(CURCFLAGS)"
+	mv $(SHADOWDIR)/src/vim $(SHADOWDIR)/src/$(subst -,.,$*)
 	touch $@
 
 install: install-stamp
 install-stamp: $(foreach v,$(VARIANTS),install-stamp-$(v))
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -pvim-python -pvim-perl -pvim-ruby -pvim-tcl -pvim-full
-	dh_installdocs -pvim-python -pvim-perl -pvim-ruby -pvim-tcl -pvim-full
-	touch $@
 
-install-stamp-indep: export DH_OPTIONS=-pvim-doc
+install-stamp-indep: export DH_OPTIONS=-pvim-doc -pvim-python -pvim-perl -pvim-ruby -pvim-tcl -pvim-full
 install-stamp-indep: build-stamp-indep
 	dh_testdir
 	dh_testroot
@@ -261,20 +260,20 @@ install-stamp-vim-basic: build-stamp-vim-basic $(DOT_IN_DEPS)
 	
 	# UPSTREAM INSTALLATION
 	
-	cp src/{vim.basic,vim}
-	$(MAKE) -C src DESTDIR=$(DESTDIR) installvimbin \
-	                                  installtutorbin \
-	                                  installruntime \
-	                                  installtools \
-	                                  install-icons \
-	                                  install-languages
+	$(MAKE) -C vim-basic/src DESTDIR=$(DESTDIR) installvimbin \
+	                                            installtutorbin \
+	                                            installruntime \
+	                                            installtools \
+	                                            install-icons \
+	                                            install-languages
 	if [ $(MAKETEST) = "yes" ]; then \
-	  $(MAKE) -C src DESTDIR=$(DESTDIR) test; \
+	  $(MAKE) -C vim-basic/src test; \
 	fi
 	# installvimbin installs the vim binary under debian/tmp but we install
 	# it into the vim package from src/.  Need to rm it from debian/tmp so
 	# that dh_install doesn't fail
-	rm -f src/vim debian/tmp/usr/bin/vim
+	rm -f debian/tmp/usr/bin/vim
+	cp vim-basic/src/vim vim-basic/src/vim.basic
 	
 	# DEBIAN INSTALLATION
 	
@@ -455,7 +454,7 @@ install-stamp-%: build-stamp-%
 	cat $< | sed 's/@VIMCUR@/$(VIMCUR)/' > $@
 
 binary-indep: export DH_OPTIONS=-i
-binary-indep: build-stamp-indep build-stamp-arch install install-stamp-indep
+binary-indep: install-stamp-vim-basic install-stamp-indep
 	dh_testdir
 	dh_testroot
 	dh_compress
@@ -466,7 +465,6 @@ binary-indep: build-stamp-indep build-stamp-arch install install-stamp-indep
 	dh_builddeb -pvim-runtime -- -Zbzip2
 	dh_builddeb -Nvim-runtime
 
-binary-arch: build-stamp-arch install
 binary-arch: $(foreach v,$(VARIANTS),binary-arch-$(v)) binary-arch-vim-dbg
 
 binary-arch-vim-basic: export DH_OPTIONS=-pvim-common -pvim
@@ -519,5 +517,4 @@ beginlog:
 endlog:
 	@echo "*** DEBIAN *** BUILD COMPLETED"
 
-.NOTPARALLEL:
 # vim: set foldmethod=marker:
diff --git a/debian/vim-variant.install b/debian/vim-variant.install
index 55f1ecd..28a1e98 100644
--- a/debian/vim-variant.install
+++ b/debian/vim-variant.install
@@ -1,3 +1,3 @@
 debian/lintian/@PKG@		usr/share/lintian/overrides/
 debian/presubj			usr/share/bug/@PKG@/
-src/vim. at VARIANT@		usr/bin/
+vim- at VARIANT@/src/vim. at VARIANT@	usr/bin/

-- 
Vim packaging