[gentoo-commits] gentoo-alt r1616 - trunk/aix-miscutils

[Michael Haubenwallner (haubi)]

Author: haubi
Date: 2008-04-14 11:44:55 +0000 (Mon, 14 Apr 2008)
New Revision: 1616

Added:
   trunk/aix-miscutils/Makefile.am
   trunk/aix-miscutils/bootstrap
   trunk/aix-miscutils/configure.ac
   trunk/aix-miscutils/ldd/
Removed:
   trunk/aix-miscutils/trunk/
Log:
ohw, dropped duplicate /trunk/ subdir.


Copied: trunk/aix-miscutils/Makefile.am (from rev 1615, trunk/aix-miscutils/trunk/Makefile.am)
===================================================================
--- trunk/aix-miscutils/Makefile.am	                        (rev 0)
+++ trunk/aix-miscutils/Makefile.am	2008-04-14 11:44:55 UTC (rev 1616)
@@ -0,0 +1 @@
+SUBDIRS = ldd

Copied: trunk/aix-miscutils/bootstrap (from rev 1615, trunk/aix-miscutils/trunk/bootstrap)
===================================================================
--- trunk/aix-miscutils/bootstrap	                        (rev 0)
+++ trunk/aix-miscutils/bootstrap	2008-04-14 11:44:55 UTC (rev 1616)
@@ -0,0 +1,100 @@
+#! /bin/sh
+# Copyright 2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# Author: Michael Haubenwallner <haubi@g.o>
+
+set -e
+
+versioning_done=no
+
+while [ "x$1" != x ]; do
+	arg=$1
+	shift
+	case "x${arg}" in
+	x--version=*)
+		echo "x${arg}" | sed -e 's,^x--version=,,' > version
+		versioning_done=yes
+		;;
+	esac
+done
+svnurl='$HeadURL: svn+ssh://haubi@××××××××××.org/var/svnroot/gentoo-alt/trunk/aix-miscutils/bootstrap $'
+
+mainversion=`grep 'AC_INIT(aix-miscutils,[0-9\.]*svnversion)' configure.ac | sed -e 's/.*([^,]*,\([^),]*\)\.svnversion\>.*)/\1/'`
+if [ "x${mainversion}" != x ]; then
+	# configure.ac indicates to define the package-version automagically
+	if [ "x${versioning_done}" != xyes ] && [ -d .svn ] ; then
+		# we are in an svn sandbox:
+		# then we need to determine the version out of svn keyword 'HeadURL'.
+		case "${svnurl}" in
+		*'/trunk/'*)
+			# is snapshot from trunk:
+			# version is mainversion + '.' + [last-committed] svn revision
+			svn status -v | cut -c19-26 | sort -rn | { read v ; echo "${mainversion}.${v}" ;} > version
+			versioning_done=yes
+			;;
+		*'/branches/'*)
+			# is snapshot from branch:
+			# version is branch-number + '.' + [last-committed] svn revision
+			(	echo -n "${svnurl}" \
+				| sed -e "s,-branch/bootstrap \\\$,,; s,.*/,," -e "s,^.*-,,"
+				svn status -v | cut -c19-26 | sort -rn | { read v ; echo ".${v}" ;}
+			) > version
+			versioning_done=yes
+			;;
+		esac
+	fi
+	if [ "x${versioning_done}" != xyes ]; then
+		case "${svnurl}" in
+		*'/tags/'*)
+			# is tag: version is tag number
+			(	echo "${svnurl}" \
+				| sed -e "s,/bootstrap \\\$,,; s,.*-,,"
+			) > version
+			versioning_done=yes
+			;;
+		*)
+			if [ -r version ]; then
+				# we reuse the 'version' determined during packaging from svn.
+				versioning_done=yes
+			fi
+			;;
+		esac
+	fi
+	if [ "x${versioning_done}" != xyes ]; then
+		echo "error: no 'version' file and unknown svnurl '${svnurl}'" >&2
+		echo "error: cannot determine package version" >&2
+		exit 1
+	fi
+else
+	# configure.ac defines the version, keep 'version' empty.
+	: > version
+fi
+set +x
+
+echo "mkdir -p m4 build-aux"
+      mkdir -p m4 build-aux
+#echo "aclocal -I m4 --install"
+#      aclocal -I m4 --install
+echo "aclocal"
+      aclocal
+#echo "autoheader"
+#      autoheader
+echo "automake --add-missing --copy --foreign"
+      automake --add-missing --copy --foreign
+echo "autoconf"
+      autoconf
+
+if [ -s version ]; then
+	version=`cat version`
+	eval `grep '^PACKAGE_VERSION=' configure | head -n 1`
+	if [ "${version}" != "${PACKAGE_VERSION}" ]; then
+		(
+			echo '--- configure'
+			echo '+++ configure'
+			grep "\<${PACKAGE_VERSION}\>" configure \
+			| awk '{print "@@ -1,1 +1,1 @@"; print "-" $0; print "+" $0}' \
+			| sed -e "s|\(^+.*\)\<${PACKAGE_VERSION}\>|\1${version}|"
+		) | patch --no-backup-if-mismatch configure -
+	fi
+fi
+

Copied: trunk/aix-miscutils/configure.ac (from rev 1615, trunk/aix-miscutils/trunk/configure.ac)
===================================================================
--- trunk/aix-miscutils/configure.ac	                        (rev 0)
+++ trunk/aix-miscutils/configure.ac	2008-04-14 11:44:55 UTC (rev 1616)
@@ -0,0 +1,9 @@
+AC_INIT(aix-miscutils,0.1.svnversion)
+AC_CONFIG_AUX_DIR([build-aux])
+AC_PROG_INSTALL
+AC_CONFIG_SRCDIR(ldd/ldd)
+AC_PREREQ(2.52)
+AC_CANONICAL_HOST
+AM_INIT_AUTOMAKE
+AC_CONFIG_FILES(./Makefile ldd/Makefile)
+AC_OUTPUT

Copied: trunk/aix-miscutils/ldd (from rev 1615, trunk/aix-miscutils/trunk/ldd)

-- 
gentoo-commits@l.g.o mailing list