From 27c1330cc2fce3b4054b4731dc779253aa9fdd2a Mon Sep 17 00:00:00 2001
From: Martin Stubenschrott <stubenschrott@gmx.net>
Date: Sun, 29 Apr 2007 19:13:45 +0000
Subject: [PATCH] new make release command

---
 Makefile      | 63 +++++++++++++++++++++++++++++++--------------------
 update.rdf.in | 26 ---------------------
 2 files changed, 38 insertions(+), 51 deletions(-)
 delete mode 100644 update.rdf.in

diff --git a/Makefile b/Makefile
index 25e5e907..6b69f274 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,34 @@
 #### configuration
 
-TOP       = $(shell pwd)
+TOP           = $(shell pwd)
 
-VERSION   = 0.4
-OS        = $(shell uname -s)
-DATE      = $(shell date "+%Y/%m/%d")
+VERSION       = 0.4
+OS            = $(shell uname -s)
+BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 
-JAR_FILES = ${shell find chrome/content -type f -a ! -path '*CVS*' ! -name 'tags'} chrome.manifest
-JAR_DIRS  = $(foreach f,${JAR_FILES},$(dir $f))
-JAR       = chrome/vimperator.jar
+JAR_FILES     = ${shell find chrome/content -type f -a ! -path '*CVS*' ! -name 'tags'} chrome.manifest
+JAR_DIRS      = $(foreach f,${JAR_FILES},$(dir $f))
+JAR           = chrome/vimperator.jar
 
 XPI_TXT_FILES = install.rdf chrome.manifest TODO AUTHORS Donators ChangeLog
-XPI_DIRS  = $(foreach f,${XPI_FILES},$(dir $f))
+XPI_DIRS      = $(foreach f,${XPI_FILES},$(dir $f))
 XPI_BIN_FILES = ${JAR} Makefile
-XPI_FILES = ${XPI_BIN_FILES} ${XPI_TXT_FILES}
-XPI_NAME  = vimperator_${VERSION}.xpi
-XPI       = ../downloads/${XPI_NAME}
+XPI_FILES     = ${XPI_BIN_FILES} ${XPI_TXT_FILES}
+XPI_NAME      = vimperator_${VERSION}.xpi
+XPI           = ../downloads/${XPI_NAME}
 
-BUILD_DIR=build.${VERSION}.${OS}
-BUILD_JAR_DIR=${BUILD_DIR}/jar
-BUILD_XPI_DIR=${BUILD_DIR}/xpi
+RDF           = ../downloads/update.rdf
+RDF_IN        = ${RDF}.in
 
-BUILD_JAR_SUBDIRS=$(sort ${JAR_DIRS:%=${BUILD_JAR_DIR}/%})
-BUILD_XPI_SUBDIRS=$(sort ${XPI_DIRS:%=${BUILD_XPI_DIR}/%})
+BUILD_DIR     = build.${VERSION}.${OS}
+BUILD_JAR_DIR = ${BUILD_DIR}/jar
+BUILD_XPI_DIR = ${BUILD_DIR}/xpi
 
+BUILD_JAR_SUBDIRS = $(sort ${JAR_DIRS:%=${BUILD_JAR_DIR}/%})
+BUILD_XPI_SUBDIRS = $(sort ${XPI_DIRS:%=${BUILD_XPI_DIR}/%})
 
 ZIP = zip
+SED = sed
 
 # find the vimperator chrome dir
 
@@ -54,10 +57,11 @@ help:
 	@echo "vimperator ${VERSION} build"
 	@echo
 	@echo "  make help      - display this help"
-	@echo "  make info      - shome some info about the system"
+	@echo "  make info      - show some info about the system"
 	@echo "  make jar       - build a JAR (${JAR})"
 	@echo "  make install   - install into your firefox dir (run info)"
 	@echo "  make xpi       - build an XPI (${XPI_NAME})"
+	@echo "  make release   - updates update.rdf (this is not for you)"
 	@echo "  make clean     - clean up"
 	@echo
 	@echo "running some commands with V=1 will show more build details"
@@ -88,6 +92,15 @@ install: needs_chrome_dir ${JAR}
 	@echo "Installing JAR..."
 	${Q}cp ${CP_V} ${JAR} ${INSTALL_CHROME}
 
