[Erp5-report] r43385 rafael - /erp5/trunk/utils/rpmgen/

nobody at svn.erp5.org nobody at svn.erp5.org
Wed Feb 16 16:50:33 CET 2011


Author: rafael
Date: Wed Feb 16 16:50:33 2011
New Revision: 43385

URL: http://svn.erp5.org?rev=43385&view=rev
Log:
Simplify the Make file used to create packages.

Removed:
    erp5/trunk/utils/rpmgen/Makefile.packages
    erp5/trunk/utils/rpmgen/README.Debian.Package.txt
Modified:
    erp5/trunk/utils/rpmgen/Makefile

Modified: erp5/trunk/utils/rpmgen/Makefile
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/Makefile?rev=43385&r1=43384&r2=43385&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/Makefile [utf8] (original)
+++ erp5/trunk/utils/rpmgen/Makefile [utf8] Wed Feb 16 16:50:33 2011
@@ -1,6 +1,12 @@
 VERSION=trunk
 DEST=/opt/erp5/${VERSION}
 
+debian: 
+        cd specs/erp5-official-buildout-trunk-deb/; sudo dpkg-buildpackage -b
+
+debian-instance:
+        cd specs/erp5-official-instance-trunk-deb/; sudo dpkg-buildpackage -b
+
 clean:
 	sudo rm -Rf ${DEST}
 
@@ -19,20 +25,16 @@ fedora-dependencies:
 centos-dependencies:
 	sudo yum install -y rpm-build gcc gcc-c++ make
 
-softwarebuild:
+softwarebuild: prepare
 	sudo -E rpmbuild -bb specs/erp5-official-buildout-trunk.spec
 
 instancebuild:
 	sudo -E rpmbuild -bb specs/erp5-official-instance-trunk.spec
 
-mandriva: clean mandriva-dependencies prepare
-	sudo -E rpmbuild -bb specs/erp5-official-buildout-trunk.spec
+mandriva: clean mandriva-dependencies softwarebuild
 
-opensuse: clean opensuse-dependencies prepare
-	sudo -E rpmbuild -bb specs/erp5-official-buildout-trunk.spec
+opensuse: clean opensuse-dependencies softwarebuild
 
-fedora: clean fedora-dependencies prepare 
-	sudo -E rpmbuild -bb specs/erp5-official-buildout-trunk.spec
+fedora: clean fedora-dependencies softwarebuild
 
-centos: clean centos-dependencies prepare
-	sudo -E rpmbuild -bb specs/erp5-official-buildout-trunk.spec
+centos: clean centos-dependencies softwarebuild

