aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authordcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db>2011-04-01 11:13:11 +0000
committerdcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db>2011-04-01 11:13:11 +0000
commit9046404704ed28fa31f26bdf9dd4942b7788aadd (patch)
tree3fe53dedc25fc32eea0106ea4c52bc7e0268f651 /release
parentcb74f37aa832283eb7759871bb37c7580e034cb8 (diff)
Include TurboJPEG/OSS Java wrapper JAR in Windows distribution packages
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@553 632fc199-4ca6-4c93-a231-07263d6284db
Diffstat (limited to 'release')
-rwxr-xr-xrelease/libjpeg-turbo.nsi.in10
1 files changed, 10 insertions, 0 deletions
diff --git a/release/libjpeg-turbo.nsi.in b/release/libjpeg-turbo.nsi.in
index 6eb4bae..576e668 100755
--- a/release/libjpeg-turbo.nsi.in
+++ b/release/libjpeg-turbo.nsi.in
@@ -63,6 +63,10 @@ Section "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@ (required)"
File "@CMAKE_BINARY_DIR@\sharedlib\${BUILDDIR}jpeg.lib"
File "@CMAKE_BINARY_DIR@\${BUILDDIR}jpeg-static.lib"
!endif
+!ifdef JAVA
+ SetOutPath $INSTDIR\classes
+ File "@CMAKE_BINARY_DIR@\java\${BUILDDIR}turbojpeg.jar"
+!endif
SetOutPath $INSTDIR\include
File "@CMAKE_BINARY_DIR@\jconfig.h"
File "@CMAKE_SOURCE_DIR@\jerror.h"
@@ -113,6 +117,9 @@ Section "Uninstall"
Delete $INSTDIR\lib\turbojpeg.lib
Delete $INSTDIR\lib\turbojpeg-static.lib
!endif
+!ifdef JAVA
+ Delete $INSTDIR\classes\turbojpeg.jar
+!endif
Delete $INSTDIR\bin\cjpeg.exe
Delete $INSTDIR\bin\djpeg.exe
Delete $INSTDIR\bin\jpegtran.exe
@@ -135,6 +142,9 @@ Section "Uninstall"
RMDir "$INSTDIR\include"
RMDir "$INSTDIR\lib"
RMDir "$INSTDIR\doc"
+!ifdef JAVA
+ RMDir "$INSTDIR\classes"
+!endif
RMDir "$INSTDIR\bin"
RMDir "$INSTDIR"