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

[gnunet]

Author: dold
Date: 2012-05-12 11:57:07 +0200 (Sat, 12 May 2012)
New Revision: 21448

Added:
   gnunet-java/tools/make-install
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:
added make-install, fixed shell wrappers to work with installed gnunet-java

Modified: gnunet-java/bin/gnunet-dht
===================================================================
--- gnunet-java/bin/gnunet-dht  2012-05-12 08:40:32 UTC (rev 21447)
+++ gnunet-java/bin/gnunet-dht  2012-05-12 09:57:07 UTC (rev 21448)
@@ -2,5 +2,12 @@
 
 DIR=`dirname $0`
 
-java -ea -cp "$DIR/../build/:$DIR/../lib/*" 
org.gnunet.dht.DistributedHashTable "$@"
+if [ "$GNJ_IS_INSTALLED" = "true" ];
+then
+    export CLASSPATH="%INSTALL_PATH%/share/java"
+else
+    export CLASSPATH="$DIR/../build/:$DIR/../lib/*"
+fi
 
+java -ea org.gnunet.dht.DistributedHashTable "$@"
+

Modified: gnunet-java/bin/gnunet-nse
===================================================================
--- gnunet-java/bin/gnunet-nse  2012-05-12 08:40:32 UTC (rev 21447)
+++ gnunet-java/bin/gnunet-nse  2012-05-12 09:57:07 UTC (rev 21448)
@@ -1,5 +1,12 @@
-#!/bin/sh
+#!/bin/bash
 
 DIR=`dirname $0`
 
-java -ea -cp "$DIR/../build/:$DIR/../lib/*" 
org.gnunet.nse.NetworkSizeEstimation "$@"
+if [ "$GNJ_IS_INSTALLED" = "true" ];
+then
+    export CLASSPATH="%INSTALL_PATH%/share/java"
+else
+    export CLASSPATH="$DIR/../build/:$DIR/../lib/*"
+fi
+
+java -ea org.gnunet.nse.NetworkSizeEstimation "$@"

Modified: gnunet-java/bin/gnunet-resolver
===================================================================
--- gnunet-java/bin/gnunet-resolver     2012-05-12 08:40:32 UTC (rev 21447)
+++ gnunet-java/bin/gnunet-resolver     2012-05-12 09:57:07 UTC (rev 21448)
@@ -2,5 +2,12 @@
 
 DIR=`dirname $0`
 
-java -ea -cp "$DIR/../build/:$DIR/../lib/*" org.gnunet.util.Resolver "$@"
+if [ "$GNJ_IS_INSTALLED" = "true" ];
+then
+    export CLASSPATH="%INSTALL_PATH%/share/java"
+else
+    export CLASSPATH="$DIR/../build/:$DIR/../lib/*"
+fi
 
+java -ea org.gnunet.util.Resolver "$@"
+

Modified: gnunet-java/bin/gnunet-statistics
===================================================================
--- gnunet-java/bin/gnunet-statistics   2012-05-12 08:40:32 UTC (rev 21447)
+++ gnunet-java/bin/gnunet-statistics   2012-05-12 09:57:07 UTC (rev 21448)
@@ -2,4 +2,11 @@
 
 DIR=`dirname $0`
 
-java -ea -cp "$DIR/../build/:$DIR/../lib/*" org.gnunet.statistics.Statistics 
"$@"
+if [ "$GNJ_IS_INSTALLED" = "true" ];
+then
+    export CLASSPATH="%INSTALL_PATH%/share/java"
+else
+    export CLASSPATH="$DIR/../build/:$DIR/../lib/*"
+fi
+
+java -ea org.gnunet.statistics.Statistics "$@"

Modified: gnunet-java/izpack-installer.xml
===================================================================
--- gnunet-java/izpack-installer.xml    2012-05-12 08:40:32 UTC (rev 21447)
+++ gnunet-java/izpack-installer.xml    2012-05-12 09:57:07 UTC (rev 21448)
@@ -1,10 +1,17 @@
 <installation version="1.0">
-  <info>
-    <appname>gnunet-java</appname>
-    <appversion>0.0</appversion>
-    <javaversion>1.6</javaversion>
-    <uninstaller write="false"></uninstaller>
-  </info>
+    <info>
+        <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>
+    </info>
+    <variables>
+        <variable name="GNJ_IS_INSTALLED" value="true"/>
+    </variables>
  
   <locale>
     <langpack iso3="eng"/>
@@ -33,14 +40,24 @@
     </pack>
     <pack name="executables" required="no">
         <description>useful executables</description>
+
         <file src="bin/" targetdir="$INSTALL_PATH/"></file>
+
         <executable targetfile="$INSTALL_PATH/bin/gnunet-nse" 
stage="never"></executable>
+        <parsable targetfile="$INSTALL_PATH/bin/gnunet-nse" 
type="shell"></parsable>
+
         <executable targetfile="$INSTALL_PATH/bin/gnunet-statistics" 
stage="never"></executable>
+        <parsable targetfile="$INSTALL_PATH/bin/gnunet-statistics" 
type="shell"></parsable>
+
         <executable targetfile="$INSTALL_PATH/bin/gnunet-core" 