Removed: erp5/trunk/utils/rpmgen/Makefile.packages
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/Makefile.packages?rev=43384&view=auto
==============================================================================
--- erp5/trunk/utils/rpmgen/Makefile.packages [utf8] (original)
+++ erp5/trunk/utils/rpmgen/Makefile.packages (removed)
@@ -1,85 +0,0 @@
-SOFTWARE_BUILD_PATH='/opt/erp5/'`cat VERSION.txt`
-PACKAGE_INSTALL_PATH='opt/erp5/'`cat VERSION.txt`
-ifndef $(PACKAGE_VERSION)
-PACKAGE_VERSION=`cat VERSION.txt`
-endif
-ifndef $(PACKAGE_SOFTWARE_RELEASE)
-PACKAGE_SOFTWARE_RELEASE=001
-endif
-ifndef $(PACKAGE_APPLICATION_RELEASE)
-PACKAGE_APPLICATION_RELEASE=001
-endif
-debian-appliance:
-	svn co --ignore-externals https://svn.erp5.org/repos/public/spec/debian-erp5-appliance/ debian-erp5-appliance
-	sed -i "s,__PACKAGE_NAME__,erp5-$(PACKAGE_VERSION),g" debian-erp5-appliance/debian/control
-	sed -i "s,__PACKAGE_VERSION__,$(PACKAGE_VERSION),g" debian-erp5-appliance/debian/changelog
-	sed -i "s,__PACKAGE_RELEASE__,$(PACKAGE_SOFTWARE_RELEASE),g" debian-erp5-appliance/debian/changelog
-	sudo svn co https://svn.erp5.org/repos/public/erp5/release/5.4.6/ $(SOFTWARE_BUILD_PATH)
-	sudo chown -R `whoami` $(SOFTWARE_BUILD_PATH)
-	sudo $(SOFTWARE_BUILD_PATH)/helpers/debian.lenny.sh
-	cd $(SOFTWARE_BUILD_PATH); $(MAKE) $(MFLAGS)
-	mkdir -p debian-erp5-appliance/debian/erp5-$(PACKAGE_VERSION)/$(PACKAGE_INSTALL_PATH)
-	mv $(SOFTWARE_BUILD_PATH)/* debian-erp5-appliance/debian/erp5-$(PACKAGE_VERSION)/$(PACKAGE_INSTALL_PATH)
-	find debian-erp5-appliance/debian/erp5-$(PACKAGE_VERSION)/$(PACKAGE_INSTALL_PATH) -type d -name .svn -exec rm -rf {} \;
-	find debian-erp5-appliance/debian/erp5-$(PACKAGE_VERSION)/$(PACKAGE_INSTALL_PATH) -name '*.pyc' -delete
-	rm -rf debian-erp5-appliance/debian/erp5-$(PACKAGE_VERSION)/$(PACKAGE_INSTALL_PATH)/downloads/* 
-	rm -rf debian-erp5-appliance/debian/erp5-$(PACKAGE_VERSION)/$(PACKAGE_INSTALL_PATH)/parts/*__unpack__
-	cd debian-erp5-appliance/; sudo dpkg-buildpackage -b 
-	svn co  https://svn.erp5.org/repos/public/spec/debian-tiolive-application/ debian-tiolive-application
-	sed -i "s,__PACKAGE_VERSION__,$(PACKAGE_VERSION),g" debian-tiolive-application/debian/rules
-	sed -i "s,__PACKAGE_VERSION__,$(PACKAGE_VERSION),g" debian-tiolive-application/debian/changelog
-	sed -i "s,__PACKAGE_RELEASE__,$(PACKAGE_APPLICATION_RELEASE),g" debian-tiolive-application/debian/changelog
-	cd debian-tiolive-application; sudo dpkg-buildpackage -b
-
-checkout-rpmgen:
-	svn co https://svn.erp5.org/repos/public/erp5/trunk/utils/rpmgen rpmgen
-
-mandriva-rpm-appliance: checkout-rpmgen
-	sed -i "s,name = erp5-official-buildout,name = erp5-`cat VERSION.txt`,g" rpmgen/profiles/mandriva.cfg
-	sed -i "s,\$${checkout:location\}\/VERSION.txt,$(PACKAGE_VERSION),g" rpmgen/profiles/mandriva.cfg
-	sed -i "/release \= 001/{x;/^$$/s//0/;y/012/123/;/2/{x;s/release = 001/release = $(PACKAGE_APPLICATION_RELEASE)/;x;};x;}" rpmgen/profiles/mandriva.cfg
-	sed -i 's,release = 001,release = $(PACKAGE_SOFTWARE_RELEASE),1' rpmgen/profiles/mandriva.cfg
-	sed -i "s,\$$(shell cat parts/checkout/VERSION.txt), `cat VERSION.txt`,g" rpmgen/Makefile
-	sudo helpers/mandriva2010.0.sh
-	cd rpmgen; make mandriva
-
-opensuse11.2-rpm-appliance: checkout-rpmgen
-	sed -i "s,mandriva,opensuse11.2,g" rpmgen/buildout.cfg
-	sed -i "s,name = erp5-official-buildout,name = erp5-$(PACKAGE_VERSION),g" rpmgen/profiles/opensuse11.2.cfg
-	sed -i "s,\$${checkout:location\}\/VERSION.txt,$(PACKAGE_VERSION),g" rpmgen/profiles/opensuse11.2.cfg
-	sed -i "/release \= 001/{x;/^$$/s//0/;y/012/123/;/2/{x;s/release = 001/release = $(PACKAGE_APPLICATION_RELEASE)/;x;};x;}" rpmgen/profiles/opensuse11.2.cfg
-	sed -i 's,release = 001,release = $(PACKAGE_SOFTWARE_RELEASE),1' rpmgen/profiles/opensuse11.2.cfg
-	sed -i "s,\$$(shell cat parts/checkout/VERSION.txt),$(PACKAGE_VERSION),g" rpmgen/Makefile
-	sudo helpers/opensuse.sh
-	cd rpmgen; make opensuse
-
-opensuse11.3-rpm-appliance: checkout-rpmgen
-	sed -i "s,mandriva,opensuse11.3,g" rpmgen/buildout.cfg
-	sed -i "s,name = erp5-official-buildout,name = erp5-$(PACKAGE_VERSION),g" rpmgen/profiles/opensuse11.3.cfg
-	sed -i "s,\$${checkout:location\}\/VERSION.txt,$(PACKAGE_VERSION),g" rpmgen/profiles/opensuse11.3.cfg
-	sed -i "/release \= 001/{x;/^$$/s//0/;y/012/123/;/2/{x;s/release = 001/release = $(PACKAGE_APPLICATION_RELEASE)/;x;};x;}" rpmgen/profiles/opensuse11.3.cfg
-	sed -i 's,release = 001,release = $(PACKAGE_SOFTWARE_RELEASE),1' rpmgen/profiles/opensuse11.3.cfg
-	sed -i "s,\$$(shell cat parts/checkout/VERSION.txt),$(PACKAGE_VERSION),g" rpmgen/Makefile
-	sudo helpers/opensuse.sh
-	cd rpmgen; make opensuse
-
-fedora12-rpm-appliance: checkout-rpmgen
-	sed -i "s,mandriva,fedora12,g" rpmgen/buildout.cfg
-	sed -i "s,name = erp5-official-buildout,name = erp5-$(PACKAGE_VERSION),g" rpmgen/profiles/fedora12.cfg
-	sed -i "s,\$${checkout:location\}\/VERSION.txt,$(PACKAGE_VERSION),g" rpmgen/profiles/fedora12.cfg
-	sed -i "/release \= 001/{x;/^$$/s//0/;y/012/123/;/2/{x;s/release = 001/release = $(PACKAGE_APPLICATION_RELEASE)/;x;};x;}" rpmgen/profiles/fedora12.cfg
-	sed -i 's,release = 001,release = $(PACKAGE_SOFTWARE_RELEASE),1' rpmgen/profiles/fedora12.cfg
-	sed -i "s,\$$(shell cat parts/checkout/VERSION.txt),$(PACKAGE_VERSION),g" rpmgen/Makefile
-	sudo helpers/fedora.sh
-	cd rpmgen; make fedora
-
-fedora13-rpm-appliance: checkout-rpmgen
-	sed -i "s,mandriva,fedora13,g" rpmgen/buildout.cfg
-	sed -i "s,name = erp5-official-buildout,name = erp5-$(PACKAGE_VERSION),g" rpmgen/profiles/fedora13.cfg
-	sed -i "s,\$${checkout:location\}\/VERSION.txt,$(PACKAGE_VERSION),g" rpmgen/profiles/fedora13.cfg
-	sed -i "/release \= 001/{x;/^$$/s//0/;y/012/123/;/2/{x;s/release = 001/release = $(PACKAGE_APPLICATION_RELEASE)/;x;};x;}" rpmgen/profiles/fedora13.cfg
-	sed -i 's,release = 001,release = $(PACKAGE_SOFTWARE_RELEASE),1' rpmgen/profiles/fedora13.cfg
-	sed -i "s,\$$(shell cat parts/checkout/VERSION.txt),$(PACKAGE_VERSION),g" rpmgen/Makefile
-	sudo helpers/fedora.sh
-	cd rpmgen; make fedora
-

Removed: erp5/trunk/utils/rpmgen/README.Debian.Package.txt
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/README.Debian.Package.txt?rev=43384&view=auto
==============================================================================
--- erp5/trunk/utils/rpmgen/README.Debian.Package.txt [utf8] (original)
+++ erp5/trunk/utils/rpmgen/README.Debian.Package.txt (removed)
@@ -1,18 +0,0 @@
-Debian ERP5 Appliance
----------------------
-As ERP5 Appliance is not relocatable itself yet, building packages
-requires to build them in same structure like they would be installed.
-So to have /opt/erp5/9.9.9 build have to be done in such directory. This
-is known limitation and affects both builds - RPM and DEB.
-
-How to build debian package
----------------------------
-Checkout: https://svn.erp5.org/repos/public/erp5/trunk/buildout
-
-For example:
-  svn co https://svn.erp5.org/repos/public/erp5/trunk/buildout ~/buildout
-
-Run make inside:
-  cd ~/buildout
-  make -f Makefile.packages debian-appliance PACKAGE_VERSION=001
-



More information about the Erp5-report mailing list