[GNUnet-SVN] r21451 - in gnunet-java: . bin src/org/gnunet/construct

[gnunet]

Author: dold
Date: 2012-05-12 12:17:02 +0200 (Sat, 12 May 2012)
New Revision: 21451

Modified:
   gnunet-java/bin/gnunet-dht
   gnunet-java/bin/gnunet-nse
   gnunet-java/bin/gnunet-resolver
   gnunet-java/bin/gnunet-statistics
   gnunet-java/izpack-installer.xml
   gnunet-java/src/org/gnunet/construct/MsgMap.txt
Log:
fixed installation / bin/ files

Modified: gnunet-java/bin/gnunet-dht
===================================================================
--- gnunet-java/bin/gnunet-dht  2012-05-12 09:58:20 UTC (rev 21450)
+++ gnunet-java/bin/gnunet-dht  2012-05-12 10:17:02 UTC (rev 21451)
@@ -2,10 +2,11 @@
 
 DIR=`dirname $0`
 
-if [ "$GNJ_IS_INSTALLED" = "true" ];
+if [ "%GNJ_INSTALLED" = "true" ];
 then
-    export CLASSPATH="%INSTALL_PATH%/share/java"
-else
+    export CLASSPATH="%INSTALL_PATH/share/java/*"
+:ne
+
     export CLASSPATH="$DIR/../build/:$DIR/../lib/*"
 fi
 

Modified: gnunet-java/bin/gnunet-nse
===================================================================
--- gnunet-java/bin/gnunet-nse  2012-05-12 09:58:20 UTC (rev 21450)
+++ gnunet-java/bin/gnunet-nse  2012-05-12 10:17:02 UTC (rev 21451)
@@ -2,9 +2,9 @@
 
 DIR=`dirname $0`
 
-if [ "$GNJ_IS_INSTALLED" = "true" ];
+if [ "%GNJ_INSTALLED" = "true" ];
 then
-    export CLASSPATH="%INSTALL_PATH%/share/java"
+    export CLASSPATH="%INSTALL_PATH/share/java/*"
 else
     export CLASSPATH="$DIR/../build/:$DIR/../lib/*"
 fi

Modified: gnunet-java/bin/gnunet-resolver
===================================================================
--- gnunet-java/bin/gnunet-resolver     2012-05-12 09:58:20 UTC (rev 21450)
+++ gnunet-java/bin/gnunet-resolver     2012-05-12 10:17:02 UTC (rev 21451)
@@ -2,9 +2,9 @@
 
 DIR=`dirname $0`
 
-if [ "$GNJ_IS_INSTALLED" = "true" ];
+if [ "%GNJ_INSTALLED" = "true" ];
 then
-    export CLASSPATH="%INSTALL_PATH%/share/java"
+    export CLASSPATH="%INSTALL_PATH/share/java/*"
 else
     export CLASSPATH="$DIR/../build/:$DIR/../lib/*"
 fi

Modified: gnunet-java/bin/gnunet-statistics
===================================================================
--- gnunet-java/bin/gnunet-statistics   2012-05-12 09:58:20 UTC (rev 21450)
+++ gnunet-java/bin/gnunet-statistics   2012-05-12 10:17:02 UTC (rev 21451)
@@ -4,7 +4,7 @@
 
 if [ "$GNJ_IS_INSTALLED" = "true" ];
 then
-    export CLASSPATH="%INSTALL_PATH%/share/java"
+    export CLASSPATH="%INSTALL_PATH%/share/java/*"
 else
     export CLASSPATH="$DIR/../build/:$DIR/../lib/*"
 fi

Modified: gnunet-java/izpack-installer.xml
===================================================================
--- gnunet-java/izpack-installer.xml    2012-05-12 09:58:20 UTC (rev 21450)
+++ gnunet-java/izpack-installer.xml    2012-05-12 10:17:02 UTC (rev 21451)
@@ -3,14 +3,10 @@
         <appname>gnunet-java</appname>
         <appversion>0.0</appversion>
         <javaversion>1.6</javaversion>
-        <!--
-             TODO: Where to write the uninstaller?
-             It's a directory, so it shouldn't be in $INSTALL_PATH/bin/
-        -->
-        <uninstaller write="false"/>
+        <uninstaller name="gnunet-java-uninstall.jar" 
path="${INSTALL_PATH}/share/" />
     </info>
     <variables>
-        <variable name="GNJ_IS_INSTALLED" value="true"/>
+        <variable name="GNJ_INSTALLED" value="true"/>
     </variables>
  
   <locale>
@@ -49,8 +45,8 @@
         <executable targetfile="$INSTALL_PATH/bin/gnunet-statistics" 
stage="never"/>
         <parsable targetfile="$INSTALL_PATH/bin/gnunet-statistics" 
type="shell"/>
 
-        <executable targetfile="$INSTALL_PATH/bin/gnunet-core" stage="never"/>
-        <parsable targetfile="$INSTALL_PATH/bin/gnunet-core" type="shell"/>
+        <executable targetfile="$INSTALL_PATH/bin/gnunet-dht" stage="never"/>
+        <parsable targetfile="$INSTALL_PATH/bin/gnunet-dht" type="shell"/>
 
         <executable targetfile="$INSTALL_PATH/bin/gnunet-resolver" 
stage="never"/>
         <parsable targetfile="$INSTALL_PATH/bin/gnunet-resolver" type="shell"/>

Modified: gnunet-java/src/org/gnunet/construct/MsgMap.txt
===================================================================
--- gnunet-java/src/org/gnunet/construct/MsgMap.txt     2012-05-12 09:58:20 UTC 
(rev 21450)
+++ gnunet-java/src/org/gnunet/construct/MsgMap.txt     2012-05-12 10:17:02 UTC 
(rev 21451)
@@ -31,4 +31,4 @@
 org.gnunet.util.GnunetMessage$Body|168=org.gnunet.statistics.SetMessage
 
org.gnunet.util.GnunetMessage$Body|173=org.gnunet.statistics.WatchResponseMessage
 org.gnunet.util.GnunetMessage$Body|172=org.gnunet.statistics.WatchMessage
-# generated 2012/05/12 11:45:55
+# generated 2012/05/12 12:08:13