dist: add installer experimental option: --skip=[server|nativelib]

project-tsurugi · Jun 24, 2024 · 246bff6 · 246bff6
1 parent bf693c6
commit 246bff6
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 29 deletions.
diff --git a/dist/install/install-nativelib.sh b/dist/install/install-nativelib.sh
@@ -0,0 +1,27 @@
+#!/bin/bash -e
+
+if [ "${TG_VERBOSE_INSTALL}" = "ON" ]; then
+  set -x
+fi
+
+echo -e "\n[Install Tsubakuro Native Library]"
+cd ${TG_TSUBAKURO_DIR}
+if [ -f "${TG_INSTALL_BASE_DIR}/.install/TSUBAKURO_VERSION" ]; then
+  _TSUBAKURO_LIBRARY_VERSION=$(cat "${TG_INSTALL_BASE_DIR}/.install/TSUBAKURO_VERSION")
+else
+  _TSUBAKURO_LIBRARY_VERSION=$(git -C ${TG_TSUBAKURO_DIR} log --pretty="format:%H" -1 HEAD)
+fi
+cd modules/ipc/src/main/native
+if [ "clean" = "${TG_CLEAN_BUILD}" ]; then
+  rm -fr build
+fi
+mkdir -p build
+cd build
+cmake -G Ninja -DCMAKE_BUILD_TYPE=${TG_CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="${TG_CMAKE_CXX_FLAGS_RELWITHDEBINFO}" -DCMAKE_PREFIX_PATH="${TG_INSTALL_DIR}" -DCMAKE_INSTALL_PREFIX="${TG_INSTALL_DIR}" -DTSUBAKURO_LIBRARY_VERSION=${_TSUBAKURO_LIBRARY_VERSION} ${TG_COMMON_CMAKE_BUILD_OPTIONS} ..
+cmake --build . --target install --parallel ${TG_CMAKE_BUILD_PARALLEL} -- ${TG_COMMON_BUILD_TOOL_OPTIONS}
+
+if [ "${TG_VERBOSE_INSTALL}" = "ON" ]; then
+  set +x
+fi
+
+echo "$(basename $0) successful."
diff --git a/dist/install/install-server.sh b/dist/install/install-server.sh
@@ -197,22 +197,6 @@ cd build
 cmake -G Ninja -DCMAKE_BUILD_TYPE=${TG_CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="${TG_CMAKE_CXX_FLAGS_RELWITHDEBINFO}" -DBUILD_TESTS=OFF -DSHARKSFIN_IMPLEMENTATION=shirakami -DOGAWAYAMA=${OPT_OGAWAYAMA} -DFORCE_INSTALL_RPATH=ON -DCMAKE_PREFIX_PATH="${TG_INSTALL_DIR}" -DCMAKE_INSTALL_PREFIX="${TG_INSTALL_DIR}" -DENABLE_JEMALLOC=${TG_ENABLE_JEMALLOC} ${TG_COMMON_CMAKE_BUILD_OPTIONS} ..
 cmake --build . --target install --parallel ${TG_CMAKE_BUILD_PARALLEL} -- ${TG_COMMON_BUILD_TOOL_OPTIONS}
 
-echo -e "\n[Install Tsubakuro Native Library]"
-cd ${TG_TSUBAKURO_DIR}
-if [ -f "${TG_INSTALL_BASE_DIR}/.install/TSUBAKURO_VERSION" ]; then
-  _TSUBAKURO_LIBRARY_VERSION=$(cat "${TG_INSTALL_BASE_DIR}/.install/TSUBAKURO_VERSION")
-else
-  _TSUBAKURO_LIBRARY_VERSION=$(git -C ${TG_TSUBAKURO_DIR} log --pretty="format:%H" -1 HEAD)
-fi
-cd modules/ipc/src/main/native
-if [ "clean" = "${TG_CLEAN_BUILD}" ]; then
-  rm -fr build
-fi
-mkdir -p build
-cd build
-cmake -G Ninja -DCMAKE_BUILD_TYPE=${TG_CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="${TG_CMAKE_CXX_FLAGS_RELWITHDEBINFO}" -DCMAKE_PREFIX_PATH="${TG_INSTALL_DIR}" -DCMAKE_INSTALL_PREFIX="${TG_INSTALL_DIR}" -DTSUBAKURO_LIBRARY_VERSION=${_TSUBAKURO_LIBRARY_VERSION} ${TG_COMMON_CMAKE_BUILD_OPTIONS} ..
-cmake --build . --target install --parallel ${TG_CMAKE_BUILD_PARALLEL} -- ${TG_COMMON_BUILD_TOOL_OPTIONS}
-
 if [ "${TG_VERBOSE_INSTALL}" = "ON" ]; then
   set +x
 fi

diff --git a/dist/install/install.sh b/dist/install/install.sh
@@ -96,22 +96,28 @@ echo "------------------------------------"
 mkdir -p "${TG_INSTALL_DIR}"
 cp --preserve=timestamps "${TG_INSTALL_BASE_DIR}/BUILDINFO.md" ${TG_INSTALL_DIR}
 
-if "${MAKE_TSURUGI_BASE}"; then
-  mkdir -p "${TSURUGI_BASE}/etc"
-  cp --preserve=timestamps "${_SCRIPTS_DIR}/conf/tsurugi.ini" ${TSURUGI_BASE}/etc
+if [[ ! ${TG_SKIP_INSTALL} == *"server"* ]]; then
+  if "${MAKE_TSURUGI_BASE}"; then
+    mkdir -p "${TSURUGI_BASE}/etc"
+    cp --preserve=timestamps "${_SCRIPTS_DIR}/conf/tsurugi.ini" ${TSURUGI_BASE}/etc
+
+    mkdir -p "${TSURUGI_BASE}/data"
+    if [ "$EUID" -eq 0 ]; then
+      chmod -R o+w "${TSURUGI_BASE}/data"
+    fi
+  fi
+
+  ${_SCRIPTS_DIR}/install-server.sh
 
-  mkdir -p "${TSURUGI_BASE}/data"
-  if [ "$EUID" -eq 0 ]; then
-    chmod -R o+w "${TSURUGI_BASE}/data"
+  if [ -f "${TG_INSTALL_BASE_DIR}/.install/tsurugi-info.json" ]; then
+    cp -a "${TG_INSTALL_BASE_DIR}/.install/tsurugi-info.json" "${TG_INSTALL_DIR}/lib"
+  else
+    ${_SCRIPTS_DIR}/generate-tsurugi-info.sh > "${TG_INSTALL_DIR}/lib/tsurugi-info.json"
   fi
 fi
 
-${_SCRIPTS_DIR}/install-server.sh
-
-if [ -f "${TG_INSTALL_BASE_DIR}/.install/tsurugi-info.json" ]; then
-  cp -a "${TG_INSTALL_BASE_DIR}/.install/tsurugi-info.json" "${TG_INSTALL_DIR}/lib"
-else
-  ${_SCRIPTS_DIR}/generate-tsurugi-info.sh > "${TG_INSTALL_DIR}/lib/tsurugi-info.json"
+if [[ ! ${TG_SKIP_INSTALL} == *"nativelib"* ]]; then
+  ${_SCRIPTS_DIR}/install-nativelib.sh
 fi
 
 if [[ ! ${TG_SKIP_INSTALL} == *"tanzawa"* ]]; then
@@ -126,7 +132,9 @@ if [ -f "${_SCRIPTS_DIR}/install-dist-java.sh" ]; then
   ${_SCRIPTS_DIR}/install-dist-java.sh
 fi
 
-chmod +x ${TG_INSTALL_DIR}/bin/*
+if [ -d "${TG_INSTALL_DIR}/bin" ]; then
+  chmod +x ${TG_INSTALL_DIR}/bin/*
+fi
 
 if [ "${_SYMBOLIC}" = "ON" ]; then
   cd "${_INSTALL_PREFIX}"