2003-12-29 Pierre-Luc Paour <gallery@paour.com> (1.3-b13)

	* Reorganized the Mac build so that jpegtran.properties and
	  im.properties are readily editable in the application
	  bundle, similar to the Windows version.
	* Fixed Mac release URL in auto build system.
	* These changes forward-ported from 1.2.1-b6

ChangeLog

@@ -1,3 +1,11 @@
+2003-12-29  Pierre-Luc Paour <gallery@paour.com> (1.3-b13)
+
+	* Reorganized the Mac build so that jpegtran.properties and
+	  im.properties are readily editable in the application
+	  bundle, similar to the Windows version.
+	* Fixed Mac release URL in auto build system.
+	* These changes forward-ported from 1.2.1-b6
+
 2003-12-28  Pierre-Luc Paour <gallery@paour.com> (1.3-b12)
 
 	* MacOS Build now finds jpegtran even if application is renamed.

build.xml

@@ -13,10 +13,6 @@
 	<property name="docdist" location="${docbase}/dist/grpackage"/>
 	<property name="iafolder" location="G:\\Program Files\\InstallAnywhere 6 Enterprise"/>
 
-	<taskdef name="jarbundler"
-		classpath="${lib}/jarbundler-0.3.jar"
-		classname="com.loomcom.ant.tasks.jarbundler.JarBundler"/>
-
 	<target name="init">
 		<!-- Create the time stamp -->
 		<tstamp/>
@@ -69,7 +65,7 @@
 			<manifest>
 				<attribute name="Built-By" value="${user.name}"/>
 				<attribute name="Main-Class" value="com.gallery.GalleryRemote.GalleryRemote"/>
-				<attribute name="Class-Path" value="lib/metadata-extractor-2.1.jar lib/JSX1.0.7.4.jar img/"/>
+				<attribute name="Class-Path" value="${lib}/metadata-extractor-2.1.jar ${lib}/JSX1.0.7.4.jar img/"/>
 			</manifest>
 		</jar>
 	</target>
@@ -136,21 +132,21 @@
 		</exec>
 	</target>
 
-	<target name="mac_img_jar"
-		description="create a jar of the images for Mac build">
+	<target name="img_jar"
+		description="create a jar of the images">
 
-		<copy file="imagemagick/macos/im.properties" tofile="${img}/im.properties"/>
-		<copy file="jpegtran/macos/jpegtran.properties" tofile="${img}/jpegtran.properties"/>
+		<!--copy file="imagemagick/macos/im.properties" tofile="${img}/im.properties"/>
+		<copy file="jpegtran/macos/jpegtran.properties" tofile="${img}/jpegtran.properties"/-->
 
 		<jar destfile="img.jar">
 			<fileset dir="${img}"/>
 		</jar>
 
-		<delete file="${img}/im.properties"/>
-		<delete file="${img}/jpegtran.properties"/>
+		<!--delete file="${img}/im.properties"/>
+		<delete file="${img}/jpegtran.properties"/-->
 	</target>
 
-	<target name="installer_macosx" depends="jar, mac_img_jar, docs"
+	<target name="executable_macosx" depends="jar, img_jar"
 		description="Build a MacOSX executable">
 		<!--target name="installer_macosx"
 			description="Build a MacOSX executable"-->
@@ -159,19 +155,31 @@
 
 		<loadproperties srcfile="defaults.properties"/>
 
+		<taskdef name="jarbundler"
+			classpath="${lib}/jarbundler.jar"
+			classname="com.loomcom.ant.tasks.jarbundler.JarBundler"/>
+
 		<jarbundler dir="."
 			name="Gallery Remote"
 			mainclass="com.gallery.GalleryRemote.GalleryRemote"
 			icon="rar_icon_128_gr1.icns"
 			jars="./GalleryRemote.jar ${lib}/JSX1.0.7.4.jar ${lib}/metadata-extractor-2.1.jar ./img.jar"
 			execs="./jpegtran/macos/jpegtran"
 			stubfile="${lib}/JavaApplicationStub"
-			workingdirectory="$APP_PACKAGE"
+ 			workingdirectory="$APP_PACKAGE"
 			version="${version}"
 			infostring="Gallery Remote ${version}, (c) 2003"
 			aboutmenuname="Gallery Remote"
 			jvmversion="1.3+"/>
 
+
+		<copy file="imagemagick/macos/im.properties" tofile="Gallery Remote.app/imagemagick/im.properties" />
+		<copy file="jpegtran/macos/jpegtran.properties" tofile="Gallery Remote.app/jpegtran/jpegtran.properties" />
+	</target>
+
+	<target name="installer_macosx" depends="executable_macosx, docs"
+		description="Build a MacOSX package">
+
 		<tar destfile="GalleryRemote.${version}.MacOSX.NoVM.tgz" compression="gzip">
 			<tarfileset dir="." prefix="Gallery Remote">
 				<include name="Gallery Remote.app/**"/>
@@ -182,12 +190,6 @@
 				mode="777">
 				<include name="*"/>
 			</tarfileset>
-			<!--tarfileset dir="imagemagick" fullpath="Gallery Remote/imagemagick/im.properties">
-				<include name="im.properties.preinstalled" />
-			</tarfileset>
-			<tarfileset dir="jpegtran" fullpath="Gallery Remote/jpegtran/jpegtran.properties">
-				<include name="jpegtran.preinstalled" />
-			</tarfileset-->
 			<tarfileset dir="${docdist}" prefix="Gallery Remote/Documentation">
 				<include name="*"/>
 			</tarfileset>
@@ -216,6 +218,4 @@
 
 		<postchangelog/>
 	</target>
-</project>
-
-
+</project>

com/gallery/GalleryRemote/util/PostChangeLog.java

@@ -101,7 +101,7 @@ public void execute() throws BuildException {
 			betaCheck.append("version=").append(currentBuildS).append("\n");
 			betaCheck.append("releaseDate=").append(defaultProps.getProperty("releaseDate")).append("\n");
 			betaCheck.append("releaseUrl=http://jpmullan.com/galleryupdates/remote/gallery_remote_").append(defaultProps.getProperty("version")).append(".zip\n");
-			betaCheck.append("releaseUrlMac=http://jpmullan.com/galleryupdates/remote/GalleryRemote.").append(defaultProps.getProperty("version")).append("MacOSX.NoVM.tgz\n");
+			betaCheck.append("releaseUrlMac=http://jpmullan.com/galleryupdates/remote/GalleryRemote.").append(defaultProps.getProperty("version")).append(".MacOSX.NoVM.tgz\n");
 			betaCheck.append("releaseNotes=").append(changes);
 
 			// update Menalto

defaults.properties

@@ -145,6 +145,6 @@ updateUrlBeta=http://gallery.sourceforge.net/gallery_remote_version_check_beta.p
 #
 # --- Do not edit below this line ---
 #
-version=1.3-b12
-releaseDate=2003/12/28
+version=1.3-b13
+releaseDate=2003/12/29
 aboutText=Gallery Remote\n \n \nA part of the Gallery Open-Source Project\nhttp://gallery.sourceforge.net\n \n \nMaintained by:\n \nPierre-Luc Paour\nAmedeo Paglione\nChris Schwerdt\n \n \nInitial version by Chris Smith\n \n \nContributors:\n \nTim Miller\nDolan Halbrook\nMarkus Cozowicz\nScott Gartner\n \n \nArtwork by Ross A. Reyman\n \n \nBundled software:\n \nImageMagick\nJSX\nJava look and feel Graphics Repository icons\njpegtran, Guido Vollbeding's version\nMetadataExtractor