Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=a7f922d45550979798891132f5c3ab69d0cc8c52
commit a7f922d45550979798891132f5c3ab69d0cc8c52 Author: Michel Hermier <[email protected]> Date: Wed Nov 21 21:53:45 2012 +0100 scripts/makepkg * Move Changelog creation to a function. diff --git a/scripts/makepkg b/scripts/makepkg index f345db8..bfde392 100755 --- a/scripts/makepkg +++ b/scripts/makepkg @@ -519,6 +519,36 @@ buildscript_validate() { fi } +buildscript_create_changelog() { + local indir=n + + if [ "$F_makepkg_scm" = "git" ]; then + git rev-parse --git-dir &>/dev/null && indir=y + elif [ "$F_makepkg_scm" = "darcs" ]; then + darcs --commands 2>&1|grep -q add && indir=y + elif [ "$F_makepkg_scm" = "svn" ]; then + svn info $BUILDSCRIPT &>/dev/null && indir=y + fi + if [ "$indir" = "y" ]; then + if [ ! -e Changelog ] || [ `stat -c %Y Changelog|sed 's/\..*//'` -lt `stat -c %Y $BUILDSCRIPT|sed 's/\..*//'` ]; then + msg "Generating the Changelog..." + if [ "$F_makepkg_scm" = "git" ]; then + git log $BUILDSCRIPT >Changelog + elif [ "$F_makepkg_scm" = "darcs" ]; then + darcs changes $BUILDSCRIPT | \ + sed "s|\(.*\)source/\(.*\)/$BUILDSCRIPT\(.*\)|\1\2\3|;/Can't find changes prior to:/,\$d" \ + >Changelog + elif [ "$F_makepkg_scm" = "svn" ]; then + svn log $BUILDSCRIPT >Changelog + fi + if [ "`id -u`" = "0" ]; then + chown `stat -c %u:%g $BUILDSCRIPT` \ + Changelog + fi + fi + fi +} + pkg_mkdirs() { local package_name @@ -1069,31 +1099,8 @@ if [ -f $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.$PKG_EXT -a "$FORCE" = fi # Generate the Changelog if necessary. -indir=n -if [ "$F_makepkg_scm" = "git" ]; then - git rev-parse --git-dir &>/dev/null && indir=y -elif [ "$F_makepkg_scm" = "darcs" ]; then - darcs --commands 2>&1|grep -q add && indir=y -elif [ "$F_makepkg_scm" = "svn" ]; then - svn info $BUILDSCRIPT &>/dev/null && indir=y -fi -if [ "$indir" = "y" ] && [ "$GENSHA1" = "0" -a "$NOBUILD" = "0" ]; then - if [ ! -e Changelog ] || [ `stat -c %Y Changelog|sed 's/\..*//'` -lt `stat -c %Y $BUILDSCRIPT|sed 's/\..*//'` ]; then - msg "Generating the Changelog..." - if [ "$F_makepkg_scm" = "git" ]; then - git log $BUILDSCRIPT >Changelog - elif [ "$F_makepkg_scm" = "darcs" ]; then - darcs changes $BUILDSCRIPT | \ - sed "s|\(.*\)source/\(.*\)/$BUILDSCRIPT\(.*\)|\1\2\3|;/Can't find changes prior to:/,\$d" \ - >Changelog - elif [ "$F_makepkg_scm" = "svn" ]; then - svn log $BUILDSCRIPT >Changelog - fi - if [ "`id -u`" = "0" ]; then - chown `stat -c %u:%g $BUILDSCRIPT` \ - Changelog - fi - fi +if [ "$GENSHA1" = "0" -a "$NOBUILD" = "0" ]; then + buildscript_create_changelog fi # some applications (eg, blackbox) will not build with some languages unset LC_ALL LANG _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
