Merge pull request #541 from norlab-ulaval/develop

fix: N2ST path resolution in dependencies-doc docker image
norlab-ulaval · Dec 11, 2023 · 9fdf21b · 9fdf21b
2 parents fcfed3c + e215e81
commit 9fdf21b
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 13 deletions.
diff --git a/..._over_build_matrix.bash › build&push dependencies-general dependencies (AS IN TC).run.xml b/..._over_build_matrix.bash › build&push dependencies-general dependencies (AS IN TC).run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="bash lpm_crawl_dependencies_build_matrix.bash › build&amp;push dependencies-general dependencies (AS IN TC)" type="ShConfigurationType" folderName="(A | Execute compose over build matrix)" editBeforeRun="true">
-    <option name="SCRIPT_TEXT" value="bash lpm_crawl_dependencies_build_matrix.bash --fail-fast --os-name-build-matrix-override ubuntu -- build --push dependencies-general dependencies" />
+  <configuration default="false" name="bash lpm_crawl_dependencies_build_matrix.bash › build&amp;push dependencies-general dependencies (AS IN TC)" type="ShConfigurationType" folderName="(A | Execute compose over build matrix)">
+    <option name="SCRIPT_TEXT" value="bash lpm_crawl_dependencies_build_matrix.bash --fail-fast --os-name-build-matrix-override ubuntu -- build --push dependencies-doc" />
     <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
     <option name="SCRIPT_PATH" value="" />
     <option name="SCRIPT_OPTIONS" value="" />

diff --git a/build_system/docker-compose.dependencies.yaml b/build_system/docker-compose.dependencies.yaml
@@ -33,7 +33,7 @@ services:
     image: ${NBS_DOCKERHUB_NAMESPACE:?err}/libpointmatcher-dependencies-doc:${NBS_IMAGE_TAG:?err}
     build:
       context: ..
-      dockerfile: ubuntu/Dockerfile.dependencies.doxygen
+      dockerfile: ./build_system/ubuntu/Dockerfile.dependencies.doxygen
       platforms:
         - "linux/amd64"
         - "linux/arm64/v8"

