Author: rezan
Date: Wed Jul 29 22:05:46 2015
New Revision: 1693354
URL: http://svn.apache.org/r1693354
Log:
better compile
Removed:
devicemap/trunk/clients/2.0/reference/clean.sh
Modified:
devicemap/trunk/clients/2.0/reference/README
devicemap/trunk/clients/2.0/reference/compile.sh
devicemap/trunk/clients/2.0/reference/run.sh
Modified: devicemap/trunk/clients/2.0/reference/README
URL:
http://svn.apache.org/viewvc/devicemap/trunk/clients/2.0/reference/README?rev=1693354&r1=1693353&r2=1693354&view=diff
==============================================================================
--- devicemap/trunk/clients/2.0/reference/README (original)
+++ devicemap/trunk/clients/2.0/reference/README Wed Jul 29 22:05:46 2015
@@ -1,13 +1,9 @@
DeviceMap 2.0 Reference Client
-To run:
+To compile:
./compile
-If you had a previous compiled version, you can remove it with:
-
-./clean
-
To run against the SVN version of the reference domain (in the SVN tree):
./run.sh \
Modified: devicemap/trunk/clients/2.0/reference/compile.sh
URL:
http://svn.apache.org/viewvc/devicemap/trunk/clients/2.0/reference/compile.sh?rev=1693354&r1=1693353&r2=1693354&view=diff
==============================================================================
--- devicemap/trunk/clients/2.0/reference/compile.sh (original)
+++ devicemap/trunk/clients/2.0/reference/compile.sh Wed Jul 29 22:05:46 2015
@@ -1,7 +1,13 @@
#!/bin/bash
-mkdir -p bin
+rm -rf bin
+mkdir bin
LIBS=`find lib -type f | xargs echo | sed "s/ /:/g"`
javac -cp "$LIBS" src/*.java -d bin
+
+if [ "$1" = "dist" ]
+then
+ jar cf devicemap-reference-2.0.jar -C bin .
+fi
Modified: devicemap/trunk/clients/2.0/reference/run.sh
URL:
http://svn.apache.org/viewvc/devicemap/trunk/clients/2.0/reference/run.sh?rev=1693354&r1=1693353&r2=1693354&view=diff
==============================================================================
--- devicemap/trunk/clients/2.0/reference/run.sh (original)
+++ devicemap/trunk/clients/2.0/reference/run.sh Wed Jul 29 22:05:46 2015
@@ -1,11 +1,16 @@
#!/bin/bash
-if [ ! -d bin ]
+JAR=devicemap-reference-2.0.jar
+
+if [ -d bin ]
+then
+ JAR=bin
+elif [ ! -f "$JAR" ]
then
- echo "Please run compile.sh"
- exit 1
+ echo "Please run compile.sh"
+ exit 1
fi
LIBS=`find lib -type f | xargs echo | sed "s/ /:/g"`
-java -cp "bin:$LIBS" Main "$@"
+java -cp "$JAR:$LIBS" Main "$@"