stage="never"></executable>
+        <parsable targetfile="$INSTALL_PATH/bin/gnunet-core" 
type="shell"></parsable>
+
         <executable targetfile="$INSTALL_PATH/bin/gnunet-resolver" 
stage="never"></executable>
+        <parsable targetfile="$INSTALL_PATH/bin/gnunet-resolver" 
type="shell"></parsable>
     </pack>
     <pack name="documentation" required="no">
         <description>The gunet-java tutorial</description>
+        <file src="doc/gnunet-java-tutorial.tex" 
targetdir="$INSTALL_PATH/share/doc/gnunet-java/"></file>
     </pack>
   </packs>
  

Modified: gnunet-java/src/org/gnunet/construct/MsgMap.txt
===================================================================
--- gnunet-java/src/org/gnunet/construct/MsgMap.txt     2012-05-12 08:40:32 UTC 
(rev 21447)
+++ gnunet-java/src/org/gnunet/construct/MsgMap.txt     2012-05-12 09:57:07 UTC 
(rev 21448)
@@ -2,22 +2,21 @@
 
org.gnunet.construct.UnionTest$TestUnion|1=org.gnunet.construct.UnionTest$TestUnionCase1
 org.gnunet.util.Resolver$Address|0=org.gnunet.util.Resolver$TextualAddress
 org.gnunet.util.Resolver$Address|1=org.gnunet.util.Resolver$NumericAddress
-org.gnunet.util.GnunetMessage$Body|68=org.gnunet.core.Core$DisconnectNotifyMessage
+org.gnunet.util.GnunetMessage$Body|68=org.gnunet.core.DisconnectNotifyMessage
 org.gnunet.util.GnunetMessage$Body|1=org.gnunet.util.TESTMessage
-org.gnunet.util.GnunetMessage$Body|70=org.gnunet.core.Core$NotifyInboundTrafficMessage
-org.gnunet.util.GnunetMessage$Body|71=org.gnunet.core.Core$NotifyOutboundTrafficMessage
+org.gnunet.util.GnunetMessage$Body|70=org.gnunet.core.NotifyInboundTrafficMessage
+org.gnunet.util.GnunetMessage$Body|71=org.gnunet.core.NotifyOutboundTrafficMessage
+org.gnunet.util.GnunetMessage$Body|64=org.gnunet.core.InitMessage
 org.gnunet.util.GnunetMessage$Body|4=org.gnunet.util.Resolver$GetMessage
-org.gnunet.util.GnunetMessage$Body|64=org.gnunet.core.Core$InitMessage
 org.gnunet.util.GnunetMessage$Body|5=org.gnunet.util.Resolver$ResolverResponse
-org.gnunet.util.GnunetMessage$Body|65=org.gnunet.core.Core$InitReplyMessage
+org.gnunet.util.GnunetMessage$Body|65=org.gnunet.core.InitReplyMessage
 org.gnunet.util.GnunetMessage$Body|143=org.gnunet.dht.ClientGetMessage
+org.gnunet.util.GnunetMessage$Body|67=org.gnunet.core.ConnectNotifyMessage
 org.gnunet.util.GnunetMessage$Body|142=org.gnunet.dht.ClientPutMessage
-org.gnunet.util.GnunetMessage$Body|67=org.gnunet.core.Core$ConnectNotifyMessage
-org.gnunet.util.GnunetMessage$Body|76=org.gnunet.core.Core$SendMessage
-org.gnunet.util.GnunetMessage$Body|74=org.gnunet.core.Core$SendMessageRequest
-org.gnunet.util.GnunetMessage$Body|75=org.gnunet.core.Core$SendMessageReady
+org.gnunet.util.GnunetMessage$Body|76=org.gnunet.core.SendMessage
+org.gnunet.util.GnunetMessage$Body|74=org.gnunet.core.SendMessageRequest
+org.gnunet.util.GnunetMessage$Body|75=org.gnunet.core.SendMessageReady
 org.gnunet.util.GnunetMessage$Body|153=org.gnunet.dht.MonitorStartStop
-org.gnunet.util.GnunetMessage$Body|42001=org.gnunet.core.Core$MyMessage
 
org.gnunet.util.GnunetMessage$Body|155=org.gnunet.dht.ClientPutConfirmationMessage
 
org.gnunet.util.GnunetMessage$Body|323=org.gnunet.nse.NetworkSizeEstimation$UpdateMessage
 
org.gnunet.util.GnunetMessage$Body|321=org.gnunet.nse.NetworkSizeEstimation$StartMessage
@@ -32,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/09 15:57:52
+# generated 2012/05/12 11:45:55

Added: gnunet-java/tools/make-install
===================================================================
--- gnunet-java/tools/make-install                              (rev 0)
+++ gnunet-java/tools/make-install      2012-05-12 09:57:07 UTC (rev 21448)
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+if [ -z "$IZPACK_PREFIX" ]
+then
+    echo '$IZPACK_PREFIX not specified'
+    exit 1
+fi
+
+BASEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+
+cd $BASEDIR
+
+$IZPACK_PREFIX/bin/compile izpack-installer.xml
+
+cd "$OLDPWD"
+


Property changes on: gnunet-java/tools/make-install
___________________________________________________________________
Added: svn:executable
   + *