[evolvis-commits] r14619: Add method to calculate svn or bzr revision↵ set conf parametter in default build?==?UTF-8?Q?↵

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 04:39:23 CET 2011


Author: mirabilos
Date: 2011-02-28 04:39:22 +0100 (Mon, 28 Feb 2011)
New Revision: 14619

Modified:
   trunk/gforge_base/evolvisforge-5.1/tools/simple-cdd/Makefile
Log:
Add method to calculate svn or bzr revision
set conf parametter in default build


Modified: trunk/gforge_base/evolvisforge-5.1/tools/simple-cdd/Makefile
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/tools/simple-cdd/Makefile	2011-02-28 03:39:16 UTC (rev 14618)
+++ trunk/gforge_base/evolvisforge-5.1/tools/simple-cdd/Makefile	2011-02-28 03:39:22 UTC (rev 14619)
@@ -2,13 +2,25 @@
 DIST=lenny
 DIST=squeeze
 
+in_svn_repo:= $(wildcard .svn/)
+ifeq ($(strip $(in_svn_repo)),)
+in_bzr_repo:= $(wildcard ../../.bzr/)
+ifeq ($(strip $(in_bzr_repo)),)
+        svnrev=unknown
+else
+        svnrev=bzr$(shell bzr revno)
+endif
+else
+        svnrev=$(shell LANG=C svn info 2>&1 | grep Revision | cut -d: -f2| sed 's/ //g')
+endif
+
 default: fusionforgemulti
 
 fusionforge: passsetup /usr/bin/build-simple-cdd 
 	build-simple-cdd -g --profiles fusionforge --auto-profiles fusionforge --profiles-udeb-dist $(DIST) --debian-mirror http://ftp.fr.debian.org/debian --security-mirror http://security.debian.org/debian-security --dist $(DIST) 
 
 fusionforgemulti: passsetup /usr/bin/build-simple-cdd
-	build-simple-cdd -g --profiles fusionforge,x-basic,x-gnome,autopart --profiles-udeb-dist $(DIST) --debian-mirror http://ftp.fr.debian.org/debian --security-mirror http://security.debian.org/debian-security --dist $(DIST) 
+	build-simple-cdd -g --profiles fusionforge,x-basic,x-gnome,autopart --profiles-udeb-dist $(DIST) --debian-mirror http://ftp.fr.debian.org/debian --security-mirror http://security.debian.org/debian-security --dist $(DIST) --conf profiles/fusionforge.conf
 
 fusionforgefr: clean /usr/bin/build-simple-cdd
 	build-simple-cdd -g --profiles fusionforge --auto-profiles fusionforge --profiles-udeb-dist $(DIST) --debian-mirror http://ftp.fr.debian.org/debian --security-mirror http://security.debian.org/debian-security --dist $(DIST) --locale fr_FR --force-preseed --keyboard fr-latin9



More information about the evolvis-commits mailing list