[Phex-svn] SF.net SVN: phex: [4161] phex/branches/i2phex

[<com...@us...>]

Revision: 4161
          http://phex.svn.sourceforge.net/phex/?rev=4161&view=rev
Author:   complication
Date:     2008-04-04 13:03:27 -0700 (Fri, 04 Apr 2008)

Log Message:
-----------
* Generate a .tar package too
* Runner scripts for more convenient use of .zip and .tar packages
* Use the green logo made by Arne in an attempt to avoid confusion

Modified Paths:
--------------
    phex/branches/i2phex/build/buildJava.xml
    phex/branches/i2phex/build/release.linux.xml
    phex/branches/i2phex/src/main/java/phex/resources/version.properties

Added Paths:
-----------
    phex/branches/i2phex/run.bat
    phex/branches/i2phex/run.sh

Modified: phex/branches/i2phex/build/buildJava.xml
===================================================================
--- phex/branches/i2phex/build/buildJava.xml	2008-03-29 22:33:41 UTC (rev 4160)
+++ phex/branches/i2phex/build/buildJava.xml	2008-04-04 20:03:27 UTC (rev 4161)
@@ -22,6 +22,10 @@
       	<include name="*.dtd" />
       </fileset>
     </copy>
+    <!--I2P: to avoid visual confusion, override default splash screen with a distinct one-->
+    <copy overwrite="true"
+          file="${project.root}/docs/Customize/Themes/i2phex-splash-boxstr.png"
+          tofile="${build.target.classes}/phex/resources/splash.png" />
     <!-- Sets isJUnitAvailable when the  file is in the classpath -->
     <available classname="junit.framework.TestCase" classpathref="library.classpath" property="isJUnitAvailable"/>
   </target>

Modified: phex/branches/i2phex/build/release.linux.xml
===================================================================
--- phex/branches/i2phex/build/release.linux.xml	2008-03-29 22:33:41 UTC (rev 4160)
+++ phex/branches/i2phex/build/release.linux.xml	2008-04-04 20:03:27 UTC (rev 4161)
@@ -8,10 +8,15 @@
 
 		<available file="${linux.build.dir}" property="runtime.dir.available"/>
     <fail if="runtime.dir.available"/>
-    <available file="${linux.build.dir}/phex_${phex.FullPhexVersion}.zip" property="runtime.file.available"/>
+    <available file="${linux.build.dir}/i2phex_${phex.FullPhexVersion}.zip" property="runtime.file.available"/>
     <fail if="runtime.file.available"/>
-
+		<!--create archive root directory-->
 		<mkdir dir="${linux.buildSrc.dir}" />
+		<!--I2P: copy runner scripts for both Linux and Windows-->
+		<!--lacking a cross-platform installer, we currently use Linux packages for everything-->
+		<copy file="${project.root}/run.sh" todir="${linux.buildSrc.dir}" />
+        <copy file="${project.root}/run.bat" todir="${linux.buildSrc.dir}" />
+		<!--create directory for libraries-->
 		<mkdir dir="${linux.buildSrc.libDir}" />
 		<!--copy all librarys-->
 		<copy file="${apache.logging.lib}/commons-logging.jar" todir="${linux.buildSrc.libDir}" />
@@ -42,12 +47,37 @@
 		</copy>
 		<!-- copy subscription file in case user requested -->
 		<ant antfile="${project.build}/makeRelease.xml" target="-copySubscriptionFile" inheritAll="true">
-  		<property name="subscriptionDir" value="${linux.buildSrc.dir}/ext"/>
-  	</ant>
+			<property name="subscriptionDir" value="${linux.buildSrc.dir}/ext"/>
+		</ant>
 
 		<!-- zip it all -->
