code review comments + re-test

cmake_targets/build_oai

@@ -707,7 +707,7 @@ function main() {
 
     # generate USIM data
     if [ -f $dbin/conf2uedata ]; then
-      install_nas_tools $conf_nvram_path $gen_nvram_path
+      install_nas_tools $conf_nvram_path $gen_nvram_path "$dlog/conf2uedata.txt"
       echo_info "Copying UE specific part to $DIR/$build_dir/build"
       cp -Rvf $dbin/.ue_emm.nvram0 $DIR/$build_dir/build
       cp -Rvf $dbin/.ue.nvram0 $DIR/$build_dir/build

cmake_targets/install_external_packages.ubuntu20

@@ -452,17 +452,6 @@ install_asn1c_from_source(){
     ) > "$asn1_install_log" 2>&1
 }
 
-#################################################
-# 2. compile
-################################################
-
-install_nas_tools() {
-    echo_success "generate .ue_emm.nvram .ue.nvram"
-    ./nvram --gen -c "$1" -o "$2"
-    ./usim --gen -c "$1" -o "$2"
-}
-
-
 ################################
 # set_openair_env
 ###############################

cmake_targets/nas_sim_tools/CMakeLists.txt

@@ -15,6 +15,7 @@ set(CMAKE_C_FLAGS
 set(OPENAIR_DIR     $ENV{OPENAIR_DIR})
 set(OPENAIR3_DIR    $ENV{OPENAIR_DIR}/openair3)
 include_directories (${OPENAIR_DIR}/openair2/COMMON)
+include_directories (${OPENAIR_DIR})
 
 set(CONF2UEDATA_LIB_SRC
     ${OPENAIR_DIR}/openair3/NAS/TOOLS/conf_emm.c

cmake_targets/tools/build_helper

@@ -901,7 +901,7 @@ install_nas_tools() {
 
   if [ ! -f .usim.nvram0 ]; then
     echo_success "generate .usim.nvram"
-    ./usim --gen -c $1 -o $2
+    ./usim --gen -c $1 -o $2 > "$3"
   else
     [ ./usim -nt .usim.nvram0 ] && ./usim --gen -c $1 -o $2
   fi