Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[scripts] Use common scripts from ostis-scripts #92

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[submodule "scripts/ostis-scripts"]
path = scripts/ostis-scripts
url = https://github.com/ostis-ai/ostis-scripts.git

[submodule "docs/scn"]
path = docs/scn
url = https://github.com/ostis-ai/scn-latex-plugin
Expand Down
1 change: 1 addition & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Use common scripts to build project from ostis-scripts
- Make sc-component-manager as shared library
- Separated envs from envs of sc-machine
- Replace ExecutionResult with bool and update logging.
Expand Down
11 changes: 6 additions & 5 deletions scripts/build_sc_component_manager.sh
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
#!/usr/bin/env bash
set -eo pipefail

CURRENT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)
source "${CURRENT_DIR}/formats.sh"
CURRENT_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd)"
OSTIS_SCRIPTS_DIR="${CURRENT_DIR}/ostis-scripts"
source "${OSTIS_SCRIPTS_DIR}/message-scripts/messages.sh"

if [[ -z "${SC_COMPONENT_MANAGER_CMAKE_PATH}" || -z "${SC_COMPONENT_MANAGER_CXX_SOURCES_PATH}"
|| -z "${SC_COMPONENT_MANAGER_BUILD_PATH}" || -z "${BINARY_PATH}" ]];
then
source "${CURRENT_DIR}/set_vars.sh"
fi

stage "Build sc-component-manager"
info "Build sc-component-manager"

BUILD_SCRIPTS="${SC_COMPONENT_MANAGER_CMAKE_PATH}/../sc-machine/scripts/build-scripts"
BUILD_SCRIPTS="${OSTIS_SCRIPTS_DIR}/build-scripts"
"${BUILD_SCRIPTS}/build_cxx_project.sh" -p "${SC_COMPONENT_MANAGER_CMAKE_PATH}" -s "${SC_COMPONENT_MANAGER_CXX_SOURCES_PATH}" \
-b "${SC_COMPONENT_MANAGER_BUILD_PATH}" --cmake-arg "-DSC_BIN_PATH=${BINARY_PATH}" "$@"

stage "sc-component-manager is built successfully"
info "sc-component-manager is built successfully"
4 changes: 0 additions & 4 deletions scripts/formats.sh

This file was deleted.

1 change: 1 addition & 0 deletions scripts/ostis-scripts
Submodule ostis-scripts added at c07441
Loading