-		<zip zipfile="${linux.build.dir}/phex_${phex.FullPhexVersion}.zip" update="false">
-			<zipfileset dir="${linux.buildSrc.dir}" prefix="phex_${phex.FullPhexVersion}" />
+		<!--I2P: use a different name for the I2Phex .zip archive-->
+		<zip zipfile="${linux.build.dir}/i2phex_${phex.FullPhexVersion}.zip" update="false">
+			<zipfileset dir="${linux.buildSrc.dir}" prefix="phex_${phex.FullPhexVersion}">
+				<include name="*/*"/>
+				<exclude name="run.*"/>
+			</zipfileset>
+			<!--I2P: add runner scripts as a separate fileset-->
+			<!--lacking a cross-platform installer, we currently use Linux packages for everything-->
+			<zipfileset dir="${linux.buildSrc.dir}" prefix="phex_${phex.FullPhexVersion}">
+				<include name="run.*"/>
+			</zipfileset>
 		</zip>
+
+		<!-- tar it all too (.zip doesn't support file attributes)-->
+		<!--I2P: use a different name for the I2Phex .tar archive-->
+		<tar compression="gzip" destfile="${linux.build.dir}/i2phex_${phex.FullPhexVersion}.tgz">
+			<tarfileset dir="${linux.buildSrc.dir}" prefix="phex_${phex.FullPhexVersion}">
+				<include name="*/*"/>
+				<exclude name="run.*"/>
+			</tarfileset>
+			<!--I2P: add runner scripts as a separate fileset-->
+			<!--lacking a cross-platform installer, we currently use Linux packages for everything-->
+			<!--while building the .tar archive, make runner scripts executable-->
+			<tarfileset dir="${linux.buildSrc.dir}" prefix="phex_${phex.FullPhexVersion}" mode="755">
+				<include name="run.*"/>
+			</tarfileset>
+		</tar>
+
 	</target>
 </project>
\ No newline at end of file

Added: phex/branches/i2phex/run.bat
===================================================================
--- phex/branches/i2phex/run.bat	                        (rev 0)
+++ phex/branches/i2phex/run.bat	2008-04-04 20:03:27 UTC (rev 4161)
@@ -0,0 +1,15 @@
+REM Startup script for I2Phex
+REM Adapt the variable below to pass various options to Java.
+
+REM We definitely want the current directory in library path,
+REM or we keep extracting a jbigi library from its .jar over and over
+REM instead of using a pre-extracted version.
+
+SET JAVAOPTS="-Djava.library.path=."
+
+REM Call Java to run our .jar archive.
+REM The main class and classpath are established inside it by manifest attributes.
+REM That seems a good call, since a manifest ain't platform dependent.
+REM See the build file for details.
+
+start javaw %JAVAOPTS% -jar lib\phex.jar


Property changes on: phex/branches/i2phex/run.bat
___________________________________________________________________
Name: svn:executable
   + *

Added: phex/branches/i2phex/run.sh
===================================================================
--- phex/branches/i2phex/run.sh	                        (rev 0)
+++ phex/branches/i2phex/run.sh	2008-04-04 20:03:27 UTC (rev 4161)
@@ -0,0 +1,24 @@
+#!/bin/bash
+# Startup script for Phex
+
+
+# Determine the directory where this script exists.
+# We assume that's the I2Phex install directory.
+
+OWN_LOCATION=${BASH_SOURCE%/*}
+
+
+# Adapt the variable below to pass various options to Java.
+# We definitely want the current directory in library path,
+# or we keep extracting a jbigi library from its .jar over and over
+# instead of using a pre-extracted version.
+
+JAVAOPTS="-Djava.library.path=."
+
+
+# Call Java to run our .jar archive.
+# The main class and classpath are established inside it by manifest attributes.
+# That seems a good call, since a manifest ain't platform dependent.
+# See the build file for details.
+
+java ${JAVAOPTS} -jar "${OWN_LOCATION}/lib/phex.jar"


Property changes on: phex/branches/i2phex/run.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: phex/branches/i2phex/src/main/java/phex/resources/version.properties
===================================================================
--- phex/branches/i2phex/src/main/java/phex/resources/version.properties	2008-03-29 22:33:41 UTC (rev 4160)
+++ phex/branches/i2phex/src/main/java/phex/resources/version.properties	2008-04-04 20:03:27 UTC (rev 4161)
@@ -1,4 +1,4 @@
 #Fri Jul 06 22:53:16 CEST 2007
 privatebuild.number=
 build.number=103.0
-build.date=2007/07/06 22\:53
+build.date=2008/04/04 20\:00


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.