From 6eb29ddb6f51b0df25923e714e1527ea5c8d6bf5 Mon Sep 17 00:00:00 2001 From: DRC Date: Fri, 20 Sep 2013 01:11:40 +0000 Subject: [PATCH 1/2] Oops. We need to delete the new copy of turbojpeg.dll in the binary directory. Also add quotes to InstDir to allow installing under "c:\Program Files\", and remove unnecessary quotes in the Delete directives. git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@1028 632fc199-4ca6-4c93-a231-07263d6284db --- release/libjpeg-turbo.nsi.in | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/release/libjpeg-turbo.nsi.in b/release/libjpeg-turbo.nsi.in index 0514565c..4f653037 100755 --- a/release/libjpeg-turbo.nsi.in +++ b/release/libjpeg-turbo.nsi.in @@ -1,7 +1,7 @@ !include x64.nsh Name "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@" OutFile "@CMAKE_BINARY_DIR@\${BUILDDIR}@INST_NAME@.exe" -InstallDir @INST_DIR@ +InstallDir "@INST_DIR@" SetCompressor bzip2 @@ -111,13 +111,15 @@ Section "Uninstall" !ifdef GCC Delete $INSTDIR\bin\libjpeg-@DLL_VERSION@.dll Delete $SYSDIR\libturbojpeg.dll - Delete $INSTDIR\lib\libturbojpeg.dll.a" - Delete $INSTDIR\lib\libturbojpeg.a" - Delete $INSTDIR\lib\libjpeg.dll.a" - Delete $INSTDIR\lib\libjpeg.a" + Delete $INSTDIR\bin\libturbojpeg.dll + Delete $INSTDIR\lib\libturbojpeg.dll.a + Delete $INSTDIR\lib\libturbojpeg.a + Delete $INSTDIR\lib\libjpeg.dll.a + Delete $INSTDIR\lib\libjpeg.a !else Delete $INSTDIR\bin\jpeg@DLL_VERSION@.dll Delete $SYSDIR\turbojpeg.dll + Delete $INSTDIR\bin\turbojpeg.dll Delete $INSTDIR\lib\jpeg.lib Delete $INSTDIR\lib\jpeg-static.lib Delete $INSTDIR\lib\turbojpeg.lib @@ -132,11 +134,11 @@ Section "Uninstall" Delete $INSTDIR\bin\tjbench.exe Delete $INSTDIR\bin\rdjpgcom.exe Delete $INSTDIR\bin\wrjpgcom.exe - Delete $INSTDIR\include\jconfig.h" - Delete $INSTDIR\include\jerror.h" - Delete $INSTDIR\include\jmorecfg.h" - Delete $INSTDIR\include\jpeglib.h" - Delete $INSTDIR\include\turbojpeg.h" + Delete $INSTDIR\include\jconfig.h + Delete $INSTDIR\include\jerror.h + Delete $INSTDIR\include\jmorecfg.h + Delete $INSTDIR\include\jpeglib.h + Delete $INSTDIR\include\turbojpeg.h Delete $INSTDIR\uninstall_@VERSION@.exe Delete $INSTDIR\doc\README Delete $INSTDIR\doc\README-turbo.txt From 24f11a73f2c71bdc321d8ac5252273915d18b198 Mon Sep 17 00:00:00 2001 From: DRC Date: Mon, 23 Sep 2013 18:38:20 +0000 Subject: [PATCH 2/2] The connect.apple.com alias has apparently been down for about a month git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@1030 632fc199-4ca6-4c93-a231-07263d6284db --- BUILDING.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BUILDING.txt b/BUILDING.txt index 29672fde..e8298a58 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -53,9 +53,9 @@ Build Requirements required. Some systems, such as OS X 10.4, Solaris 10 and later, and Red Hat Enterprise Linux 5 and later, have this pre-installed. On OS X 10.5 and later, it will be necessary to install the Java Developer Package, which can - be downloaded from http://connect.apple.com. For systems that do not have a - JDK installed, you can obtain the Oracle Java Development Kit from - http://www.java.com. + be downloaded from http://developer.apple.com/downloads (Apple ID required.) + For systems that do not have a JDK installed, you can obtain the Oracle Java + Development Kit from http://www.java.com. ==================