Update install location and tags

sdnfv · Aug 27, 2024 · e823acd · e823acd
1 parent 7ca9af2
commit e823acd
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -59,4 +59,7 @@ env
 **/insstall/**
 
 # Submodules
-/subprojects/dpdk-kmods/*
+/subprojects/dpdk-kmods/*
+
+# Output directories
+/bin
diff --git a/examples/meson.build b/examples/meson.build
@@ -38,8 +38,8 @@ foreach example : onvm_examples
         sources,
         include_directories: includes,
         dependencies: [onvm_dpdk_shared_dep, onvm_nflib_dep],
-        install_tag: name,
         install: true,
-        install_dir: onvm_source + '/examples/' + example
+        install_tag: 'onvm',
+        install_dir: onvm_output_dir + '/nf/' + example
     )
 endforeach
diff --git a/meson.build b/meson.build
@@ -4,6 +4,9 @@ add_global_arguments('-msse4', language : 'c')
 cc = meson.get_compiler('c')
 onvm_source = meson.current_source_dir()
 
+# Output directory that executables are installed into
+onvm_output_dir = meson.current_source_dir() + '/bin'
+
 # ONVM configurations
 onvm_mgr_app_name = 'onvm_mgr'
 

diff --git a/onvm/lib/meson.build b/onvm/lib/meson.build
@@ -6,7 +6,9 @@ libonvmhelper = library(
     'libonvmhelper', 
     sources,
     include_directories : libonvmhelper_includes,
-    install: true
+    install: true,
+    install_tag: 'onvm',
+    install_dir: onvm_output_dir + '/lib'
 )
 
 libonvmhelper_dep = declare_dependency(

diff --git a/onvm/onvm_mgr/meson.build b/onvm/onvm_mgr/meson.build
@@ -14,6 +14,6 @@ executable(onvm_mgr_app_name,
     include_directories: [onvm_mgr_include, onvm_includes], 
     dependencies: [onvm_dpdk_shared_dep, libonvm_dep, libonvmhelper_dep, onvm_math_dep],
     install: true,
-    install_dir: onvm_source + '/onvm/onvm_mgr',
-    install_tag: 'onvm_mgr'
+    install_tag: 'onvm',
+    install_dir: onvm_output_dir,
 )
diff --git a/onvm/onvm_nflib/meson.build b/onvm/onvm_nflib/meson.build
@@ -22,7 +22,9 @@ libonvm = library(
     sources, 
     include_directories : libonvm_includes,
     dependencies : libonvm_deps,
-    install: true)
+    install: true,
+    install_tag: 'onvm',
+    install_dir: onvm_output_dir + '/lib')
 
 libonvm_dep = declare_dependency(
     link_with: libonvm,

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+meson build
+ninja -C build
+meson install -C build --tags=onvm
diff --git a/scripts/start.sh b/scripts/start.sh
@@ -272,7 +272,7 @@ fi
 sudo rm -rf /mnt/huge/rtemap_*
 # watch out for variable expansion
 # shellcheck disable=SC2086
-sudo ./onvm/onvm_mgr/onvm_mgr -l "$cpu" -n 4 --proc-type=primary ${virt_addr} -- -p ${ports} -n ${nf_cores} ${num_srvc} ${def_srvc} ${stats} ${stats_sleep_time} ${verbosity_level} ${ttl} ${packet_limit} ${shared_cpu_flag} ${jumbo_frames_flag}
+sudo ./bin/onvm_mgr -l "$cpu" -n 4 --proc-type=primary ${virt_addr} -- -p ${ports} -n ${nf_cores} ${num_srvc} ${def_srvc} ${stats} ${stats_sleep_time} ${verbosity_level} ${ttl} ${packet_limit} ${shared_cpu_flag} ${jumbo_frames_flag}
 
 if [ "${stats}" = "-s web" ]
 then