[evolvis-commits] r14140: Also work if not in a svn co ↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Mon Feb 28 03:52:58 CET 2011
Author: mirabilos
Date: 2011-02-28 03:52:58 +0100 (Mon, 28 Feb 2011)
New Revision: 14140
Modified:
trunk/gforge_base/evolvisforge-5.1/Makefile
trunk/gforge_base/evolvisforge-5.1/Makefile.debian
Log:
Also work if not in a svn co
Modified: trunk/gforge_base/evolvisforge-5.1/Makefile
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/Makefile 2011-02-28 02:52:56 UTC (rev 14139)
+++ trunk/gforge_base/evolvisforge-5.1/Makefile 2011-02-28 02:52:58 UTC (rev 14140)
@@ -7,9 +7,16 @@
BUILDRESULT=$(CURDIR)/result
VER=$(shell LANG=C grep '>software_version' gforge/common/include/FusionForge.class.php | cut -d\' -f2)
-ID=$(shell LANG=C svnversion)
-URL=$(shell LANG=C svn info | grep 'Root:' | awk '{print $$3}')
-TAG=$(shell LANG=C svn log $(URL) -r $(ID) -l 1 2>/dev/null | awk '{ if ($$1=="Tag-Release") print $$1}')
+in_svn_repo:= $(wildcard .svn/)
+ifeq ($(strip $(in_svn_repo)),)
+ ID=unknown
+ URL=unknown
+ TAG=unknown
+else
+ ID=$(shell LANG=C svnversion)
+ URL=$(shell LANG=C svn info | grep 'Root:' | awk '{print $$3}')
+ TAG=$(shell LANG=C svn log $(URL) -r $(ID) -l 1 2>/dev/null | awk '{ if ($$1=="Tag-Release") print $$1}')
+endif
ifeq ($(TAG),)
VERSION=fusionforge-$(VER)-$(ID)
else
Modified: trunk/gforge_base/evolvisforge-5.1/Makefile.debian
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/Makefile.debian 2011-02-28 02:52:56 UTC (rev 14139)
+++ trunk/gforge_base/evolvisforge-5.1/Makefile.debian 2011-02-28 02:52:58 UTC (rev 14140)
@@ -28,9 +28,13 @@
gfversion=$(shell head -1 $(PKGNAME)/debian/changelog | sed 's/.*(\(.[^+-]*\).*).*/\1/')
gfminor=$(shell head -1 $(PKGNAME)/debian/changelog | sed 's/.*(.[^+-]*[+-]\(.*\)).*/\1/')
-svnrev=$(shell LANG=C svn info | grep Revision | cut -d: -f2| sed 's/ //g')
+in_svn_repo:= $(wildcard .svn/)
+ifeq ($(strip $(in_svn_repo)),)
+ svnrev=unknown
+else
+ svnrev=$(shell LANG=C svn info | grep Revision | cut -d: -f2| sed 's/ //g')
+endif
-
MINOR=-1
MINOR=-$(BRANCH)$(svnrev)+$(XDISTRIB)
More information about the evolvis-commits
mailing list