X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2FDEPLOY.sh;h=fbb72dc5ba80f2f84ce04e063f4f122f59be2835;hb=b8c96c2917b9d29976a8771659d70bfb0881c133;hp=c6d58f17375781a264bd0a6f957cc5d486a62131;hpb=ed7ebc4995e0cb9be92c4f5ae5ac51362af15943;p=anna.git

diff --git a/example/diameter/launcher/DEPLOY.sh b/example/diameter/launcher/DEPLOY.sh
index c6d58f1..fbb72dc 100755
--- a/example/diameter/launcher/DEPLOY.sh
+++ b/example/diameter/launcher/DEPLOY.sh
@@ -5,9 +5,9 @@ SETUPS_DIR=../../../source/diameter/stack/setups
 MSGDTD=../../../include/anna/diameter/codec/message.dtd
 DCTDTD=../../../include/anna/diameter/stack/dictionary.dtd
 BASE_PROT=commands_baseProtocol.xml
-#EXEC=/opt/bin/anna/example_diameter_launcher
 EXEC=./debug/example_diameter_launcher
 DPATH_dflt=$HOME/ADL
+RESOURCES_DIR=resources
 
 _exit () {
    echo
@@ -32,6 +32,7 @@ createRunScript () {
   do
     echo -n "$i " >> run.sh
   done
+  echo -n "-cntDir counters " >> run.sh
   echo "&" >> run.sh
   chmod a+x run.sh
   rm args.txt
@@ -39,8 +40,7 @@ createRunScript () {
 
 createDictionaryPaths () {
 
-
-for i in stacks/*commands*xml
+  for i in stacks/*commands*xml
   do
     stacks/dependence.sh $i >/dev/null
     stack=`basename $i`
@@ -57,6 +57,9 @@ for i in stacks/*commands*xml
 
   # Default:
   ln -s .dictionary__commands_qosControl.xml .dictionary
+
+  # Remove deps:
+  rm -f stacks/*.dep
 }
 
 #############
@@ -73,24 +76,31 @@ read DPATH
 [[ -d $DPATH ]] && _exit "The path '$DPATH' already exists. Remove it before continue..."
 
 echo "Basic checkings ..."
-#[[ ! -f $EXEC ]] && _exit "Anna Diameter Launcher (ADL) is not installed in the system. Execute 'sudo scons install' for 'anna' suite."
 [[ ! -f $EXEC ]] && _exit "Anna Diameter Launcher (ADL) is not linked. Execute 'scons' for 'anna' suite."
 [[ ! -d $SETUPS_DIR ]] && _exit "Diameter stacks not found ($SETUPS_DIR). Perhaps you executed this script out of its parent path."
 
+echo
+echo "Deploy (f)ull version or (l)ite version [l]:"
+read deploy_type
+[[ "$deploy_type" = "" ]] && deploy_type=l
+[[ "$deploy_type" = "l" ]] && RESOURCES_DIR=resources_lite
+
 echo "Copying ..."
 mkdir -p $DPATH
 mkdir -p $DPATH/stacks
+mkdir -p $DPATH/DTDs
+mkdir -p $DPATH/counters
 cp $EXEC $DPATH/ADL-launcher
-cp resources/* $DPATH
+cp -r $RESOURCES_DIR/* $DPATH
 cp $SETUPS_DIR/*xml $DPATH/stacks
 cp $SETUPS_DIR/*sh $DPATH/stacks
 cp $SETUPS_DIR/readme.txt $DPATH/stacks
-cp $MSGDTD $DPATH
-cp $DCTDTD $DPATH
+cp $MSGDTD $DPATH/DTDs
+cp $DCTDTD $DPATH/DTDs
 
 echo "Preparing ..."
 cd $DPATH
-createRunScript
+[[ "$deploy_type" != "l" ]] && createRunScript
 createDictionaryPaths
 cd - >/dev/null