[hipl-commit] [trunk] Rev 4478: Drop 'make bin' target; 'make deb rpm' can be used instead.
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Sun, 9 May 2010 16:09:26 +0300
Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 09/05/2010 at 16:09:26
Revision: 4478
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
Drop 'make bin' target; 'make deb rpm' can be used instead.
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-09 13:07:26 +0000
+++ Makefile.am 2010-05-09 13:09:02 +0000
@@ -443,7 +443,7 @@
clean-local:
rm -rf doc/doxy
-bin deb increl rpm syncrepo:
+deb increl rpm syncrepo:
env PYEXECDIR=$(pyexecdir) @srcdir@/packaging/create-package.sh $@
autotools-clean: maintainer-clean
@@ -475,4 +475,4 @@
dist-hook:
rm -f $(distdir)/doc/Doxyfile
-.PHONY: bin checkheaders deb doxygen increl rpm syncrepo
+.PHONY: checkheaders deb doxygen increl rpm syncrepo
=== modified file 'doc/HACKING'
--- doc/HACKING 2010-05-04 20:58:15 +0000
+++ doc/HACKING 2010-05-09 13:09:02 +0000
@@ -1041,7 +1041,7 @@
* make increl
Create binaries and synchronise to repository:
-* make bin syncrepo
+* make deb rpm syncrepo
Fedora Client-side Configuration
--------------------------------
=== modified file 'packaging/create-package.sh'
--- packaging/create-package.sh 2010-05-09 12:52:40 +0000
+++ packaging/create-package.sh 2010-05-09 13:09:02 +0000
@@ -19,7 +19,6 @@
DISTRO_PKG_SUFFIX=
REPO_SERVER=hipl.infrahip.net
REPO_BASE=/var/www/packages/html
-BIN_FORMAT=
TARBALL=
RSYNC_OPTS=-uvr
REPO_USER=hipl
@@ -190,14 +189,6 @@
elif test x"$1" = x"increl"; then
inc_release_number
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"
@@ -222,10 +213,8 @@
echo "*** Cleaning up ${DEBDIR} ***"
rm -rf ${DEBDIR}
-if test x"$1" = x"rpm" || test x"$BIN_FORMAT" = x"rpm"; then
+if test x"$1" = x"rpm"; then
build_rpm
-elif test x"$1" = x"deb" || test x"$BIN_FORMAT" = x"deb"; then
+elif test x"$1" = x"deb"; then
build_deb
-else
- die "*** Unknown platform, aborting ***"
fi
=== modified file 'tools/maintainer/sync-all'
--- tools/maintainer/sync-all 2010-03-30 14:39:09 +0000
+++ tools/maintainer/sync-all 2010-05-09 13:09:02 +0000
@@ -22,7 +22,7 @@
cd main &&
autoreconf --install &&
./configure &&
-make bin syncrepo"
+make deb rpm syncrepo"
#set -e
Other related posts:
- » [hipl-commit] [trunk] Rev 4478: Drop 'make bin' target; 'make deb rpm' can be used instead. - Diego Biurrun
