X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2FDEPLOY.sh;h=906a0b2de2bfcc684af66da913b156998a0c36f8;hb=8b3eb3637cbe90fbabe70ec5667cce58cb7e368b;hp=edcb4fccbcb8e09462b4479f23e65f1a3f1cf283;hpb=8d1fa21ccbef8b92919d221673e05b54d6ed787a;p=anna.git

diff --git a/example/diameter/launcher/DEPLOY.sh b/example/diameter/launcher/DEPLOY.sh
index edcb4fc..906a0b2 100755
--- a/example/diameter/launcher/DEPLOY.sh
+++ b/example/diameter/launcher/DEPLOY.sh
@@ -18,6 +18,10 @@ EXECS=( $EXEC_installed ./release/example_diameter_launcher ./debug/example_diam
 STACKMGMT_EXEC_installed=/opt/bin/anna/example_diameter_stackManagement
 STACKMGMT_EXECS=( $STACKMGMT_EXEC_installed ../stackManagement/release/example_diameter_stackManagement ../stackManagement/debug/example_diameter_stackManagement )
 
+# Dynamic library:
+DYNLIB_installed=/usr/local/lib/libanna_dynamicLauncherProcedure.so
+DYNLIBS=( $DYNLIB_installed ../../../dynamic/launcher/default/release/libanna_dynamicLauncherProcedure.so ../../../dynamic/launcher/default/debug/libanna_dynamicLauncherProcedure.so )
+
 #############
 # FUNCTIONS #
 #############
@@ -70,6 +74,7 @@ STARTED=\`pgrep \$EXE$ 2>/dev/null\`
 0> launcher.trace
 rm -f counters/* test-reports/*
 # Execution line:
+export LD_LIBRARY_PATH=\$PWD
 ./\$EXE --services services.xml --cntDir counters --tmDir test-reports $other &
 echo \$! > .pid
 EOF
@@ -89,6 +94,7 @@ echo "---------------------------------------"
 echo " (--help or -h for more info)"
 echo
 echo "Basic checkings ..."
+
 # Launcher executable:
 available=
 for EXEC in ${EXECS[@]}; do
@@ -97,6 +103,7 @@ for EXEC in ${EXECS[@]}; do
   echo "not found"
 done
 [ -z "$available" ] && _exit "Anna Diameter Launcher (ADML) is not installed neither linked. See README.md (Install section)."
+
 # Dictionary creation:
 available=
 for STACKMGMT_EXEC in ${STACKMGMT_EXECS[@]}; do
@@ -107,6 +114,15 @@ done
 [ -z "$available" ] && _exit "Anna Diameter Stack Management Tool is not installed neither linked. See README.md (Install section)."
 STACKMGMT_EXEC=`readlink -f $STACKMGMT_EXEC`
 
+# Dynamic library:
+available=
+for DYNLIB in ${DYNLIBS[@]}; do
+  echo -n "Looking dynamic library at '$DYNLIB' ... "
+  [ -x $DYNLIB ] && { available=yes ; echo "available !" ; break ; }
+  echo "not found"
+done
+[ -z "$available" ] && _exit "Anna Diameter Launcher Dynamic Procedure Library (ADML) is not installed neither linked. See README.md (Install section)."
+
 [ ! -d $SETUPS_DIR ] && _exit "Diameter stacks not found ($SETUPS_DIR)."
 
 echo
@@ -176,6 +192,8 @@ mkdir -p $DPATH/stacks
 mkdir -p $DPATH/DTDs
 mkdir -p $DPATH/counters
 mkdir -p $DPATH/test-reports
+cp $DYNLIB $DPATH
+
 [ "$option" = "b" ] && mkdir -p $DPATH/services
 
 # ADML executable:
@@ -190,9 +208,9 @@ fi
 if [ "$STACKMGMT_EXEC" = "$STACKMGMT_EXEC_installed" ]
 then
   ln -s $STACKMGMT_EXEC_installed $DPATH/stacks/stack-mgmt
-else
-  cp $STACKMGMT_EXEC $DPATH/stack-mgmt
 fi
+# Copy binary just in case: 
+[ ! -f $DPATH/stacks/stack-mgmt ] && cp $STACKMGMT_EXEC $DPATH/stacks/stack-mgmt
 
 cp -rL $DEPLOYMENTS_DIR/* $DPATH
 cp $SETUPS_DIR/*xml $DPATH/stacks
@@ -208,7 +226,7 @@ cp $SRVDTD $DPATH/DTDs
 echo "Preparing ..."
 cd $DPATH
 createRunScript $option
-stacks/makeAutonomous.sh commands_qosControl.xml ./stack-mgmt
+stacks/makeAutonomous.sh commands_qosControl.xml stacks/stack-mgmt >/dev/null
 ln -s stacks/autonomous.commands_qosControl.xml dictionary.xml
 cd - >/dev/null