[SCM] tango branch, master, updated. debian/8.0.5+dfsg-3-16-gab2b6be
Picca Frédéric-Emmanuel
picca at debian.org
Sun Jul 21 18:31:20 UTC 2013
The following commit has been merged in the master branch:
commit 76b21f6c35781889ce0de1eac1504b532055b6b4
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Sun Jul 21 09:02:37 2013 +0200
Imported Upstream version 8.1.2b+dfsg
diff --git a/lib/java/astor.in b/lib/java/astor.in
index 21a707a..99a1259 100755
--- a/lib/java/astor.in
+++ b/lib/java/astor.in
@@ -58,10 +58,13 @@ export ATK_CLASS
CLASSPATH=$TANGO_CLASS:$ASTOR_CLASS:$JIVE_CLASS:$ATK_CLASS:$LOGVIEWER:$LOG4J
export CLASSPATH
+LIBPATH=@prefix@/lib
+export LIBPATH
+
#---------------------------------------------------------
# Start the Astor process
#---------------------------------------------------------
#
- at JAVA@ -mx128m -DTANGO_HOST=$TANGO_HOST admin.astor.Astor $*
+ at JAVA@ -mx128m -Djava.library.path=$LIBPATH -DTANGO_HOST=$TANGO_HOST admin.astor.Astor $*
diff --git a/lib/java/atkmoni.in b/lib/java/atkmoni.in
index c47f731..c5ed5a1 100755
--- a/lib/java/atkmoni.in
+++ b/lib/java/atkmoni.in
@@ -21,10 +21,12 @@ CLASSPATH=$TANGO:$TACO:$TANGOATK
export CLASSPATH
echo "CLASSPATH=$CLASSPATH"
+LIBPATH=@prefix@/lib
+export LIBPATH
#---------------------------------------------------------
# Start the atkmoni process
#---------------------------------------------------------
#
- at JAVA@ -DTANGO_HOST=$TANGO_HOST $APPLI_PACKAGE.$APPLI_MAIN_CLASS $*
+ at JAVA@ -Djava.library.path=$LIBPATH -DTANGO_HOST=$TANGO_HOST $APPLI_PACKAGE.$APPLI_MAIN_CLASS $*
diff --git a/lib/java/atkpanel.in b/lib/java/atkpanel.in
index 9d740bf..166f98b 100755
--- a/lib/java/atkpanel.in
+++ b/lib/java/atkpanel.in
@@ -19,9 +19,11 @@ ATKPANEL=$LIB_DIR/atkpanel.jar
CLASSPATH=$ATKPANEL:$TANGOATK:$TANGO
export CLASSPATH
+LIBPATH=@prefix@/lib
+export LIBPATH
#---------------------------------------------------------
# Start the atkpanel process
#---------------------------------------------------------
- at JAVA@ -mx128m -DTANGO_HOST=$TANGO_HOST atkpanel.MainPanel $*
+ at JAVA@ -mx128m -Djava.library.path=$LIBPATH -DTANGO_HOST=$TANGO_HOST atkpanel.MainPanel $*
diff --git a/lib/java/atktuning.in b/lib/java/atktuning.in
index 68e495e..9a2fc3e 100755
--- a/lib/java/atktuning.in
+++ b/lib/java/atktuning.in
@@ -19,9 +19,11 @@ ATKPANEL=$LIB_DIR/AtkTuning.jar
CLASSPATH=$ATKPANEL:$TANGOATK:$TANGO
export CLASSPATH
+LIBPATH=@prefix@/lib
+export LIBPATH
#---------------------------------------------------------
# Start the atktuning process
#---------------------------------------------------------
- at JAVA@ -DTANGO_HOST=$TANGO_HOST atktuning.MainPanel $*
+ at JAVA@ -Djava.library.path=$LIBPATH -DTANGO_HOST=$TANGO_HOST atktuning.MainPanel $*
diff --git a/lib/java/cvstag.in b/lib/java/cvstag.in
index cf77896..9180815 100755
--- a/lib/java/cvstag.in
+++ b/lib/java/cvstag.in
@@ -16,8 +16,11 @@ POGO_CLASS=$APP_DIR/Pogo.jar; export POGO_CLASS
CLASSPATH=$POGO_CLASS:$TANGO_CLASS; export CLASSPATH
+LIBPATH=@prefix@/lib
+export LIBPATH
+
#---------------------------------------------------------
# Execute java class
#---------------------------------------------------------
- at JAVA@ pogo.make_util.TagModule $@
+ at JAVA@ -Djava.library.path=$LIBPATH pogo.make_util.TagModule $@
diff --git a/lib/java/devicetree.in b/lib/java/devicetree.in
index 91af641..2fca14d 100755
--- a/lib/java/devicetree.in
+++ b/lib/java/devicetree.in
@@ -9,5 +9,8 @@ JAVABIN=@prefix@/share/java;
CLASSPATH=$JAVALIB/TangORB.jar:$JAVALIB/ATKWidget.jar:$JAVALIB/ATKCore.jar:$JAVABIN/Jive.jar:$JAVABIN/atkpanel.jar:$JAVABIN/DeviceTree.jar
export CLASSPATH
+LIBPATH=@prefix@/lib
+export LIBPATH
+
echo Running Device Tree...
- at JAVA@ -DTANGO_HOST=$TANGO_HOST explorer.Main $@
+ at JAVA@ -Djava.library.path=$LIBPATH -DTANGO_HOST=$TANGO_HOST explorer.Main $@
diff --git a/lib/java/jdraw.in b/lib/java/jdraw.in
index cd5b5da..03de543 100755
--- a/lib/java/jdraw.in
+++ b/lib/java/jdraw.in
@@ -21,6 +21,9 @@ CLASSPATH=$TANGOATK:$TANGO
export CLASSPATH
echo "CLASSPATH=$CLASSPATH"
+LIBPATH=@prefix@/lib
+export LIBPATH
+
echo Running Jdraw ...
#---------------------------------------------------------
@@ -28,5 +31,5 @@ echo Running Jdraw ...
#---------------------------------------------------------
#
- at JAVA@ $APPLI_PACKAGE.$APPLI_MAIN_CLASS $@
+ at JAVA@ -Djava.library.path=$LIBPATH $APPLI_PACKAGE.$APPLI_MAIN_CLASS $@
diff --git a/lib/java/jive.in b/lib/java/jive.in
index b463c52..0edc16c 100755
--- a/lib/java/jive.in
+++ b/lib/java/jive.in
@@ -19,4 +19,7 @@ LOG4J=$JAVALIB/log4j.jar
CLASSPATH=$JAVALIB/TangORB.jar:$JAVABIN/Jive.jar:$ATK:$LOGVIEWER:$LOG4J:$ASTOR:.
export CLASSPATH
- at JAVA@ -mx128m -DTANGO_HOST=$TANGO_HOST $applet_name $@
+LIBPATH=@prefix@/lib
+export LIBPATH
+
+ at JAVA@ -mx128m -Djava.library.path=$LIBPATH -DTANGO_HOST=$TANGO_HOST $applet_name $@
diff --git a/lib/java/logviewer.in b/lib/java/logviewer.in
index abd76aa..336c0f8 100755
--- a/lib/java/logviewer.in
+++ b/lib/java/logviewer.in
@@ -18,4 +18,7 @@ ATKJAR=$ATKBIN/ATKCore.jar:$ATKBIN/ATKWidget.jar:$ATKBIN/log4j.jar
CLASSPATH=$JAVALIB/TangORB.jar:$TLVBIN/LogViewer.jar:$ATKJAR:.
export CLASSPATH
- at JAVA@ -DTANGO_HOST=$TANGO_HOST $applet_name $*
+LIBPATH=@prefix@/lib
+export LIBPATH
+
+ at JAVA@ -Djava.library.path=$LIBPATH -DTANGO_HOST=$TANGO_HOST $applet_name $*
diff --git a/lib/java/synopticappli.in b/lib/java/synopticappli.in
index 2176eee..519a48e 100755
--- a/lib/java/synopticappli.in
+++ b/lib/java/synopticappli.in
@@ -27,11 +27,13 @@ CLASSPATH=$TACO:$TANGO:$TANGOATK:$ATKPANEL
export CLASSPATH
echo "CLASSPATH=$CLASSPATH"
+LIBPATH=@prefix@/lib
+export LIBPATH
#---------------------------------------------------------
# Start the synoptic appli process
#---------------------------------------------------------
#
- at JAVA@ -mx128m -DTANGO_HOST=$TANGO_HOST $APPLI_PACKAGE.$APPLI_MAIN_CLASS $*
+ at JAVA@ -mx128m -Djava.library.path=$LIBPATH -DTANGO_HOST=$TANGO_HOST $APPLI_PACKAGE.$APPLI_MAIN_CLASS $*
diff --git a/lib/java/tg_devtest.in b/lib/java/tg_devtest.in
index 13d22a2..2ab2cba 100755
--- a/lib/java/tg_devtest.in
+++ b/lib/java/tg_devtest.in
@@ -10,6 +10,10 @@ TANGOATK=$JAVALIB/ATKCore.jar:$JAVALIB/ATKWidget.jar
CLASSPATH=$JAVALIB/TangORB.jar:$JAVALIB/Jive.jar:$TANGOATK
export CLASSPATH
+
+LIBPATH=@prefix@/lib
+export LIBPATH
+
echo Starting...
- at JAVA@ -DTANGO_HOST=$TANGO_HOST jive.ExecDev $1
+ at JAVA@ -Djava.library.path=$LIBPATH -DTANGO_HOST=$TANGO_HOST jive.ExecDev $1
--
TANGO distributed control system.
More information about the debian-science-commits
mailing list