[Erp5-report] r34424 lucas - /erp5/trunk/buildout/Makefile

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Apr 9 13:48:12 CEST 2010


Author: lucas
Date: Fri Apr  9 13:48:10 2010
New Revision: 34424

URL: http://svn.erp5.org?rev=34424&view=rev
Log:
Now is possible to define different release values for both packages (erp5 and tiolive-application). Usage: make rpm-application PACKAGE_SOFTWARE_RELEASE=002 PACKAGE_APPLICATION_RELEASE=006.

Modified:
    erp5/trunk/buildout/Makefile

Modified: erp5/trunk/buildout/Makefile
URL: http://svn.erp5.org/erp5/trunk/buildout/Makefile?rev=34424&r1=34423&r2=34424&view=diff
==============================================================================
--- erp5/trunk/buildout/Makefile [utf8] (original)
+++ erp5/trunk/buildout/Makefile [utf8] Fri Apr  9 13:48:10 2010
@@ -5,6 +5,12 @@
 endif
 ifndef $(PACKAGE_RELEASE)
 PACKAGE_RELEASE="None"
+endif
+ifndef $(PACKAGE_SOFTWARE_RELEASE)
+PACKAGE_SOFTWARE_RELEASE="None"
+endif
+ifndef $(PACKAGE_APPLICATION_RELEASE)
+PACKAGE_APPLICATION_RELEASE="None"
 endif
 
 software: bin/buildout
@@ -41,7 +47,9 @@
 	# set the correct version defined in the main buildout
 	sed -i "s,\$${checkout:location\}\/VERSION.txt,$(PACKAGE_VERSION),g" rpmgen/buildout.cfg
 	# set the correct release
-	if [ $(PACKAGE_RELEASE) != 'None' ]; then sed -i "s,release = mdv2010.0,release = $(PACKAGE_RELEASE),g" rpmgen/buildout.cfg; fi
+	if [ $(PACKAGE_RELEASE) != 'None' ]; then sed -i "s,release = 001,release = $(PACKAGE_RELEASE),g" rpmgen/buildout.cfg; fi
+	if [ $(PACKAGE_APPLICATION_RELEASE) != 'None' ]; then sed -i "/release \= 001/{x;/^$$/s//0/;y/012/123/;/2/{x;s/release = 001/release = $(PACKAGE_APPLICATION_RELEASE)/;x;};x;}" rpmgen/buildout.cfg; fi
+	if [ $(PACKAGE_SOFTWARE_RELEASE) != 'None' ]; then sed -i 's,release = 001, release = $(PACKAGE_SOFTWARE_RELEASE),1' rpmgen/buildout.cfg; fi
 	# it must use version defined in the main buildout
 	sed -i "s,\$$(shell cat parts/checkout/VERSION.txt), `cat VERSION.txt`,g" rpmgen/Makefile
 	sudo helpers/mandriva2010.0.sh




More information about the Erp5-report mailing list