[Fusionforge-commits] r14483 - trunk

Christian Bayle cbayle at fusionforge.org
Tue Sep 27 14:08:15 CEST 2011


Author: cbayle
Date: 2011-09-27 14:08:14 +0200 (Tue, 27 Sep 2011)
New Revision: 14483

Modified:
   trunk/Makefile.rh
Log:
Build out of trunk
Fix svnversion that can contain ':' in some case


Modified: trunk/Makefile.rh
===================================================================
--- trunk/Makefile.rh	2011-09-27 12:07:10 UTC (rev 14482)
+++ trunk/Makefile.rh	2011-09-27 12:08:14 UTC (rev 14483)
@@ -5,9 +5,9 @@
 #
 
 FORGE_HOME=$(CURDIR)
-RPM_TMP=$(FORGE_HOME)/tmp
-BUILDRESULT=$(FORGE_HOME)/build/packages
-RPMBUILD=rpmbuild --define='_topdir $(RPM_TMP)' --define='_tmppath %{_topdir}' --define='_sysconfdir /etc' --define='_rpmdir $(BUILDRESULT)'
+RPM_TMP=$(FORGE_HOME)/../tmp
+BUILDRESULT=$(FORGE_HOME)/../build/packages
+RPMBUILD=rpmbuild --quiet --define='_topdir $(RPM_TMP)' --define='_tmppath %{_topdir}' --define='_sysconfdir /etc' --define='_rpmdir $(BUILDRESULT)'
 
 VER=$(shell LC_ALL=C sed -n '/>software_version/s/^.*'\''\([0-9.]*\)'\''.*$$/\1/p' src/common/include/FusionForge.class.php)
 in_svn_repo:= $(wildcard .svn/)
@@ -16,7 +16,7 @@
 	URL=unknown
 	TAG=unknown
 else
-	ID=$(shell LANG=C svnversion)
+	ID=$(shell LANG=C svnversion|cut -d: -f1)
 	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
@@ -50,9 +50,9 @@
 	cd $(RPM_TMP)/SOURCES/; tar cjf fusionforge-$(version).tar.bz2 fusionforge-$(version)
 	[ -d $(RPM_TMP)/SPECS ] || mkdir $(RPM_TMP)/SPECS
 	sed -e 's/@@VERSION@@/$(version)/g' < src/fusionforge.spec > $(RPM_TMP)/SPECS/fusionforge.spec
-	$(RPMBUILD) -bb $(RPM_TMP)/SPECS/fusionforge.spec
+	$(RPMBUILD) -bb $(RPM_TMP)/SPECS/fusionforge.spec 2>&1| grep -v '/etc/magic'
 
 3rd-party:
-	$(MAKE) -C 3rd-party -f Makefile.rh all
+	$(MAKE) -C 3rd-party -f Makefile.rh BUILDRESULT=$(BUILDRESULT) all
 
 .PHONY : 3rd-party




More information about the Fusionforge-commits mailing list