[Qsos-commits] qsos/apps/JQEditor build.xml run.bat run.sh

[Romain PELISSE]

CVSROOT:        /sources/qsos
Module name:    qsos
Changes by:     Romain PELISSE <rpelisse>       06/08/09 16:21:27

Modified files:
        apps/JQEditor  : build.xml 
Added files:
        apps/JQEditor  : run.bat run.sh 

Log message:
        build.xml modify to generate a "all OS directory" with the proper launch
        script added.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/JQEditor/build.xml?cvsroot=qsos&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/JQEditor/run.bat?cvsroot=qsos&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/qsos/apps/JQEditor/run.sh?cvsroot=qsos&rev=1.1

Patches:
Index: build.xml
===================================================================
RCS file: /sources/qsos/qsos/apps/JQEditor/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- build.xml   7 Aug 2006 09:08:46 -0000       1.7
+++ build.xml   9 Aug 2006 16:21:27 -0000       1.8
@@ -2,16 +2,20 @@
        <!-- project's properties -->
        <property name="appname" value="JQEditeur"/>
        <property name="lib" value="lib"/>
-       <property name="lib.linux" value="${lib}/linux"/>
                
        <property name="src" value="src"/>                      
        <property name="share" value="share"/>
+       <property name="share.linux"    value="${lib}/linux"/>
+       <property name="share.windows"  value="${lib}/windows"/>
+
+       
        <property name="swt.version" value="3232"/>
        
        <property name="dist" value="dist"/>
-       <property name="dist.common" value="${dist}/common"/>   
-       <property name="dist.common.linux" value="${dist.common}/linux"/>       
+       <property name="dist.common" value="${dist}/${appname}"/>       
        <property name="dist.common.share" value="${dist.common}/share"/>       
+       <property name="dist.common.share.windows" 
value="${dist.common.share}/windows"/>       
+       <property name="dist.common.share.linux" 
value="${dist.common.share}/linux"/>   
 
        <property name="out" value="out"/>
        <property name="out.classes" value="out"/>
@@ -19,6 +23,7 @@
        <property name="out.unzipedJars" value="out/unziped"/>
 
        <property name="linux.app"      value="run.sh"/>
+       <property name="windows.app"    value="run.bat"/>
 
        <!-- init -->
        <target name="init" depends="clean">
@@ -40,6 +45,13 @@
                                <include name="*.*" />
                        </fileset>
                </path>
+               
+               <path id="windows-classpath">
+                       <fileset dir="${lib}/windows">
+                               <include name="*.*" />
+                       </fileset>
+               </path>
+               
        </target>
 
        <!-- COMPILE -->
@@ -49,7 +61,6 @@
                                srcdir="${src}"
                                destdir="${out}">
                        <classpath refid="classpath" />
-                       <classpath refid="linux-classpath" />
                </javac>
                
                <copy todir="${out}">
@@ -59,11 +70,6 @@
                </copy>
        </target>
        
-       <!-- unjar a jar-->
-       
-       <target name="unjar">
-               
-       </target>
        
        <!-- JAR -->
        <target name="jar-jqeditor" depends="build">
@@ -113,35 +119,35 @@
                        </fileset>
                </copy>
                <!-- Adding windows dll for SWT -->
-               <copy todir="${dist.common.share}">
-               <fileset dir="${share}">
-               <include name="swt-win32-3139.dll"/>
+               <copy todir="${dist.common.share.windows}">
+               <fileset dir="${share.windows}">
+               <include name="swt-win32-3232.dll"/>
             </fileset>
         </copy>
-               <!-- Copiyng windows launching script 
-               <copy   file="" tofile=""/> -->
+               <!-- Copiyng windows launching script -->
+               <copy   file="${windows.app}"   
+                               tofile="${dist.common}/${windows.app}"/> 
                <!-- Adding linux .so archive for SWT -->
-               <copy todir="${dist.common.linux}">
-                       <fileset dir="${lib.linux}">
+               <copy todir="${dist.common.share.linux}">
+                       <fileset dir="${share.linux}">
                                <include name="**/*${swt.version}.so"/>
                        </fileset>
                </copy>
                <!-- Copying linux launching script -->
                <copy   file="${linux.app}"     
tofile="${dist.common}/${linux.app}"/>
-       
        </target>
 
        <!-- Running the app -->
-       <target name="run" description="RUN the program" >
+       <target name="run" description="RUN the program">
+               <!-- TODO: Adding test to launch the proper script according to 
the os -->
                <java   fork="true" 
                                jar="${dist.common}/jqeditor.jar"  
                                logerror="true" >
-                       <jvmarg 
value="-Djava.library.path=./${dist.common.linux}"/>
+                       <jvmarg 
value="-Djava.library.path=./${dist.common.share.linux}"/>
                </java>
        </target>
 
        <!-- Cleanning the directories from products -->
-       
        <target name="clean">
                <delete failonerror="false">
                        <fileset dir="${dist}"/>
@@ -156,5 +162,4 @@
                <antcall target="jar-jqeditor"/>
        </target>
 
-       
 </project>

Index: run.bat
===================================================================
RCS file: run.bat
diff -N run.bat
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ run.bat     9 Aug 2006 16:21:27 -0000       1.1
@@ -0,0 +1 @@
+java -Djava.libra ry.path=./share/windows/ -jar jqeditor.jar 
\ No newline at end of file

Index: run.sh
===================================================================
RCS file: run.sh
diff -N run.sh
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ run.sh      9 Aug 2006 16:21:27 -0000       1.1
@@ -0,0 +1,2 @@
+#!/bin/sh
+java -Djava.library.path=./share/linux/ -jar jqeditor.jar > /dev/null
\ No newline at end of file