+release: ${XPI} ${RDF}
+
+${RDF}: ${RDF_IN} Makefile
+	@echo "Preparing release..."
+	${Q}${SED} -e "s,###VERSION###,${VERSION},g" \
+	           -e "s,###DATE###,${DATE},g" \
+	           < $< > $@
+	@echo "SUCCESS: $@"
+
 clean:
 	@echo "Cleanup..."
 	${Q}rm -f ${JAR} ${XPI}
@@ -106,15 +119,15 @@ ${XPI}: ${BUILD_XPI_SUBDIRS} ${XPI_FILES}
 		cp $$f ${BUILD_XPI_DIR}/$$f ; \
 	    done
 	${Q}for f in ${XPI_TXT_FILES} ; do \
-		sed -e "s,###VERSION###,${VERSION},g" \
-		    -e "s,###DATE###,${DATE},g" \
-		    < $$f > ${BUILD_XPI_DIR}/$$f ; \
+		${SED} -e "s,###VERSION###,${VERSION},g" \
+		       -e "s,###DATE###,${DATE},g" \
+		       < $$f > ${BUILD_XPI_DIR}/$$f ; \
 		( diff -q $$f ${BUILD_XPI_DIR}/$$f 1>/dev/null ) || \
 		( echo "modified: $$f" ; \
 		  diff -u $$f ${BUILD_XPI_DIR}/$$f | grep '^[-+][^-+]' ) ; \
 	    done
 	${Q}( cd ${BUILD_XPI_DIR} && ${ZIP} -r ${TOP}/${XPI} ${XPI_FILES} )
-	@echo "SUCCESS: ${XPI}"
+	@echo "SUCCESS: $@"
 
 #### jar
 
@@ -124,12 +137,12 @@ ${BUILD_JAR_SUBDIRS}:
 ${JAR}: ${BUILD_JAR_SUBDIRS} ${JAR_FILES}
 	@echo "Building JAR..."
 	${Q}for f in ${JAR_FILES} ; do \
-		sed -e "s,###VERSION###,${VERSION},g" \
-		    -e "s,###DATE###,${DATE},g" \
-		    < $$f > ${BUILD_JAR_DIR}/$$f ; \
+		${SED} -e "s,###VERSION###,${VERSION},g" \
+		       -e "s,###DATE###,${DATE},g" \
+		       < $$f > ${BUILD_JAR_DIR}/$$f ; \
 		( diff -q $$f ${BUILD_JAR_DIR}/$$f 1>/dev/null ) || \
 		( echo "modified: $$f" ; \
 		  diff -u $$f ${BUILD_JAR_DIR}/$$f | grep '^[-+][^-+]' ) ; \
 	    done
 	${Q}( cd ${BUILD_JAR_DIR} && ${ZIP} -r ${TOP}/${JAR} ${JAR_FILES} )
-	@echo "SUCCESS: ${JAR}"
+	@echo "SUCCESS: $@"
diff --git a/update.rdf.in b/update.rdf.in
deleted file mode 100644
index 34b6b764..00000000
--- a/update.rdf.in
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<r:RDF xmlns:r="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-       xmlns="http://www.mozilla.org/2004/em-rdf#">
-<!-- Foo Widget Extension -->
-<r:Description about="urn:mozilla:extension:{f9570b26-e246-4753-9b68-61aa95994237}">
-  <updates>
-    <r:Seq>
-      <r:li>
-        <r:Description>
-          <version>###VERSION###</version>
-          <targetApplication>
-            <r:Description>
-              <id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</id>
-              <minVersion>2.0</minVersion>
-              <maxVersion>3.0</maxVersion>
-			  <updateLink>http://downloads.mozdev.org/vimperator/vimperator_###VERSION###.xpi</updateLink>
-            </r:Description>
-          </targetApplication>
-        </r:Description>
-      </r:li>
-    </r:Seq>
-  </updates>
-  <version>###VERSION###</version>
-  <updateLink>http://downloads.mozdev.org/vimperator/vimperator-###VERSION###.xpi</updateLink>
-</r:Description>
-</r:RDF>