Updqte scripts after GitLab migration

scripts/autointerop_generate_makefile.bash

@@ -68,7 +68,7 @@ then
     fi
 fi
 # Build ASN.1 files if any and put them in objs directory
-ASN1_PATH=${PATH_DEV_ITS}/asn1
+ASN1_PATH=${PATH_DEV_ITS}/ttcn/LibIts/asn1
 if [ -d ${ASN1_PATH} ]
 then
     ASN1_FILES=`find ${ASN1_PATH} -name '*.asn*'`

scripts/cam_generate_makefile.bash

@@ -68,7 +68,7 @@ then
     fi
 fi
 # Build ASN.1 files if any and put them in objs directory
-ASN1_PATH=${PATH_DEV_ITS}/asn1
+ASN1_PATH=${PATH_DEV_ITS}/ttcn/LibIts/asn1
 if [ -d ${ASN1_PATH} ]
 then
     ASN1_FILES=`find ${ASN1_PATH} -name '*.asn*'`

scripts/denm_generate_makefile.bash

@@ -68,7 +68,7 @@ then
     fi
 fi
 # Build ASN.1 files if any and put them in objs directory
-ASN1_PATH=${PATH_DEV_ITS}/asn1
+ASN1_PATH=${PATH_DEV_ITS}/ttcn/LibIts/asn1
 if [ -d ${ASN1_PATH} ]
 then
     ASN1_FILES=`find ${ASN1_PATH} -name '*.asn*'`

scripts/gencert_generate_makefile.bash

@@ -68,7 +68,7 @@ then
     fi
 fi
 # Build ASN.1 files if any and put them in objs directory
-ASN1_PATH=${PATH_DEV_ITS}/asn1
+ASN1_PATH=${PATH_DEV_ITS}/ttcn/LibIts/asn1
 if [ -d ${ASN1_PATH} ]
 then
     ASN1_FILES=`find ${ASN1_PATH} -name '*.asn*'`

scripts/geonw_generate_makefile.bash

@@ -68,7 +68,7 @@ then
     fi
 fi
 # Build ASN.1 files if any and put them in objs directory
-ASN1_PATH=${PATH_DEV_ITS}/asn1
+ASN1_PATH=${PATH_DEV_ITS}/ttcn/LibIts/asn1
 if [ -d ${ASN1_PATH} ]
 then
     ASN1_FILES=`find ${ASN1_PATH} -name '*.asn*'`

scripts/pki_generate_makefile.bash

@@ -68,7 +68,7 @@ then
     fi
 fi
 # Build ASN.1 files if any and put them in objs directory
-ASN1_PATH=${PATH_DEV_ITS}/asn1
+ASN1_PATH=${PATH_DEV_ITS}/ttcn/LibIts/asn1
 if [ -d ${ASN1_PATH} ]
 then
     ASN1_FILES=`find ${ASN1_PATH} -name '*.asn*'`

scripts/rsusimulator_generate_makefile.bash

@@ -68,7 +68,7 @@ then
     fi
 fi
 # Build ASN.1 files if any and put them in objs directory
-ASN1_PATH=${PATH_DEV_ITS}/asn1
+ASN1_PATH=${PATH_DEV_ITS}/ttcn/LibIts/asn1
 if [ -d ${ASN1_PATH} ]
 then
     ASN1_FILES=`find ${ASN1_PATH} -name '*.asn*'`

scripts/security_generate_makefile.bash

@@ -68,7 +68,7 @@ then
     fi
 fi
 # Build ASN.1 files if any and put them in objs directory
-ASN1_PATH=${PATH_DEV_ITS}/asn1
+ASN1_PATH=${PATH_DEV_ITS}/ttcn/LibIts/asn1
 if [ -d ${ASN1_PATH} ]
 then
     ASN1_FILES=`find ${ASN1_PATH} -name '*.asn*'`

scripts/testcodec_generate_makefile.bash

 #!/bin/bash
