changeset 2:abe1e48e0708

CHANGELOG gets generated now; reviewed Makefile
author meillo@marmaro.de
date Thu, 22 Nov 2007 21:36:20 +0100
parents 0947e06af4c4
children 737fe869e278
files .hgignore Makefile debian/docs genwebgallery
diffstat 4 files changed, 29 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Thu Nov 22 21:13:35 2007 +0100
+++ b/.hgignore	Thu Nov 22 21:36:20 2007 +0100
@@ -4,3 +4,4 @@
 
 Packages
 *.tar.gz
+CHANGELOG
--- a/Makefile	Thu Nov 22 21:13:35 2007 +0100
+++ b/Makefile	Thu Nov 22 21:36:20 2007 +0100
@@ -4,6 +4,8 @@
 NAME=genwebgallery
 VERSION = 0.3
 NV=${NAME}-${VERSION}
+
+DOCS=COPYRIGHT CHANGELOG TODO
  
 # paths 
 PREFIX = /usr
@@ -16,12 +18,28 @@
 build:
 	@echo build unneeded
 
-dist:
+dist: changelog
 	@mkdir ${NV}
-	@cp -f ${NAME} ${NAME}.1 Makefile TODO COPYRIGHT ${NV}
+	@cp -f ${NAME} ${NAME}.1 Makefile ${DOCS} ${NV}
 	@tar -czhof ${NV}.tar.gz ${NV}
 	@rm -rf ${NV}
 
+deb: dist
+	@mkdir -p Packages
+	@cp ${NV}.tar.gz Packages/
+	( \
+		cd Packages/ ;\
+		tar -xzf ${NV}.tar.gz ;\
+		mv ${NV}.tar.gz ${NAME}_${VERSION}.orig.tar.gz ;\
+		cd ${NV}/ ;\
+		cp -r ../../debian/ . ;\
+		debuild ;\
+	 )
+
+changelog:
+	@echo generating changelog from mercurial log
+	@hg log -v --style changelog > CHANGELOG
+
 install:
 	@echo installing executable file to ${DESTDIR}${BINDIR}
 	@mkdir -p ${DESTDIR}${BINDIR}
@@ -38,26 +56,14 @@
 	@echo removing manual page from ${DESTDIR}${MANDIR}/man1
 	@rm -f ${DESTDIR}${MANDIR}/man1/${NAME}.1
 
-deb: dist
-	@mkdir -p Packages
-	@cp ${NV}.tar.gz Packages/
-	( \
-		cd Packages/ ;\
-		tar -xzf ${NV}.tar.gz ;\
-		mv ${NV}.tar.gz ${NAME}_${VERSION}.orig.tar.gz ;\
-		cd ${NV}/ ;\
-		cp -r ../../debian/ . ;\
-		debuild ;\
-	 )
-
 clean:
 	@echo clean unneeded
 
 distclean: clean
-	@rm -f ${NAME}-*.tar.gz
+	@rm -f ${NAME}-*.tar.gz CHANGELOG
 
-debclean:
+debclean: distclean
 	@cd Packages/${NV}/ ; debuild clean ;
 
 
-.PHONY: all clean build install uninstall
+.PHONY: all dist deb changelog clean distclean debclean build install uninstall
--- a/debian/docs	Thu Nov 22 21:13:35 2007 +0100
+++ b/debian/docs	Thu Nov 22 21:36:20 2007 +0100
@@ -1,2 +1,3 @@
+COPYRIGHT
+CHANGELOG
 TODO
-COPYRIGHT
--- a/genwebgallery	Thu Nov 22 21:13:35 2007 +0100
+++ b/genwebgallery	Thu Nov 22 21:36:20 2007 +0100
@@ -7,6 +7,8 @@
 #
 
 
+VERSION=0.3
+
 targetDir="web"
 index="index.htm"
 sizePic=640
@@ -93,7 +95,7 @@
 while [  "$#" -ge 1  -a  "${1:0:1}" = '-'  ] ; do
 	case $1 in
 		'--version')
-			echo "genwebgallery version 0.3"
+			echo "genwebgallery version $VERSION"
 			exit 0
 			;;
 		'--help')