[Dh-make-php-commits] r178 - trunk

[Uwe Steinmann]

Author: steinm
Date: 2006-05-30 08:39:02 +0000 (Tue, 30 May 2006)
New Revision: 178

Modified:
   trunk/pear.mk
Log:
- check for xsltproc when cheching for pear and xml
- xmlstarlet is actually called xml
- check for directory tests before moving it.


Modified: trunk/pear.mk
===================================================================
--- trunk/pear.mk	2006-05-23 12:40:00 UTC (rev 177)
+++ trunk/pear.mk	2006-05-30 08:39:02 UTC (rev 178)
@@ -29,8 +29,8 @@
 include $(_cdbs_rules_path)/debhelper.mk$(_cdbs_makefile_suffix)
 
 # modify these variables as necessary
-PEAR_PKG := $(shell /usr/bin/xmlstarlet sel -t -v '/package/name/text()' package.xml)
-PEAR_PKG_VERSION := $(shell /usr/bin/xmlstarlet sel -t -v '/package/release/version/text()' package.xml)
+PEAR_PKG := $(shell /usr/bin/xml sel -t -v '/package/name/text()' package.xml)
+PEAR_PKG_VERSION := $(shell /usr/bin/xml sel -t -v '/package/release/version/text()' package.xml)
 # some packages use test instead of tests
 PEAR_TEST_DIR := tests
 
@@ -44,8 +44,8 @@
 DEB_PHONY_RULES += pear-sanity-check
 
 pear-sanity-check:
-	if ! [ -x /usr/bin/pear -a -x /usr/bin/xmlstarlet ] ; then \
-		echo "pear.mk depends on php-pear and xmlstarlet" ; \
+	if ! [ -x /usr/bin/pear -a -x /usr/bin/xml -a -x /usr/bin/xsltproc ] ; then \
+		echo "pear.mk depends on php-pear, xmlstarlet, and xsltproc" ; \
 		exit 1 ; \
 	fi
 
@@ -77,19 +77,16 @@
 	ln -s ../../doc/$(DEB_PACKAGES) $(DEB_DESTDIR)$(PEAR_OLD_DOC_DIR)
 
 	# create upstream changelog
-	if [ -x /usr/bin/xsltproc ] ; then \
-		/usr/bin/xsltproc --nonet --novalid /usr/share/dh-make-php/xslt/changelog.xsl package.xml | gzip -9 > $(DEB_DESTDIR)$(PEAR_NEW_DOC_DIR)/changelog.gz ; \
-	else \
-		echo "pear.mk requires xsltproc to automatically install the upstream changelog" ; \
-		exit 1 ; \
-	fi ; \
+	/usr/bin/xsltproc --nonet --novalid /usr/share/dh-make-php/xslt/changelog.xsl package.xml | gzip -9 > $(DEB_DESTDIR)$(PEAR_NEW_DOC_DIR)/changelog.gz
 
 	# move test to correct location
-	mkdir -p $(DEB_DESTDIR)$(PEAR_NEW_TEST_DIR)
 	# must move files instead of directory in case tests was part of docs above
-	mv -i $(DEB_DESTDIR)$(PEAR_OLD_TEST_DIR)/* $(DEB_DESTDIR)$(PEAR_NEW_TEST_DIR)
-	rmdir $(DEB_DESTDIR)$(PEAR_OLD_TEST_DIR)
-	ln -s ../../../doc/$(DEB_PACKAGES)/tests $(DEB_DESTDIR)$(PEAR_OLD_TEST_DIR)
+	if [ -d $(DEB_DESTDIR)$(PEAR_OLD_TEST_DIR) ] ; then \
+		mkdir -p $(DEB_DESTDIR)$(PEAR_NEW_TEST_DIR) ; \
+		mv -i $(DEB_DESTDIR)$(PEAR_OLD_TEST_DIR)/* $(DEB_DESTDIR)$(PEAR_NEW_TEST_DIR) ; \
+		rmdir $(DEB_DESTDIR)$(PEAR_OLD_TEST_DIR) ; \
+		ln -s ../../../doc/$(DEB_PACKAGES)/tests $(DEB_DESTDIR)$(PEAR_OLD_TEST_DIR) ; \
+	fi ; \
 
 	# remove unwanted files
 	rm -rf $(DEB_DESTDIR)usr/share/php/.[a-z]* \