From: DRC Date: Sat, 10 Dec 2016 15:10:57 +0000 (-0600) Subject: Packaging system: "PACKAGE_NAME" = "PKGNAME" X-Git-Tag: 1.5.90~82 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=11426a871623a6c2c868619eafcf1753ba2bce77;p=libjpeg-turbo Packaging system: "PACKAGE_NAME" = "PKGNAME" Using PACKAGE_NAME as a variable name made more sense with autotools, but now it's more of an inconvenience variable than a convenience variable. --- diff --git a/release/makecygwinpkg.in b/release/makecygwinpkg.in index fb0a5e6..b7f353e 100755 --- a/release/makecygwinpkg.in +++ b/release/makecygwinpkg.in @@ -41,7 +41,7 @@ safedirmove () return 0 } -PACKAGE_NAME=@PKGNAME@ +PKGNAME=@PKGNAME@ VERSION=@VERSION@ BUILD=@BUILD@ @@ -50,16 +50,16 @@ DOCDIR=@CMAKE_INSTALL_FULL_DOCDIR@ LIBDIR=@CMAKE_INSTALL_FULL_LIBDIR@ umask 022 -rm -f $PACKAGE_NAME-$VERSION-$BUILD.tar.bz2 +rm -f $PKGNAME-$VERSION-$BUILD.tar.bz2 TMPDIR=`mktemp -d /tmp/ljtbuild.XXXXXX` __PWD=`pwd` make install DESTDIR=$TMPDIR/pkg if [ "$PREFIX" = "@CMAKE_INSTALL_DEFAULT_PREFIX@" -a "$DOCDIR" = "@CMAKE_INSTALL_DEFAULT_PREFIX@/doc" ]; then - safedirmove $TMPDIR/pkg$DOCDIR $TMPDIR/pkg/usr/share/doc/$PACKAGE_NAME-$VERSION $TMPDIR/__tmpdoc - ln -fs /usr/share/doc/$PACKAGE_NAME-$VERSION $TMPDIR/pkg$DOCDIR + safedirmove $TMPDIR/pkg$DOCDIR $TMPDIR/pkg/usr/share/doc/$PKGNAME-$VERSION $TMPDIR/__tmpdoc + ln -fs /usr/share/doc/$PKGNAME-$VERSION $TMPDIR/pkg$DOCDIR fi cd $TMPDIR/pkg -tar cfj ../$PACKAGE_NAME-$VERSION-$BUILD.tar.bz2 * +tar cfj ../$PKGNAME-$VERSION-$BUILD.tar.bz2 * cd $__PWD mv $TMPDIR/*.tar.bz2 . diff --git a/release/makedpkg.in b/release/makedpkg.in index 47d5050..77836dd 100644 --- a/release/makedpkg.in +++ b/release/makedpkg.in @@ -50,16 +50,16 @@ safedirmove () makedeb() { SUPPLEMENT=$1 - DIRNAME=$PACKAGE_NAME + DIRNAME=$PKGNAME if [ $SUPPLEMENT = 1 ]; then - PACKAGE_NAME=$PACKAGE_NAME\32 + PKGNAME=$PKGNAME\32 DEBARCH=amd64 fi umask 022 - rm -f $PACKAGE_NAME\_$VERSION\_$DEBARCH.deb - TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX` + rm -f $PKGNAME\_$VERSION\_$DEBARCH.deb + TMPDIR=`mktemp -d /tmp/$PKGNAME-build.XXXXXX` mkdir $TMPDIR/DEBIAN if [ $SUPPLEMENT = 1 ]; then @@ -77,23 +77,23 @@ makedeb() else make install DESTDIR=$TMPDIR if [ "$PREFIX" = "@CMAKE_INSTALL_DEFAULT_PREFIX@" -a "$DOCDIR" = "@CMAKE_INSTALL_DEFAULT_PREFIX@/doc" ]; then - safedirmove $TMPDIR/$DOCDIR $TMPDIR/usr/share/doc/$PACKAGE_NAME-$VERSION $TMPDIR/__tmpdoc + safedirmove $TMPDIR/$DOCDIR $TMPDIR/usr/share/doc/$PKGNAME-$VERSION $TMPDIR/__tmpdoc ln -fs /usr/share/doc/$DIRNAME-$VERSION $TMPDIR$DOCDIR fi fi SIZE=`du -s $TMPDIR | cut -f1` - (cat pkgscripts/deb-control | sed s/{__PKGNAME}/$PACKAGE_NAME/g \ + (cat pkgscripts/deb-control | sed s/{__PKGNAME}/$PKGNAME/g \ | sed s/{__ARCH}/$DEBARCH/g | sed s/{__SIZE}/$SIZE/g \ > $TMPDIR/DEBIAN/control) /sbin/ldconfig -n $TMPDIR$LIBDIR $SUDO chown -Rh root:root $TMPDIR/* - dpkg -b $TMPDIR $PACKAGE_NAME\_$VERSION\_$DEBARCH.deb + dpkg -b $TMPDIR $PKGNAME\_$VERSION\_$DEBARCH.deb } -PACKAGE_NAME=@PKGNAME@ +PKGNAME=@PKGNAME@ VERSION=@VERSION@ DEBARCH=@DEBARCH@ PREFIX=@CMAKE_INSTALL_PREFIX@ diff --git a/release/makemacpkg.in b/release/makemacpkg.in index 1811180..b0a2e23 100644 --- a/release/makemacpkg.in +++ b/release/makemacpkg.in @@ -49,7 +49,7 @@ usage() UNIVERSAL=0 -PACKAGE_NAME=@PKGNAME@ +PKGNAME=@PKGNAME@ VERSION=@VERSION@ BUILD=@BUILD@ SRCDIR=@CMAKE_CURRENT_SOURCE_DIR@ @@ -87,12 +87,12 @@ while [ $# -gt 0 ]; do shift done -if [ -f $PACKAGE_NAME-$VERSION.dmg ]; then - rm -f $PACKAGE_NAME-$VERSION.dmg +if [ -f $PKGNAME-$VERSION.dmg ]; then + rm -f $PKGNAME-$VERSION.dmg fi umask 022 -TMPDIR=`mktemp -d /tmp/$PACKAGE_NAME-build.XXXXXX` +TMPDIR=`mktemp -d /tmp/$PKGNAME-build.XXXXXX` PKGROOT=$TMPDIR/pkg/Package_Root mkdir -p $PKGROOT @@ -100,8 +100,8 @@ make install DESTDIR=$PKGROOT if [ "$PREFIX" = "@CMAKE_INSTALL_DEFAULT_PREFIX@" -a "$DOCDIR" = "@CMAKE_INSTALL_DEFAULT_PREFIX@/doc" ]; then mkdir -p $PKGROOT/Library/Documentation - safedirmove $PKGROOT$DOCDIR $PKGROOT/Library/Documentation/$PACKAGE_NAME $TMPDIR/__tmpdoc - ln -fs /Library/Documentation/$PACKAGE_NAME $PKGROOT$DOCDIR + safedirmove $PKGROOT$DOCDIR $PKGROOT/Library/Documentation/$PKGNAME $TMPDIR/__tmpdoc + ln -fs /Library/Documentation/$PKGNAME $PKGROOT$DOCDIR fi if [ $UNIVERSAL = 1 -a "$BUILDDIR32" != "" ]; then @@ -257,12 +257,12 @@ cp $SRCDIR/release/License.rtf $SRCDIR/release/Welcome.rtf $SRCDIR/release/ReadM mkdir $TMPDIR/dmg pkgbuild --root $PKGROOT --version $VERSION.$BUILD --identifier @PKGID@ \ - $TMPDIR/pkg/$PACKAGE_NAME.pkg + $TMPDIR/pkg/$PKGNAME.pkg productbuild --distribution pkgscripts/Distribution.xml \ --package-path $TMPDIR/pkg/ --resources $TMPDIR/pkg/ \ - $TMPDIR/dmg/$PACKAGE_NAME.pkg -hdiutil create -fs HFS+ -volname $PACKAGE_NAME-$VERSION \ - -srcfolder "$TMPDIR/dmg" $TMPDIR/$PACKAGE_NAME-$VERSION.dmg -cp $TMPDIR/$PACKAGE_NAME-$VERSION.dmg . + $TMPDIR/dmg/$PKGNAME.pkg +hdiutil create -fs HFS+ -volname $PKGNAME-$VERSION \ + -srcfolder "$TMPDIR/dmg" $TMPDIR/$PKGNAME-$VERSION.dmg +cp $TMPDIR/$PKGNAME-$VERSION.dmg . exit diff --git a/release/uninstall.in b/release/uninstall.in index 283a515..cf1ba77 100644 --- a/release/uninstall.in +++ b/release/uninstall.in @@ -31,15 +31,15 @@ if [ ! "`id -u`" = "0" ]; then exit -1 fi -PACKAGE=@PKGNAME@ -MACPACKAGE=@PKGID@ -RECEIPT=/Library/Receipts/$PACKAGE.pkg +PKGNAME=@PKGNAME@ +PKGID=@PKGID@ +RECEIPT=/Library/Receipts/$PKGNAME.pkg LSBOM= if [ -d $RECEIPT ]; then LSBOM='lsbom -s -f -l '$RECEIPT'/Contents/Archive.bom' else - LSBOM='pkgutil --files '$MACPACKAGE + LSBOM='pkgutil --files '$PKGID fi mylsbom() @@ -100,14 +100,14 @@ if [ "$PREFIX" = "@CMAKE_INSTALL_DEFAULT_PREFIX@" -a -h "$PREFIX/doc" ]; then rm $PREFIX/doc 2>&1 || EXITSTATUS=-1 fi rmdir $PREFIX 2>&1 || EXITSTATUS=-1 -rmdir /Library/Documentation/$PACKAGE 2>&1 || EXITSTATUS=-1 +rmdir /Library/Documentation/$PKGNAME 2>&1 || EXITSTATUS=-1 if [ -d $RECEIPT ]; then echo Removing package receipt ... rm -r $RECEIPT 2>&1 || EXITSTATUS=-1 else - echo Forgetting package $MACPACKAGE ... - pkgutil --forget $MACPACKAGE + echo Forgetting package $PKGID ... + pkgutil --forget $PKGID fi exit $EXITSTATUS