diff options
| author | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2011-04-01 00:20:33 +0000 |
|---|---|---|
| committer | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2011-04-01 00:20:33 +0000 |
| commit | 7afed05a489549bd675c88d07c3141caf369c7bb (patch) | |
| tree | 46bc54e3d9675bf6819905f663baa935d455fc24 /release | |
| parent | cddc532e9a192bd9cb523ae194699c5bb41297c9 (diff) | |
Build and package TurboJPEG/OSS Java wrapper into JAR file
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@549 632fc199-4ca6-4c93-a231-07263d6284db
Diffstat (limited to 'release')
| -rw-r--r-- | release/libjpeg-turbo.spec.in | 2 | ||||
| -rw-r--r-- | release/makemacpkg.in | 4 | ||||
| -rw-r--r-- | release/makesunpkg.in | 5 | ||||
| -rw-r--r-- | release/uninstall.in | 3 |
4 files changed, 12 insertions, 2 deletions
diff --git a/release/libjpeg-turbo.spec.in b/release/libjpeg-turbo.spec.in index c21eef8..73afb64 100644 --- a/release/libjpeg-turbo.spec.in +++ b/release/libjpeg-turbo.spec.in @@ -104,5 +104,7 @@ rm -rf $RPM_BUILD_ROOT /opt/%{name}/man/man1/jpegtran.1* /opt/%{name}/man/man1/rdjpgcom.1* /opt/%{name}/man/man1/wrjpgcom.1* +@JAVA_RPM_CONTENTS_1@ +@JAVA_RPM_CONTENTS_2@ %changelog diff --git a/release/makemacpkg.in b/release/makemacpkg.in index a937188..6cd13c3 100644 --- a/release/makemacpkg.in +++ b/release/makemacpkg.in @@ -28,7 +28,7 @@ VERSION=@VERSION@ BUILD=@BUILD@ SRCDIR=@abs_top_srcdir@ BUILDDIR32=@abs_top_srcdir@/osxx86 -BUILDJNILIB=@BUILDJNILIB@ +WITH_JAVA=@WITH_JAVA@ if [ $# -gt 0 ]; then if [ "$1" = "universal" ]; then UNIVERSAL=1 @@ -123,7 +123,7 @@ install_name_tool -id libturbojpeg.dylib $PKGROOT/usr/lib/libturbojpeg.dylib ln -fs /usr/include/turbojpeg.h $PKGROOT/opt/$PACKAGE_NAME/include/ ln -fs /usr/lib/libturbojpeg.a $PKGROOT/opt/$PACKAGE_NAME/lib/ -if [ $BUILDJNILIB = 1 ]; then +if [ $WITH_JAVA = 1 ]; then ln -fs libturbojpeg.dylib $PKGROOT/usr/lib/libturbojpeg.jnilib fi if [ ! -h $PKGROOT/opt/$PACKAGE_NAME/lib32 ]; then diff --git a/release/makesunpkg.in b/release/makesunpkg.in index aa2e735..2745d15 100644 --- a/release/makesunpkg.in +++ b/release/makesunpkg.in @@ -29,6 +29,7 @@ BUILD=@BUILD@ PKGARCH=@DEBARCH@ SRCDIR=@abs_top_srcdir@ BUILDDIR32=@abs_top_srcdir@/solx86 +WITH_JAVA=@WITH_JAVA@ if [ $# -gt 0 ]; then if [ "$1" = "combined" ]; then COMBINED=1 @@ -128,6 +129,10 @@ f none $PACKAGE_NAME/doc/README 0644 root bin f none $PACKAGE_NAME/doc/README-turbo.txt 0644 root bin f none $PACKAGE_NAME/doc/usage.txt 0644 root bin EOF +if [ $WITH_JAVA = 1 ]; then +echo d none $PACKAGE_NAME/classes 0755 root bin >>$TMPDIR/proto +echo f none $PACKAGE_NAME/classes/turbojpeg.jar 0644 root bin >>$TMPDIR/proto +fi pkgmk -o -r $TMPDIR/opt -d $TMPDIR -a i386 -f $TMPDIR/proto pkgtrans -s $TMPDIR $TMPDIR/$PACKAGE_NAME-$VERSION.pkg $PACKAGE_NAME diff --git a/release/uninstall.in b/release/uninstall.in index 94fc4f1..67b2a3e 100644 --- a/release/uninstall.in +++ b/release/uninstall.in @@ -63,6 +63,9 @@ fi if [ -d /opt/$PKGNAME/man ]; then rmdir /opt/$PKGNAME/man 2>&1 || RETCODE=-1 fi +if [ -d /opt/$PKGNAME/classes ]; then + rmdir /opt/$PKGNAME/classes 2>&1 || RETCODE=-1 +fi rmdir /opt/$PKGNAME 2>&1 || RETCODE=-1 rmdir /Library/Documentation/$PKGNAME 2>&1 || RETCODE=-1 |