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

nobody at svn.erp5.org nobody at svn.erp5.org
Wed Mar 24 21:26:31 CET 2010


Author: lucas
Date: Wed Mar 24 21:26:29 2010
New Revision: 34079

URL: http://svn.erp5.org?rev=34079&view=rev
Log:
- Following such name:

Name        : erp5-5.4.6
Version     : 001
Release     : mdv2010.0


Modified:
    erp5/trunk/buildout/Makefile

Modified: erp5/trunk/buildout/Makefile
URL: http://svn.erp5.org/erp5/trunk/buildout/Makefile?rev=34079&r1=34078&r2=34079&view=diff
==============================================================================
--- erp5/trunk/buildout/Makefile [utf8] (original)
+++ erp5/trunk/buildout/Makefile [utf8] Wed Mar 24 21:26:29 2010
@@ -2,6 +2,9 @@
 PACKAGE_INSTALL_PATH='opt/erp5/'`cat VERSION.txt`
 ifndef $(PACKAGE_VERSION)
 PACKAGE_VERSION=`cat VERSION.txt`
+endif
+ifndef $(PACKAGE_RELEASE)
+PACKAGE_RELEASE="None"
 endif
 
 software: bin/buildout
@@ -36,9 +39,9 @@
 	# set the correct name erp5-5.4.6
 	sed -i "s,name = erp5-official-buildout,name = erp5-`cat VERSION.txt`,g" rpmgen/buildout.cfg
 	# set the correct version defined in the main buildout
-	sed -i "s,\$${checkout:location\}\/VERSION.txt,`cat VERSION.txt`,g" rpmgen/buildout.cfg
+	sed -i "s,\$${checkout:location\}\/VERSION.txt,$(PACKAGE_VERSION),g" rpmgen/buildout.cfg
 	# set the correct release
-	sed -i "s,release = 001,release = $(PACKAGE_VERSION),g" rpmgen/buildout.cfg
+	if [ $(PACKAGE_RELEASE) != 'None' ]; then sed -i "s,release = mdv2010.0,release = $(PACKAGE_RELEASE),g" 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