[jetrix-cvs] SF.net SVN: jetrix: [712] jetrix/trunk

[<Sm...@us...>]

Revision: 712
          http://jetrix.svn.sourceforge.net/jetrix/?rev=712&view=rev
Author:   Smanux
Date:     2007-08-26 03:36:06 -0700 (Sun, 26 Aug 2007)

Log Message:
-----------
Fixed jetrix.bat and update.bat when the JAVA_HOME path contains a space character
Fixed the build to include the data directory in the distribution

Modified Paths:
--------------
    jetrix/trunk/build.xml
    jetrix/trunk/src/bin/jetrix.bat
    jetrix/trunk/src/bin/update.bat

Modified: jetrix/trunk/build.xml
===================================================================
--- jetrix/trunk/build.xml	2007-08-25 23:18:04 UTC (rev 711)
+++ jetrix/trunk/build.xml	2007-08-26 10:36:06 UTC (rev 712)
@@ -183,6 +183,7 @@
         <include name="README" />
         <include name="server.xml" />
         <include name="channels.xml" />
+        <include name="data/**" />
       </zipfileset>
       <zipfileset prefix="jetrix-${version}/" dir="${build}/bin/">
         <include name="jetrix.bat" />
@@ -222,6 +223,7 @@
         <include name="README" />
         <include name="server.xml" />
         <include name="channels.xml" />
+        <include name="data/**" />
       </tarfileset>
       <tarfileset prefix="jetrix-${version}/" dir="${build}/bin/">
         <include name="jetrix.bat" />
@@ -325,7 +327,6 @@
   <target name="run" depends="deploy">
     <java dir="${deploy}/jetrix-${version}" jar="${deploy}/jetrix-${version}/lib/jetrix-launcher-${version}.jar" fork="true">
       <sysproperty key="jetrix.debug" value="true"/>
-      <sysproperty key="java.library.path" value="lib"/>
     </java>
   </target>
 

Modified: jetrix/trunk/src/bin/jetrix.bat
===================================================================
--- jetrix/trunk/src/bin/jetrix.bat	2007-08-25 23:18:04 UTC (rev 711)
+++ jetrix/trunk/src/bin/jetrix.bat	2007-08-26 10:36:06 UTC (rev 712)
@@ -2,7 +2,7 @@
 
 SETLOCAL
 
-IF NOT JAVA_HOME == "" SET JAVA_EXE=%JAVA_HOME%\bin\java
+IF NOT JAVA_HOME == "" SET JAVA_EXE="%JAVA_HOME%\bin\java"
 IF JAVA_HOME == "" SET JAVA_EXE=java
 
 %JAVA_EXE% -Djava.library.path=lib -jar lib/jetrix-launcher-@version@.jar

Modified: jetrix/trunk/src/bin/update.bat
===================================================================
--- jetrix/trunk/src/bin/update.bat	2007-08-25 23:18:04 UTC (rev 711)
+++ jetrix/trunk/src/bin/update.bat	2007-08-26 10:36:06 UTC (rev 712)
@@ -2,7 +2,7 @@
 
 SETLOCAL
 
-IF NOT JAVA_HOME == "" SET JAVA_EXE=%JAVA_HOME%\bin\java
+IF NOT JAVA_HOME == "" SET JAVA_EXE="%JAVA_HOME%\bin\java"
 IF JAVA_HOME == "" SET JAVA_EXE=java
 
 %JAVA_EXE% -cp lib/jetrix-@version@.jar net.jetrix.tools.patcher.JetrixUpdate


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