-set -e
+#set -e
 set -vx
 
 function f_exit {
@@ -68,7 +68,7 @@ then
     fi
 fi
 # Build ASN.1 files if any and put them in objs directory
-ASN1_PATH=${PATH_DEV_ITS}/asn1
+ASN1_PATH=${PATH_DEV_ITS}/ttcn/LibIts/asn1
 if [ -d ${ASN1_PATH} ]
 then
     ASN1_FILES=`find ${ASN1_PATH} -name '*.asn*'`

scripts/update_its_project.bash

@@ -2,7 +2,7 @@
 
 # Debug mode
 #set -e
-#set -vx
+set -vx
 
 # Usage: sudo ./update_project.bash
 # TODO Use git clone in temporary directory
@@ -34,28 +34,33 @@ fi
 # Check if target directory exist
 if [ ! -d ${PATH_DEV_ITS} ]
 then
-    mkdir -p ${PATH_DEV_ITS}/asn1/LibIts ${PATH_DEV_ITS}/include ${PATH_DEV_ITS}/bin ${PATH_DEV_ITS}/lib ${PATH_DEV_ITS}/objs ${PATH_DEV_ITS}/src ${PATH_DEV_ITS}/docs
+    mkdir -p ${PATH_DEV_ITS}/asn1/ ${PATH_DEV_ITS}/ttcn/LibIts/asn1/ ${PATH_DEV_ITS}/include ${PATH_DEV_ITS}/bin ${PATH_DEV_ITS}/lib ${PATH_DEV_ITS}/objs ${PATH_DEV_ITS}/src ${PATH_DEV_ITS}/docs
 fi
 
 # Update ASN.1 files
 echo 'Updating ASN.1 files'
-ASN1_SRC_PATH=${SRC_ITS_PATH}/asn1/LibIts
-ASN1_DST_PATH=${PATH_DEV_ITS}/asn1/LibIts
+ASN1_SRC_PATH=${SRC_ITS_PATH}/ttcn/LibIts/asn1
+ASN1_DST_PATH=${PATH_DEV_ITS}/ttcn/LibIts/asn1
 NB_DEL=`echo ${ASN1_SRC_PATH} | awk -F"/" '{print NF + 1}'`
-ASN1_DIR_LIST=`find ${ASN1_SRC_PATH} -type d -not -path "*/.svn*" | cut -sd / -f${NB_DEL}-`
+#ASN1_DIR_LIST=`find ${ASN1_SRC_PATH} -type d -not -path "*/.svn*" | cut -sd / -f${NB_DEL}-`
+ASN1_DIR_LIST="CAM DENM EVCSN EV-RSR IS ITS-Container Security"
 for i in ${ASN1_DIR_LIST}
 do
-    if [ ! -d ${ASN1_DST_PATH}/$i ]
-    then
-        mkdir ${ASN1_DST_PATH}/$i
-        chmod 775 ${ASN1_DST_PATH}/$i
-    fi
-    for j in `ls ${ASN1_SRC_PATH}/$i/*.asn`
+    ASN1_SUBDIR_LIST=`find $ASN1_SRC_PATH/$i -type d | cut -sd / -f${NB_DEL}-`
+    for j in ${ASN1_SUBDIR_LIST}
     do
-        cp $j ${ASN1_DST_PATH}/$i
+        if [ ! -d ${ASN1_DST_PATH}/$j ]
+        then
+            mkdir ${ASN1_DST_PATH}/$j
+            chmod 775 ${ASN1_DST_PATH}/$j
+        fi
+        for k in `ls ${ASN1_SRC_PATH}/$j/*.asn`
+        do
+            cp $k ${ASN1_DST_PATH}/$j
+        done
     done
 done
-cp ${ASN1_SRC_PATH}/../Makefile ${ASN1_DST_PATH}/..
+cp ${SRC_ITS_PATH}/asn1/Makefile ${PATH_DEV_ITS}/asn1
 
 # Update testdata
 echo 'Updating testdata'
@@ -151,7 +156,7 @@ echo 'Update TTCN-3 files'
 TTCN_3_ORG_PATH=${SRC_ITS_PATH}/ttcn
 TTCN_3_DST_PATH=${PATH_DEV_ITS}/src
 CC_SRC_PATH=${SRC_ITS_PATH}/ccsrc
-TTCN_3_ATS_LIST='AtsAutoInterop AtsCAM AtsDENM AtsBTP AtsGeoNetworking AtsSecurity AtsRSUsSimulator LibCommon TestCodec AtsGenCert AtsPki'
+TTCN_3_ATS_LIST='AtsAutoInterop AtsCAM AtsDENM AtsBTP AtsGeoNetworking AtsSecurity AtsRSUsSimulator LibCommon/ttcn TestCodec AtsGenCert AtsPki'
 for i in ${TTCN_3_ATS_LIST}
 do
     if [ ! -d ${TTCN_3_DST_PATH}/$i ]
@@ -172,7 +177,7 @@ do
     then
         mkdir -p ${TTCN_3_DST_PATH}/LibIts/$i/docs ${TTCN_3_DST_PATH}/LibIts/$i/src ${TTCN_3_DST_PATH}/LibIts/$i/include ${TTCN_3_DST_PATH}/LibIts/$i/ttcn
     fi
-    cp ${TTCN_3_ORG_PATH}/LibIts/$i/*.ttcn ${TTCN_3_DST_PATH}/LibIts/$i/ttcn
+    cp ${TTCN_3_ORG_PATH}/LibIts/ttcn/$i/*.ttcn ${TTCN_3_DST_PATH}/LibIts/$i/ttcn
     # Update CC files
     if [ "$i" == "Common" ]
     then
@@ -342,9 +347,10 @@ find ${PATH_DEV_ITS} -type d -exec chmod 775 {} \;
 chown -R ${CHOWN_USER_GROUP} ${PATH_DEV_ITS}
 
 # Build libAsn1
-cd ${ASN1_DST_PATH}/..
-make CC=gcc
-rm -fr ${PATH_DEV_ITS}/asn1/LibIts/IS/ISO_TS_19091/original
+mkdir ${PATH_DEV_ITS}/bin/asn1
+cd ${PATH_DEV_ITS}/bin/asn1
+make CC=gcc -f ${PATH_DEV_ITS}/asn1/Makefile
+rm -fr ${PATH_DEV_ITS}/ttcn/LibIts/asn1/IS/ISO_TS_19091/original
 cd -
 if [ ! -d ${PATH_DEV_ITS}/include/asn1 ]
 then
@@ -364,4 +370,3 @@ ln -sf ${PATH_DEV_ITS}/bin/asn1/libItsAsn.so ${PATH_DEV_ITS}/lib/libItsAsn.so
 cd ${OLDPWD}
 
 exit 0
-