Commit 355afd5a authored by garciay's avatar garciay
Browse files

Add LibCommon patch for TITAN

parent 1516bdce

scripts/merge_emcom_project.bash

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ if [ ! -d ${VAGRANT_DIR} ] 
then

  exit -1

else

  VAGRANT_DIR=$VAGRANT_DIR/to_be_merged

  VAGRANT_DIR=${VAGRANT_DIR}/to_be_merged

  if [ -d ${VAGRANT_DIR} ]

  then

      rm -f ${VAGRANT_DIR}/*
@@ -23,12 +23,12 @@ else 
      mkdir ${VAGRANT_DIR}

  fi

fi

chmod 775 ${VAGRANT_DIR}



# Execution path

RUN_PATH="${0%/*}"

PATH_DEV_EMCOM=`pwd`/../etsi_emcom





# Update ETSI Framework files

echo 'Merging ETSI Framework files'

FWK_SRC_PATH=${SRC_EMCOM_PATH}/ccsrc

scripts/update_emcom_project.bash

+6 −4
Original line number Diff line number Diff line
@@ -130,8 +130,7 @@ do 
        cp ${TTCN_3_ORG_PATH}/$i/xsd/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn

        cp ${CC_SRC_PATH}/include/$i/*.hh ${TTCN_3_DST_PATH}/$i/include

        cp ${CC_SRC_PATH}/src/$i/*.cc ${TTCN_3_DST_PATH}/$i/src

    fi

    if [ "$i" == "LibSip" ]

    elif [ "$i" == "LibSip" ]

    then

        cp ${TTCN_3_ORG_PATH}/$i/ttcn/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn

        cp ${TTCN_3_ORG_PATH}/$i/xsd/*.xsd ${TTCN_3_DST_PATH}/$i/xsd
@@ -143,8 +142,7 @@ do 
        cp ${CC_SRC_PATH}/src/$i/*.cc ${TTCN_3_DST_PATH}/$i/src

        # Patch TITAN due to issues in xsd2ttcn

        cp ${SRC_EMCOM_PATH}/ttcn/patch_sip_titan/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn

    fi

    if [ "$i" == "LibHttp" ]

    elif [ "$i" == "LibHttp" ]

    then

        cp ${TTCN_3_ORG_PATH}/$i/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn

        cp ${CC_SRC_PATH}/EncDec/$i/*_Encdec.cc ${TTCN_3_DST_PATH}/$i/src
@@ -154,6 +152,10 @@ do 
        cp ${CC_SRC_PATH}/src/$i/*.cc ${TTCN_3_DST_PATH}/$i/src

        # Patch due to svn/gitlab moving

        cp ${SRC_EMCOM_PATH}/ttcn/patch_lib_http/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn

    elif [ "$i" == "LibCommon" ]

    then

        # Patch TITAN due to issues in xsd2ttcn

        cp ${SRC_EMCOM_PATH}/ttcn/patch_lib_common_titan/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn

    fi

done

ttcn/patch_lib_common_titan/LibCommon_Sync.ttcn

0 → 100644
+1358 −0

File added.

Preview size limit exceeded, changes collapsed.