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

Git: use submodules #117

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
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
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
sc-machine
scp-machine
sc-component-manager
sc-web
ims.ostis.kb

Expand Down
12 changes: 12 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
[submodule "docs/scn"]
path = docs/scn
url = https://github.com/ostis-ai/scn-latex-plugin
[submodule "sc-machine"]
path = sc-machine
url = git@github.com:ostis-ai/sc-machine.git
branch = main
[submodule "scp-machine"]
path = scp-machine
url = git@github.com:ostis-ai/scp-machine.git
branch = main
[submodule "sc-component-manager"]
path = sc-component-manager
url = git@github.com:ostis-ai/sc-component-manager.git
branch = main
1 change: 1 addition & 0 deletions sc-component-manager
Submodule sc-component-manager added at a253e0
1 change: 1 addition & 0 deletions sc-machine
Submodule sc-machine added at ea0335
1 change: 1 addition & 0 deletions scp-machine
Submodule scp-machine added at 26fc6e
4 changes: 1 addition & 3 deletions scripts/install_minimal_platform.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ source "${SCRIPTS_DIR}/formats.sh"

stage "Install ostis-web-platform"

"${SUBMODULE_SCRIPTS_DIR}/install_sc_machine.sh"
git submodule update --init --recursive --progress
"${SCRIPTS_DIR}/install_sc_machine_dependencies.sh" --dev
"${SUBMODULE_SCRIPTS_DIR}/install_scp_machine.sh"
"${SUBMODULE_SCRIPTS_DIR}/install_sc_component_manager.sh"
"${SCRIPTS_DIR}/build_sc_machine.sh"
"${SCRIPTS_DIR}/build_scp_machine.sh"
"${SCRIPTS_DIR}/build_sc_component_manager.sh"
Expand Down
4 changes: 1 addition & 3 deletions scripts/install_submodules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,7 @@ else

cd "${PLATFORM_PATH}" && git submodule update --init --recursive

"${SUBMODULE_SCRIPTS_DIR}/install_sc_machine.sh"
"${SUBMODULE_SCRIPTS_DIR}/install_scp_machine.sh"
"${SUBMODULE_SCRIPTS_DIR}/install_sc_component_manager.sh"
git submodule update --init --recursive --progress
"${SUBMODULE_SCRIPTS_DIR}/install_sc_web.sh"
"${SUBMODULE_SCRIPTS_DIR}/install_ims_ostis_kb.sh"

Expand Down
11 changes: 0 additions & 11 deletions scripts/set_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,8 @@ export PLATFORM_PATH="${PLATFORM_PATH:-${ROOT_PATH}}"
export CONFIG_PATH="${CONFIG_PATH:-${PLATFORM_PATH}/ostis-web-platform.ini}"
export REPO_PATH="${REPO_PATH:-${PLATFORM_PATH}/repo.path}"

export SC_MACHINE_REPO="${SC_MACHINE_REPO:-https://github.com/ostis-ai/sc-machine.git}"
export SC_MACHINE_BRANCH="${SC_MACHINE_BRANCH:-main}"
export SC_MACHINE_COMMIT="${SC_MACHINE_COMMIT:-""}"
export SC_MACHINE_PATH="${SC_MACHINE_PATH:-${PLATFORM_PATH}/sc-machine}"

export SCP_MACHINE_REPO="${SCP_MACHINE_REPO:-https://github.com/ostis-ai/scp-machine.git}"
export SCP_MACHINE_BRANCH="${SCP_MACHINE_BRANCH:-main}"
export SCP_MACHINE_COMMIT="${SCP_MACHINE_COMMIT:-""}"
export SCP_MACHINE_PATH="${SCP_MACHINE_PATH:-${PLATFORM_PATH}/scp-machine}"

export SC_COMPONENT_MANAGER_REPO="${SC_COMPONENT_MANAGER_REPO:-https://github.com/ostis-ai/sc-component-manager.git}"
export SC_COMPONENT_MANAGER_BRANCH="${SC_COMPONENT_MANAGER_BRANCH:-main}"
export SC_COMPONENT_MANAGER_COMMIT="${SC_COMPONENT_MANAGER_COMMIT:-""}"
export SC_COMPONENT_MANAGER_PATH="${SC_COMPONENT_MANAGER_PATH:-${PLATFORM_PATH}/sc-component-manager}"

export SC_WEB_REPO="${SC_WEB_REPO:-https://github.com/ostis-ai/sc-web.git}"
Expand Down
12 changes: 0 additions & 12 deletions scripts/submodule-scripts/install_sc_component_manager.sh

This file was deleted.

12 changes: 0 additions & 12 deletions scripts/submodule-scripts/install_sc_machine.sh

This file was deleted.

12 changes: 0 additions & 12 deletions scripts/submodule-scripts/install_scp_machine.sh

This file was deleted.

12 changes: 0 additions & 12 deletions scripts/submodule-scripts/update_sc_component_manager.sh

This file was deleted.

12 changes: 0 additions & 12 deletions scripts/submodule-scripts/update_sc_machine.sh

This file was deleted.

12 changes: 0 additions & 12 deletions scripts/submodule-scripts/update_scp_machine.sh

This file was deleted.

Loading