X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Fdeploy.sh;h=f685bf0a96600d2933c68d1b8da4ef0533d79dc2;hb=51d5997996ea8be2f545f13c3258b56e19a4e291;hp=cb7c169886832e5b97f030aee91b99b8474211b4;hpb=ebd820491574c758104c09ca06bf3347ed87c88f;p=anna.git

diff --git a/example/diameter/launcher/deploy.sh b/example/diameter/launcher/deploy.sh
index cb7c169..f685bf0 100755
--- a/example/diameter/launcher/deploy.sh
+++ b/example/diameter/launcher/deploy.sh
@@ -41,10 +41,10 @@ usage () {
   echo
   exit 0
 }
- 
+
 # $1: deployment type
 createRunScript () {
-  # Basic launcher 'run.sh' will be created at deployment configuration: 
+  # Basic launcher 'run.sh' will be created at deployment configuration:
   [ "$1" = "b" ] && return
 
   local other=
@@ -67,6 +67,7 @@ rm -f counters/* test-reports/*
 export LD_LIBRARY_PATH=\$PWD/dynlibs
 ./\$EXE --services services.xml --cntDir counters --tmDir test-reports $other &
 echo \$! > .pid
+renice -n 5 -p \$(cat .pid)
 EOF
 
   chmod a+x run.sh
@@ -86,12 +87,16 @@ echo
 echo "Basic checkings ..."
 
 # Get variant and main executables:
-[ -f $SCR_DIR/release/example_diameter_launcher ] && VARIANT=release
-[ -f $SCR_DIR/debug/example_diameter_launcher ] && VARIANT=debug
-[ -z "$VARIANT" ] && _exit "Cannot locate neither 'release' nor 'debug' variant !"
+[ -d $PROJECT_ROOT/build/Release ] && VARIANT=Release
+[ -d $PROJECT_ROOT/build/Debug ] && VARIANT=Debug
+[ -z "$VARIANT" ] && _exit "Cannot locate neither 'Release' nor 'Debug' variant !"
 echo "Variant: $VARIANT"
-ADML_EXEC=$SCR_DIR/$VARIANT/example_diameter_launcher
-STACKMGMT_EXEC=$(readlink -f $SCR_DIR/../stackManagement/$VARIANT/example_diameter_stackManagement)
+BIN_DIR=$PROJECT_ROOT/build/$VARIANT/bin
+LIB_DIR=$PROJECT_ROOT/build/$VARIANT/lib
+
+# Main executables:
+ADML_EXEC=$BIN_DIR/anna_diameter_launcher
+STACKMGMT_EXEC=$BIN_DIR/anna_diameter_stackManagement
 
 [ ! -d $SETUPS_DIR ] && _exit "Diameter stacks not found ($SETUPS_DIR)."
 
@@ -163,38 +168,29 @@ mkdir -p $DPATH/counters
 mkdir -p $DPATH/test-reports
 
 # Dynamic libs:
-mkdir -p $DPATH/dynlibs
-DYNLIBS=( $(find $PROJECT_ROOT -name "*.so" | grep -w $VARIANT) )
+cp -r $LIB_DIR/dynamic/launcher $DPATH/dynlibs
+cp $LIB_DIR/libanna_testing_shared.so $DPATH/dynlibs
 
-for dynlib in ${DYNLIBS[@]}
+# Get stuff from leaf directories:
+cd $LIB_DIR/dynamic/launcher
+leafs=( $(find . -type d -links 2) )
+cd - >/dev/null
+
+cd $PROJECT_ROOT/dynamic/launcher
+for dir in ${leafs[@]}
 do
-  dynlib_bn=$(basename $dynlib)
-  if [ "$dynlib_bn" != "libanna_dynamicLauncherProcedure.so" ]
-  then
-    cp $dynlib $DPATH/dynlibs
-  else
-    ########## ADML Dynamic libs system ##########
-    # Create structure from $PROJECT_ROOT/dynamic/launcher
-    suffix_path=$(echo $dynlib | awk -F"$PROJECT_ROOT/dynamic/launcher/" '{ print $2 }')
-    target=$(dirname $DPATH/dynlibs/$(dirname $suffix_path))
-    mkdir -p $target
-    cp $dynlib $target
-
-    # Additional resources
-    dynlib_dn=$(dirname $dynlib)
-    dynlib_dn_dn=$(dirname $dynlib_dn)
-    cp $dynlib_dn_dn/*.xml $target 2>/dev/null
-    cp $dynlib_dn_dn/dynamic.suffix $target 2>/dev/null
-    cp -r $dynlib_dn_dn/services $target 2>/dev/null
-  fi
+    cp $dir/*.xml $DPATH/dynlibs/$dir 2>/dev/null
+    cp $dir/dynamic.suffix $DPATH/dynlibs/$dir 2>/dev/null
+    cp -r $dir/services $DPATH/dynlibs/$dir 2>/dev/null
 done
+cd - >/dev/null
 
 # ADML dynamic libs selection script:
 cp $SCR_DIR/resources/scripts/select_dynlib.sh $DPATH/dynlibs/select.sh
 
 # Default dynamic library:
 cd $DPATH/dynlibs
-ln -s default/libanna_dynamicLauncherProcedure.so
+ln -s default/libanna_launcher_procedure_default_shared.so
 cd - >/dev/null
 
 # Basic setup:
@@ -213,6 +209,7 @@ cp $SRVDTD $DPATH/DTDs
 [ "$option" = "b" ] && cp $SERVICES/* $DPATH/services
 cp $SCRIPTS/clone.sh $DPATH
 cp $SCRIPTS/tinyTestcase.sh $DPATH
+cp $SCR_DIR/resources/HELP.md $DPATH
 
 # Copy executables:
 cp $ADML_EXEC $DPATH/ADML
@@ -228,7 +225,7 @@ cd - >/dev/null
 if [ "$option" = "s" ]
 then
   cd $DPATH
-  ln -s services_example services
+  #ln -s services_example services
   mv run.sh .run-one.sh
   mv run_all.sh run.sh
   mv operation.sh .operation-one.sh