diff --git a/build_system/lpm_utility_script/lpm_bashrc_config.bash b/build_system/lpm_utility_script/lpm_bashrc_config.bash
@@ -21,7 +21,8 @@ function lpm::configure_bashrc() {
 
   # ....Helper function..............................................................................................
   # import shell functions from utilities library
-  source "${LPM_PATH}/build_system/utilities/norlab-shell-script-tools/import_norlab_shell_script_tools_lib.bash"
+  N2ST_PATH=${N2ST_PATH:-"${LPM_PATH}/build_system/utilities/norlab-shell-script-tools"}
+  source "${N2ST_PATH}/import_norlab_shell_script_tools_lib.bash"
 
   # ====Begin======================================================================================
   print_formated_script_header 'lpm_bashrc_config.bash' "${NBS_LINE_CHAR_UTIL}"

diff --git a/build_system/lpm_utility_script/lpm_create_multiarch_docker_builder.bash b/build_system/lpm_utility_script/lpm_create_multiarch_docker_builder.bash
@@ -22,7 +22,8 @@ function lpm::create_multiarch_docker_builder() {
 
   # ....Helper function..............................................................................................
   # import shell functions from utilities library
-  source "${LPM_PATH}/build_system/utilities/norlab-shell-script-tools/import_norlab_shell_script_tools_lib.bash"
+  N2ST_PATH=${N2ST_PATH:-"${LPM_PATH}/build_system/utilities/norlab-shell-script-tools"}
+  source "${N2ST_PATH}/import_norlab_shell_script_tools_lib.bash"
 
   # ====Begin======================================================================================
   print_formated_script_header 'lpm_create_multiarch_docker_builder.bash'

diff --git a/build_system/lpm_utility_script/lpm_export_which_architecture.bash b/build_system/lpm_utility_script/lpm_export_which_architecture.bash
@@ -38,7 +38,8 @@ function lpm::export_which_architecture() {
 
   # ....Helper function..............................................................................................
   # import shell functions from utilities library
-  source "${LPM_PATH}/build_system/utilities/norlab-shell-script-tools/import_norlab_shell_script_tools_lib.bash"
+  N2ST_PATH=${N2ST_PATH:-"${LPM_PATH}/build_system/utilities/norlab-shell-script-tools"}
+  source "${N2ST_PATH}/import_norlab_shell_script_tools_lib.bash"
 
   # ====Begin======================================================================================
   #print_formated_script_header 'lpm_export_which_architecture.bash' "${NBS_LINE_CHAR_UTIL}"

diff --git a/build_system/lpm_utility_script/lpm_install_docker_tools.bash b/build_system/lpm_utility_script/lpm_install_docker_tools.bash
@@ -22,7 +22,8 @@ function lpm::install_docker_tools() {
 
   # ....Helper function..............................................................................................
   # import shell functions from utilities library
-  source "${LPM_PATH}/build_system/utilities/norlab-shell-script-tools/import_norlab_shell_script_tools_lib.bash"
+  N2ST_PATH=${N2ST_PATH:-"${LPM_PATH}/build_system/utilities/norlab-shell-script-tools"}
+  source "${N2ST_PATH}/import_norlab_shell_script_tools_lib.bash"
 
   # ====Begin======================================================================================
   print_formated_script_header 'lpm_install_docker_tools.bash'

diff --git a/build_system/ubuntu/Dockerfile.dependencies b/build_system/ubuntu/Dockerfile.dependencies
@@ -10,6 +10,7 @@ ENV NBS_LIB_INSTALL_PATH=${NBS_LIB_INSTALL_PATH:?'Build argument needs to be set
 ENV NBS_REPOSITORY_NAME=${NBS_REPOSITORY_NAME:?'Build argument needs to be set and non-empty.'}
 
 ENV NBS_PATH=${NBS_LIB_INSTALL_PATH}/norlab-build-system
+ENV N2ST_PATH=${NBS_LIB_INSTALL_PATH}/norlab-shell-script-tools
 
 ARG NBS_SUPERPROJECT_BUILD_SYSTEM_DIR
 ENV NBS_SUPERPROJECT_BUILD_SYSTEM_DIR=${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR:-"${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR}"}
@@ -59,6 +60,7 @@ RUN apt-get update && \
 # ....Install norlab-build-system library..........................................................
 WORKDIR "${NBS_LIB_INSTALL_PATH}"
 RUN git clone --recurse-submodules https://github.com/norlab-ulaval/norlab-build-system.git
+RUN git clone --recurse-submodules https://github.com/norlab-ulaval/norlab-shell-script-tools.git
 
 # ====Begin========================================================================================
 
@@ -69,7 +71,7 @@ COPY ./.git ./.git
 WORKDIR "${NBS_LIB_INSTALL_PATH}/${NBS_REPOSITORY_NAME}/${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR}"
 
 #COPY ./${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR}/utilities/norlab-build-system ./utilities/norlab-build-system/
-COPY ./${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR}/utilities/norlab-shell-script-tools ./utilities/norlab-shell-script-tools/
+#COPY ./${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR}/utilities/norlab-shell-script-tools ./utilities/norlab-shell-script-tools/
 
 COPY ./${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR}/.env .
 

diff --git a/build_system/ubuntu/lpm_execute_libpointmatcher_unittest.bash b/build_system/ubuntu/lpm_execute_libpointmatcher_unittest.bash
@@ -21,7 +21,8 @@ set +o allexport
 
 # ....Helper function..............................................................................
 # import shell functions from utilities library
-source "${LPM_PATH}/build_system/utilities/norlab-shell-script-tools/import_norlab_shell_script_tools_lib.bash"
+N2ST_PATH=${N2ST_PATH:-"${LPM_PATH}/build_system/utilities/norlab-shell-script-tools"}
+source "${N2ST_PATH}/import_norlab_shell_script_tools_lib.bash"
 
 # ====Begin========================================================================================
 print_formated_script_header 'lpm_execute_libpointmatcher_unittest.bash' ':'

diff --git a/build_system/ubuntu/lpm_install_dependencies_general_ubuntu.bash b/build_system/ubuntu/lpm_install_dependencies_general_ubuntu.bash
@@ -23,7 +23,8 @@ set +o allexport
 
 # ....Helper function..............................................................................
 # import shell functions from utilities library
-source "${LPM_PATH}/build_system/utilities/norlab-shell-script-tools/import_norlab_shell_script_tools_lib.bash"
+N2ST_PATH=${N2ST_PATH:-"${LPM_PATH}/build_system/utilities/norlab-shell-script-tools"}
+source "${N2ST_PATH}/import_norlab_shell_script_tools_lib.bash"
 
 # Set environment variable NBS_IMAGE_ARCHITECTURE
 source "${LPM_PATH}/build_system/lpm_utility_script/lpm_export_which_architecture.bash"

diff --git a/build_system/ubuntu/lpm_install_dependencies_libnabo_ubuntu.bash b/build_system/ubuntu/lpm_install_dependencies_libnabo_ubuntu.bash
@@ -28,7 +28,8 @@ set +o allexport
 
 # ....Helper function..............................................................................
 # import shell functions from utilities library
-source "${LPM_PATH}/build_system/utilities/norlab-shell-script-tools/import_norlab_shell_script_tools_lib.bash"
+N2ST_PATH=${N2ST_PATH:-"${LPM_PATH}/build_system/utilities/norlab-shell-script-tools"}
+source "${N2ST_PATH}/import_norlab_shell_script_tools_lib.bash"
 
 # Set environment variable NBS_IMAGE_ARCHITECTURE
 source "${LPM_PATH}/build_system/lpm_utility_script/lpm_export_which_architecture.bash"

diff --git a/build_system/ubuntu/lpm_install_doc_dependencies_ubuntu.bash b/build_system/ubuntu/lpm_install_doc_dependencies_ubuntu.bash
@@ -16,14 +16,16 @@ TMP_CWD=$(pwd)
 LPM_PATH=$(git rev-parse --show-toplevel)
 cd "${LPM_PATH}/build_system" || exit
 
+
 # ....Load environment variables from file.........................................................
 set -o allexport
 source .env
 set +o allexport
 
 # ....Helper function..............................................................................
 # import shell functions from utilities library
-source "${LPM_PATH}/build_system/utilities/norlab-shell-script-tools/import_norlab_shell_script_tools_lib.bash"
+N2ST_PATH=${N2ST_PATH:-"${LPM_PATH}/build_system/utilities/norlab-shell-script-tools"}
+source "${N2ST_PATH}/import_norlab_shell_script_tools_lib.bash"
 
 # Set environment variable NBS_IMAGE_ARCHITECTURE
 source "${LPM_PATH}/build_system/lpm_utility_script/lpm_export_which_architecture.bash"

diff --git a/build_system/ubuntu/lpm_install_libpointmatcher_ubuntu.bash b/build_system/ubuntu/lpm_install_libpointmatcher_ubuntu.bash
@@ -55,7 +55,8 @@ set +o allexport
 
 # ....Helper function..............................................................................
 # import shell functions from utilities library
-source "${LPM_PATH}/build_system/utilities/norlab-shell-script-tools/import_norlab_shell_script_tools_lib.bash"
+N2ST_PATH=${N2ST_PATH:-"${LPM_PATH}/build_system/utilities/norlab-shell-script-tools"}
+source "${N2ST_PATH}/import_norlab_shell_script_tools_lib.bash"
 
 # Set environment variable NBS_IMAGE_ARCHITECTURE
 source "${LPM_PATH}/build_system/lpm_utility_script/lpm_export_which_architecture.bash"