[Erp5-report] r43602 rafael - in /erp5/trunk/utils/rpmgen: Makefile build-demo-instance.sh

[nobody at svn.erp5.org]

Author: rafael
Date: Wed Feb 23 13:50:42 2011
New Revision: 43602

URL: http://svn.erp5.org?rev=43602&view=rev
Log:
Clean up names, add comments and merge build-demo-instance.sh into makefile until it can be removed.

Removed:
    erp5/trunk/utils/rpmgen/build-demo-instance.sh
Modified:
    erp5/trunk/utils/rpmgen/Makefile

Modified: erp5/trunk/utils/rpmgen/Makefile
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/Makefile?rev=43602&r1=43601&r2=43602&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/Makefile [utf8] (original)
+++ erp5/trunk/utils/rpmgen/Makefile [utf8] Wed Feb 23 13:50:42 2011
@@ -3,12 +3,6 @@ INSTANCE_REVISION=001
 DEST=/opt/erp5/${VERSION}
 INST=/var/lib/erp5/smb${INSTANCE_REVISION}
 
-debian: 
-	cd specs/erp5-official-software-deb/; sudo dpkg-buildpackage -b
-
-debian-instance:
-	cd specs/erp5-official-instance-deb/; sudo dpkg-buildpackage -b
-
 clean:
 	sudo rm -Rf ${DEST}
 
@@ -20,6 +14,17 @@ build:
 prepare:
 	sudo easy_install erp5.appliance.test
 
+# Demo-setup is required due a lack of feature of standard buildout
+# which is not able to create the instance.
+demo-setup:
+	$(INST)/bin/supervisord
+	$(INST)/var/bin/supervisorctl stop development-site
+	sed -i "s/enable-product-installation off/enable-product-installation on/g" $(INST)/parts/development-site/etc/zope.conf
+	$(INST)/bin/development-site run build-demo-instance.py
+	$(INST)/var/bin/supervisorctl shutdown
+	sed -i "s/enable-product-installation on/enable-product-installation off/g" $(INST)/parts/development-site/etc/zope.conf
+
+# Dependencies for distributions
 ubuntu-dependencies:
 	sudo apt-get install rpm2cpio build-essential dpkg-dev debhelper
 
@@ -35,18 +40,26 @@ fedora-dependencies:
 centos-dependencies:
 	sudo yum install -y rpm-build gcc gcc-c++ make
 
-softwarebuild: prepare build
+# Build for RPMs and DEB packages
+rpm:
 	sudo -E rpmbuild -bb specs/erp5-official-software.spec
 
-instancebuild:
+rpm-instance:
 	sudo -E rpmbuild -bb specs/erp5-official-instance.spec
 
-ubuntu: clean ubuntu-dependencies prepare build debian
+deb:
+	cd specs/erp5-official-software-deb/; sudo dpkg-buildpackage -b
+
+deb-instance:
+	cd specs/erp5-official-instance-deb/; sudo dpkg-buildpackage -b
+
+# Builds for distributions
+ubuntu: clean ubuntu-dependencies prepare build deb
 
-mandriva: clean mandriva-dependencies softwarebuild
+mandriva: clean mandriva-dependencies prepare build rpm
 
-opensuse: clean opensuse-dependencies softwarebuild
+opensuse: clean opensuse-dependencies prepare build rpm
 
-fedora: clean fedora-dependencies softwarebuild
+fedora: clean fedora-dependencies prepare build rpm
 
-centos: clean centos-dependencies softwarebuild
+centos: clean centos-dependencies prepare build rpm

Removed: erp5/trunk/utils/rpmgen/build-demo-instance.sh
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/build-demo-instance.sh?rev=43601&view=auto
==============================================================================
--- erp5/trunk/utils/rpmgen/build-demo-instance.sh [utf8] (original)
+++ erp5/trunk/utils/rpmgen/build-demo-instance.sh (removed)
@@ -1,9 +0,0 @@
-/var/lib/erp5/smb001/var/bin/supervisord
-
-/var/lib/erp5/smb001/var/bin/supervisorctl stop development-site
-sed -i "s/enable-product-installation off/enable-product-installation on/g" /var/lib/erp5/smb001/parts/development-site/etc/zope.conf
-
-/var/lib/erp5/smb001/bin/development-site run build-demo-instance.py
-
-/var/lib/erp5/smb001/var/bin/supervisorctl shutdown
-sed -i "s/enable-product-installation on/enable-product-installation off/g" /var/lib/erp5/smb001/parts/development-site/etc/zope.conf