X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2FDEPLOY.sh;h=a314a30f930628a66bd211d63ff02a8fe8a55f93;hp=906a0b2de2bfcc684af66da913b156998a0c36f8;hb=61f1340da3cae5159d2e3bc14fc47c6d4bf9453e;hpb=4e8157262b1ac3c38cb9cbd56c0b41a11b90e1d3

diff --git a/example/diameter/launcher/DEPLOY.sh b/example/diameter/launcher/DEPLOY.sh
index 906a0b2..a314a30 100755
--- a/example/diameter/launcher/DEPLOY.sh
+++ b/example/diameter/launcher/DEPLOY.sh
@@ -19,8 +19,8 @@ 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 )
+#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 #
@@ -74,7 +74,7 @@ STARTED=\`pgrep \$EXE$ 2>/dev/null\`
 0> launcher.trace
 rm -f counters/* test-reports/*
 # Execution line:
-export LD_LIBRARY_PATH=\$PWD
+export LD_LIBRARY_PATH=\$PWD/dynlibs
 ./\$EXE --services services.xml --cntDir counters --tmDir test-reports $other &
 echo \$! > .pid
 EOF
@@ -104,6 +104,12 @@ for EXEC in ${EXECS[@]}; do
 done
 [ -z "$available" ] && _exit "Anna Diameter Launcher (ADML) is not installed neither linked. See README.md (Install section)."
 
+# Dynamic library variant:
+dynlib_variant=
+[ -f ./release/example_diameter_launcher ] && dynlib_variant=release
+[ -f ./debug/example_diameter_launcher ] && dynlib_variant=debug
+[ -z "$dynlib_variant" ] && _exit "Unknown dynamic library variant"
+
 # Dictionary creation:
 available=
 for STACKMGMT_EXEC in ${STACKMGMT_EXECS[@]}; do
@@ -115,13 +121,13 @@ done
 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)."
+#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)."
 
@@ -192,7 +198,22 @@ mkdir -p $DPATH/stacks
 mkdir -p $DPATH/DTDs
 mkdir -p $DPATH/counters
 mkdir -p $DPATH/test-reports
-cp $DYNLIB $DPATH
+
+# Dynamic libs:
+mkdir -p $DPATH/dynlibs
+cd ../../../dynamic/launcher
+DYNLIBS=( $(find . -name "*.so") )
+for dl in ${DYNLIBS[@]}
+do
+  dir=$(dirname $dl | xargs dirname)
+  mkdir -p $DPATH/dynlibs/$dir
+  cp $dir/$dynlib_variant/*.so $DPATH/dynlibs/$dir
+done
+cd - >/dev/null
+cp ./resources/scripts/select_dynlib.sh $DPATH/dynlibs/select.sh
+cd $DPATH/dynlibs
+ln -s default/libanna_dynamicLauncherProcedure.so
+cd - >/dev/null
 
 [ "$option" = "b" ] && mkdir -p $DPATH/services
 
@@ -230,6 +251,18 @@ stacks/makeAutonomous.sh commands_qosControl.xml stacks/stack-mgmt >/dev/null
 ln -s stacks/autonomous.commands_qosControl.xml dictionary.xml
 cd - >/dev/null
 
+if [ "$option" = "s" ]
+then
+  cd $DPATH
+  ln -s services_example services
+  mv run.sh .run-one.sh
+  mv run_all.sh run.sh
+  mv operation.sh .operation-one.sh
+  mv operation_all.sh operation.sh
+  rm dictionary.xml
+  cd - >/dev/null
+fi
+
 # Help:
 echo
 echo "Go to '$DPATH' and see README file"