[hipl-commit] [trunk] Rev 4591: Revert r4478 and restore 'make bin' target.

From: Diego Biurrun <diego@xxxxxxxxxx>
To: hipl-commit@xxxxxxxxxxxxx
Date: Wed, 26 May 2010 16:11:43 +0300
Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 26/05/2010 at 16:11:42
Revision: 4591
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  Revert r4478 and restore 'make bin' target.
  
  'make deb rpm' is not a suitable replacement since 'make bin' finds
  out which distro it is running on and builds a suitable package.

Modified:
  M  Makefile.am
  M  doc/HACKING
  M  packaging/create-package.sh
  M  tools/maintainer/sync-all

=== modified file 'Makefile.am'
--- Makefile.am 2010-05-25 20:40:17 +0000
+++ Makefile.am 2010-05-26 13:09:00 +0000
@@ -223,7 +223,7 @@
 clean-local:
        rm -rf doc/doxy
 
-deb increl rpm syncrepo:
+bin deb increl rpm syncrepo:
        env PYEXECDIR=$(pyexecdir) @srcdir@/packaging/create-package.sh $@
 
 autotools-clean: maintainer-clean
@@ -249,4 +249,4 @@
 dist-hook:
        rm -f $(distdir)/doc/Doxyfile
 
-.PHONY: checkheaders deb doxygen increl rpm syncrepo
+.PHONY: bin checkheaders deb doxygen increl rpm syncrepo

=== modified file 'doc/HACKING'
--- doc/HACKING 2010-05-22 12:37:40 +0000
+++ doc/HACKING 2010-05-26 13:09:00 +0000
@@ -1013,7 +1013,7 @@
 * make increl
 
 Create binaries and synchronise to repository:
-* make deb rpm syncrepo
+* make bin syncrepo
 
 Fedora Client-side Configuration
 --------------------------------

=== modified file 'packaging/create-package.sh'
--- packaging/create-package.sh 2010-05-25 20:40:17 +0000
+++ packaging/create-package.sh 2010-05-26 13:09:00 +0000
@@ -20,6 +20,7 @@
 DISTRO_PKG_SUFFIX=
 REPO_SERVER=hipl.infrahip.net
 REPO_BASE=/var/www/packages/html
+BIN_FORMAT=
 TARBALL=
 RSYNC_OPTS=-uvr
 REPO_USER=hipl
@@ -180,6 +181,14 @@
 if test x"$1" = x"syncrepo"; then
     syncrepo
     exit
+elif test x"$1" = x"bin"; then
+    if test x"$DISTROBASE" = x"redhat"; then
+        BIN_FORMAT=rpm
+    elif test x"$DISTROBASE" = x"debian"; then
+        BIN_FORMAT=deb
+    else
+        die "Unknown distro"
+    fi
 fi
 echo "Architecture: $ARCH"
 
@@ -198,8 +207,10 @@
 echo "*** Cleaning up ${DEBDIR} ***"
 rm -rf ${DEBDIR}
 
-if test x"$1" = x"rpm"; then
+if test x"$1" = x"rpm" || test x"$BIN_FORMAT" = x"rpm"; then
     build_rpm
-elif test x"$1" = x"deb"; then
+elif test x"$1" = x"deb" || test x"$BIN_FORMAT" = x"deb"; then
     build_deb
+else
+    die "*** Unknown platform, aborting ***"
 fi

=== modified file 'tools/maintainer/sync-all'
--- tools/maintainer/sync-all   2010-05-09 13:09:02 +0000
+++ tools/maintainer/sync-all   2010-05-26 13:09:00 +0000
@@ -22,7 +22,7 @@
 cd main &&
 autoreconf --install &&
 ./configure &&
-make deb rpm syncrepo"
+make bin syncrepo"
 
 #set -e
[hipl-commit] [trunk] Rev 4591: Revert r4478 and restore 'make bin' target.

Other related posts:
