Changeset 213

Timestamp:

04/12/11 21:43:19 (13 months ago)

Author:

stefan

Message:

changed start scripts

Location:

trunk

Files:

• build.xml (modified) (6 diffs)
• CHANGELOG (modified) (1 diff)
• lib/dlls/Windows/i386 (moved) (moved from trunk/lib/dlls/Windows/i368)
• scripts/create_release (modified) (1 diff)
• scripts/jergometer (modified) (1 diff)
• scripts/jergometer.bat (modified) (1 diff)
• scripts/start (added)
• scripts/start/unix_start.sh (added)
• scripts/start/windows_start.bat (added)

trunk/build.xml

@@ -16 +16 @@
   <property name="src"                location="src"/>
   <property name="build"              location="build"/>
-  <property name="lib"                location="lib"/>
+  <property name="lib"                value="lib"/>
   <property name="dist"               location="dist"/>
   <property name="upload"             location="${dist}/${ant.project.name}"/>
@@ -25 +25 @@
   <property name="buildClasses"       location="${build}/classes"/>
   <property name="programJar"         location="${uploadPrepare}/${program.jar}"/>
-  <property name="rxtxJar"            location="${lib}/RXTXcomm.jar"/>
+  <property name="velocityJar"        value="${lib}/velocity-1.7-dep.jar"/>
+  <property name="rxtxJar"            value="${lib}/RXTXcomm.jar"/>
   <property name="rxtxSoDir"          location="."/>
 
@@ -33 +34 @@
     </fileset>
     <filelist>
+      <file name="${velocityJar}"/>
       <file name="${rxtxJar}"/>
     </filelist>
@@ -113 +115 @@
     <copy todir="${uploadPrepare}" file="scripts/${start.sh}"/>
     <copy todir="${uploadPrepare}" file="scripts/${start.bat}"/>
+    <copy todir="${uploadPrepare}/start">
+      <fileset dir="scripts/start"/>
+    </copy>
     <chmod file="${uploadPrepare}/${start.sh}" perm="ugo+x"/>
+    <chmod file="${uploadPrepare}/start/unix_start.sh" perm="ugo+x"/>
   </target>
 
@@ -188 +194 @@
       <manifest>
         <attribute name="Main-Class" value="org.jergometer.Jergometer"/>
+        <attribute name="Class-Path" value="${velocityJar}"/>
         <attribute name="Class-Path" value="${rxtxJar}"/>
       </manifest>
@@ -200 +207 @@
     <copy todir="${uploadPrepare}" file="scripts/${start.sh}">
       <filterset>
+        <filter token="velocityJar" value="${velocityJar}"/>
         <filter token="rxtxJar" value="${rxtxJar}"/>
         <filter token="rxtxSoDir" value="${rxtxSoDir}"/>
       </filterset>
     </copy>
+    <copy todir="${uploadPrepare}/start">
+      <fileset dir="scripts/start"/>
+    </copy>
     <chmod file="${uploadPrepare}/${start.sh}" perm="ugo+x"/>
+    <chmod file="${uploadPrepare}/start/unix_start.sh" perm="ugo+x"/>
   </target>
 </project>

trunk/CHANGELOG

@@ -7 +7 @@
             * implemented issue #252: rename all occurrences of "COM port" to "serial port"
             * implemented issue #253: allow to switch between kJ and kcal
+            * improved start scripts (manuel update needed under Windows)
 
 == 0.7.11 ==

trunk/scripts/create_release

@@ -8 +8 @@
 
 # tag this release
-svn copy . $svnRepo/tags/$version -m "released version $version"
+#svn copy . $svnRepo/tags/$version -m "released version $version"
 
 mkdir -p dist/releases

trunk/scripts/jergometer

@@ -4 +4 @@
 cd $DIR
 
-# check for Linux or Mac
-OS=`uname -s`
-case $OS in
-  Darwin)
-    OS=MacOSX
-    JFLAGS=-d32
-    ;;
-esac
-
-# check for 32/64 bit
-ARCH=`uname -m`
-case $ARCH in
-  i686)
-    ARCH=i386
-    ;;
-  x86_64)
-    ARCH=amd64
-    ;;
-esac
-
 # start the application loop
 action=start
 while [ "$action" = "start" ]; do
-  java $JFLAGS -Djava.library.path=lib/dlls/$OS/$ARCH -cp jergometer.jar:lib/RXTXcomm.jar org.jergometer.Jergometer "$@"
+  start/unix_start.sh
   if [ "$?" != "255" ]; then
     action=end

trunk/scripts/jergometer.bat

@@ -7 +7 @@
 
 :START
-if "%PROCESSOR_ARCHITECTURE%" == "x86" goto START_X86
-goto START_AMD64
-
-
-:START_X86
-java -Djava.library.path=lib/dlls/Windows/i368 -cp jergometer.jar;lib\RXTXcomm.jar org.jergometer.Jergometer %1
-
-IF errorlevel 255 goto UPDATE
-goto END
-
-
-:START_AMD64
-java -Djava.library.path=lib/dlls/Windows/i368 -cp jergometer.jar;lib\RXTXcomm.jar org.jergometer.Jergometer %1
+start\windows_start.bat
 
 IF errorlevel 255 goto UPDATE