[Fusionforge-commits] r7183 - trunk
Alexandre Neymann
neymanna at libremir.placard.fr.eu.org
Wed Mar 18 19:07:37 CET 2009
Author: neymanna
Date: 2009-03-18 19:07:37 +0100 (Wed, 18 Mar 2009)
New Revision: 7183
Modified:
trunk/Makefile.rh
Log:
simplier the Makefile.rh, work only in the rpmbuild directory and use a variable to provide srpms in a directory
Modified: trunk/Makefile.rh
===================================================================
--- trunk/Makefile.rh 2009-03-18 16:05:38 UTC (rev 7182)
+++ trunk/Makefile.rh 2009-03-18 18:07:37 UTC (rev 7183)
@@ -12,7 +12,7 @@
clean: cleanff cleanplugins # Clean fusionforge and plugins #
#GForge
-fusionforge: cleanff build # Build fusionforge #
+fusionforge: build # Build fusionforge #
#Plugins
#allplugins: cvsplugin cvstrackerplugin ldapextauthplugin
@@ -20,7 +20,7 @@
#cleanplugins: cleancvs cleansvn cleancvstracker cleanldapextauth cleanexternalsearch
cleanplugins: cleancvs
-cvsplugin: cleancvs buildcvs # package cvs plugin #
+cvsplugin: buildcvs # package cvs plugin #
#svnplugin: cleansvn buildsvn # package svn plugin #
#cvstrackerplugin: cleancvstracker buildcvstracker # package cvstracker plugin #
#ldapextauthplugin: cleanldapextauth buildldapextauth # package ldapextauth plugin #
@@ -29,59 +29,76 @@
#Modules
allmodules : libnsspgsql
-libnsspgsql : cleanlibnsspgsql buildlibnsspgsql
+libnsspgsql : buildlibnsspgsql
-RPM_TMP=/tmp/fusionforge-build
+RPM_TMP=~/rpmbuild
+RPMS_DIST=~/fusionforge_repo
# build a custom rpmmacro file and rpmrc to point to it for rpmbuild
-rpmrc:
- echo 'include: /usr/lib/rpm/rpmrc' > ./rpmrc
+#rpmrc:
+# echo 'include: /usr/lib/rpm/rpmrc' > ./rpmrc
-rpmmacro:
- echo '$(shell rpmbuild --showrc | grep '^macrofiles'):./rpmmacros' >> ./rpmrc
- echo '%_topdir $(RPM_TMP)' > ./rpmmacros
- echo '%_rpmtopdir %{_topdir}' >> ./rpmmacros
- echo '%_builddir %{_rpmtopdir}/BUILD' >> ./rpmmacros
- echo '%_rpmdir %{_rpmtopdir}/RPMS' >> ./rpmmacros
- echo '%_sourcedir %{_rpmtopdir}/SOURCE' >> ./rpmmacros
- echo '%_specdir %{_rpmtopdir}/SPEC' >> ./rpmmacros
- echo '%_srcrpmdir %{_rpmtopdir}/SRPMS' >> ./rpmmacros
- echo '%_tmppath %{_rpmtopdir}/TMP' >> ./rpmmacros
- echo '%_buildroot %{_tmppath}/%{name}-root' >> ./rpmmacros
+#rpmmacro:
+# echo '$(shell rpmbuild --showrc | grep '^macrofiles'):./rpmmacros' >> ./rpmrc
+# echo '%_topdir $(RPM_TMP)' > ./rpmmacros
+# echo '%_rpmtopdir %{_topdir}' >> ./rpmmacros
+# echo '%_builddir %{_rpmtopdir}/BUILD' >> ./rpmmacros
+# echo '%_rpmdir %{_rpmtopdir}/RPMS' >> ./rpmmacros
+# echo '%_sourcedir %{_rpmtopdir}/SOURCE' >> ./rpmmacros
+# echo '%_specdir %{_rpmtopdir}/SPEC' >> ./rpmmacros
+# echo '%_srcrpmdir %{_rpmtopdir}/SRPMS' >> ./rpmmacros
+# echo '%_tmppath %{_rpmtopdir}/TMP' >> ./rpmmacros
+# echo '%_buildroot %{_tmppath}/%{name}-root' >> ./rpmmacros
-rpmprep: rpmrc rpmmacro
- -mkdir -p $(RPM_TMP)/BUILD $(RPM_TMP)/RPMS $(RPM_TMP)/SOURCE $(RPM_TMP)/SPEC $(RPM_TMP)/SRPMS $(RPM_TMP)/TMP 2> /dev/null
+#rpmprep: rpmrc rpmmacro
+# -mkdir -p $(RPM_TMP)/BUILD $(RPM_TMP)/RPMS $(RPM_TMP)/SOURCE $(RPM_TMP)/SPEC $(RPM_TMP)/SRPMS $(RPM_TMP)/TMP 2> /dev/null
-dist: rpmprep
- -mkdir ./dist 2> /dev/null
- mv ./*.bz2 $(RPM_TMP)/SRPMS/*.rpm ./dist
+#dist: rpmprep
+# -mkdir ./dist 2> /dev/null
+# mv ./*.bz2 $(RPM_TMP)/SRPMS/*.rpm ./dist
+
+rpmprep:
+ -rm -Rf $(RPM_TMP)/*
+ -rm -Rf ~/.rpmmacros
+ rpmdev-setuptree
+ echo '%_tmppath %{_topdir}/TMP' >> ~/.rpmmacros
+ echo '%_buildroot %{_tmppath}/%{name}-root' >> ~/.rpmmacros
+ mkdir $(RPM_TMP)/TMP
+
+dist:
+ -mkdir $(RPMS_DIST)
+ cp $(RPM_TMP)/SRPMS/*.rpm $(RPMS_DIST)
+
#
# FUSIONFORGE
#
target cleanff build : override version=$(shell grep '^Version:' gforge/fusionforge.spec | sed 's/.*:\s*\(.*\)/\1/')
cleanff: # Clean files of fusionforge build #
- @rm -rf fusionforge-$(version).tar.bz2 fusionforge-$(version)
+ @cd $(RPM_TMP)/SOURCES/; rm -rf fusionforge-$(version).tar.bz2 fusionforge-$(version)
@echo cleanff Done
+
build: rpmprep # Build rpm fusionforge packages #
- cd gforge ;mv plugins ../;mkdir ../utils;mv utils/install-nsspgsql.sh ../utils/;mv utils/fusionforge-shell-postgresql.spec ../utils/;find . -type f | grep -v '/CVS/' | grep -v '/.svn/' | grep -v contrib | grep -v debian | grep -v docs/phpdoc/docs | cpio -pdumvB ../fusionforge-$(version)
- cp gforge/rpm-specific/patches/gforge-4.0-deb_rpm.patch .
- tar cvjf fusionforge-$(version).tar.bz2 fusionforge-$(version)
- rpmbuild -ts --nodeps --rcfile rpmrc fusionforge-$(version).tar.bz2
+ cd gforge; find . -type f | grep -v '/CVS/' | grep -v '/.svn/' | grep -v contrib | grep -v debian | grep -v docs/phpdoc/docs | cpio -pdumvB $(RPM_TMP)/SOURCES/fusionforge-$(version)
+ cd $(RPM_TMP)/SOURCES/fusionforge-$(version); mv plugins ../;mkdir ../utils;mv utils/install-nsspgsql.sh ../utils/;mv utils/fusionforge-shell-postgresql.spec ../utils/
+ cd $(RPM_TMP)/SOURCES/; cp fusionforge-$(version)/rpm-specific/patches/gforge-4.0-deb_rpm.patch .
+ cd $(RPM_TMP)/SOURCES/; tar cvjf fusionforge-$(version).tar.bz2 fusionforge-$(version)
+ cd $(RPM_TMP)/SOURCES/; rpmbuild -ts --nodeps fusionforge-$(version).tar.bz2
#
# CVS PLUGIN
#
-target cleancvs buildcvs : override version=$(shell grep '^Version:' plugins/scmcvs/fusionforge-plugin-scmcvs.spec | sed 's/.*:\s*\(.*\)/\1/')
+target cleancvs buildcvs : override version=$(shell grep '^Version:' gforge/plugins/scmcvs/fusionforge-plugin-scmcvs.spec | sed 's/.*:\s*\(.*\)/\1/')
cleancvs: # Clean files of gforge-plugin-scmcvs build #
- @rm -rf fusionforge-plugin-scmcvs-$(version).tar.bz2 fusionforge-plugin-scmcvs-$(version)
+ @cd $(RPM_TMP)/SOURCES/; rm -rf fusionforge-plugin-scmcvs-$(version).tar.bz2 fusionforge-plugin-scmcvs-$(version)
@echo cleancvs Done
-buildcvs: rpmprep # Build rpm fusionforge-plugin-scmcvs package #
- cd plugins/scmcvs ; find . -type f | grep -v '/CVS/' | grep -v '/.svn/' | grep -v contrib | grep -v debian | cpio -pdumvB ../../fusionforge-plugin-scmcvs-$(version)
- tar cvjf fusionforge-plugin-scmcvs-$(version).tar.bz2 fusionforge-plugin-scmcvs-$(version)
- rpmbuild -ts --nodeps --rcfile rpmrc fusionforge-plugin-scmcvs-$(version).tar.bz2
+buildcvs: # Build rpm fusionforge-plugin-scmcvs package #
+ cd gforge/plugins/scmcvs; find . -type f | grep -v '/CVS/' | grep -v '/.svn/' | grep -v contrib | grep -v debian | cpio -pdumvB $(RPM_TMP)/SOURCES/fusionforge-plugin-scmcvs-$(version)
+ cd $(RPM_TMP)/SOURCES; tar cvjf fusionforge-plugin-scmcvs-$(version).tar.bz2 fusionforge-plugin-scmcvs-$(version)
+ cd $(RPM_TMP)/SOURCES; rpmbuild -ts --nodeps fusionforge-plugin-scmcvs-$(version).tar.bz2
+
#
# SVN PLUGIN
#
@@ -142,14 +159,14 @@
#
# LIBNSS-PGSQL MODULE
#
-target cleanlibnsspgsql buildlibnsspgsql : override version=$(shell grep '^Version:' utils/fusionforge-shell-postgresql.spec | sed 's/.*:\s*\(.*\)/\1/')
+target cleanlibnsspgsql buildlibnsspgsql : override version=$(shell grep '^Version:' gforge/utils/fusionforge-shell-postgresql.spec | sed 's/.*:\s*\(.*\)/\1/')
cleanlibnsspgsql: # Clean files of fusionforge-shell-postgresql #
- @rm -rf fusionforge-shell-postgresql-$(version).tar.bz2 fusionforge-shell-postgresql-$(version)
+ @cd $(RPM_TMP)/SOURCES/; rm -rf fusionforge-shell-postgresql-$(version).tar.bz2 fusionforge-shell-postgresql-$(version)
@echo cleanlibnsspgsql Done
-buildlibnsspgsql: rpmprep # Build rpm fusionforge-shell-postgresql package #
- cd utils; find . -type f | grep -v '/CVS/' | grep -v '/.svn/' | grep -v contrib | grep -v debian | cpio -pdumvB ../fusionforge-shell-postgresql-$(version)
- tar cvjf fusionforge-shell-postgresql-$(version).tar.bz2 fusionforge-shell-postgresql-$(version)
- rpmbuild -ts --nodeps --rcfile rpmrc fusionforge-shell-postgresql-$(version).tar.bz2
+buildlibnsspgsql: # Build rpm fusionforge-shell-postgresql package #
+ cd gforge/utils; find . -type f | grep -v '/CVS/' | grep -v '/.svn/' | grep -v contrib | grep -v debian | cpio -pdumvB $(RPM_TMP)/SOURCES/fusionforge-shell-postgresql-$(version)
+ cd $(RPM_TMP)/SOURCES; tar cvjf fusionforge-shell-postgresql-$(version).tar.bz2 fusionforge-shell-postgresql-$(version)
+ cd $(RPM_TMP)/SOURCES/; rpmbuild -ts --nodeps fusionforge-shell-postgresql-$(version).tar.bz2
More information about the Fusionforge-commits
mailing list