status-im
/
nimbus-build-system
mirror of https://github.com/status-im/nimbus-build-system.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

move Nim, Nim-csources and nimble submodules here

This commit is contained in:
Ștefan Talpalaru 2019-08-28 14:44:42 +02:00
parent cc71f15243
commit 705c897ee7
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
7 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitmodules vendored Normal file
View File

@ -0,0 +1,15 @@
[submodule "vendor/Nim"]
path = vendor/Nim
url = https://github.com/status-im/Nim.git
ignore = dirty
branch = nimbus
[submodule "vendor/Nim-csources"]
path = vendor/Nim-csources
url = https://github.com/nim-lang/csources.git
ignore = dirty
branch = master
[submodule "vendor/nimble"]
path = vendor/nimble
url = https://github.com/nim-lang/nimble.git
ignore = dirty
branch = master

2
makefiles/variables.mk
View File

@ -65,7 +65,7 @@ RUN_CMD_IN_ALL_REPOS = git submodule foreach --recursive --quiet 'echo -e "\n\e[
# absolute path, since it will be run at various subdirectory depths
ENV_SCRIPT := "$(CURDIR)/$(BUILD_SYSTEM_DIR)/scripts/env.sh"
# duplicated in "env.sh" to prepend NIM_DIR/bin to PATH
NIM_DIR := vendor/Nim
NIM_DIR := $(BUILD_SYSTEM_DIR)/vendor/Nim
ifeq ($(OS), Windows_NT)
EXE_SUFFIX := .exe

4
scripts/build_nim.sh
View File

@ -17,8 +17,8 @@ NIMBLE_COMMIT="c8d79fc0228682677330a9f57d14389aaa641153" # Mar 26 10:06:06 2019
# script arguments
[[ $# -ne 4 ]] && { echo "usage: $0 nim_dir csources_dir nimble_dir ci_cache_dir"; exit 1; }
NIM_DIR="$1"
CSOURCES_DIR="$2"
NIMBLE_DIR="$3"
CSOURCES_DIR="$2" # can be relative to NIM_DIR
NIMBLE_DIR="$3" # can be relative to NIM_DIR
CI_CACHE="$4"
## env vars

4
scripts/env.sh
View File

@ -12,7 +12,7 @@
#uname | grep -qi mingw && PWD_CMD="pwd -W"
# We use ${BASH_SOURCE[0]} instead of $0 to allow sourcing this file
# and we fall back to a zsh-specific special var to also support zsh.
# and we fall back to a Zsh-specific special var to also support Zsh.
export REL_PATH="$(dirname ${BASH_SOURCE[0]:-${(%):-%x}})"
export ABS_PATH="$(cd ${REL_PATH}; pwd)"
# do we still need this?
@ -26,7 +26,7 @@ export GO111MODULE=on
#- make it an absolute path, so we can call this script from other dirs
#- we can't use native Windows paths in here, because colons can't be escaped in PATH
export PATH="${ABS_PATH}/../../Nim/bin:${GOPATH}/bin:${PATH}"
export PATH="${ABS_PATH}/../vendor/Nim/bin:${GOPATH}/bin:${PATH}"
# Nimble needs this to be an absolute path
export NIMBLE_DIR="${ABS_PATH}/../../.nimble"

1
vendor/Nim vendored Submodule

@ -0,0 +1 @@
Subproject commit c6f601d48ec81e0d6e052ba0d19a195b55cc68f2

1
vendor/Nim-csources vendored Submodule

@ -0,0 +1 @@
Subproject commit b56e49bbedf62db22eb26388f98262e2948b2cbc

1
vendor/nimble vendored Submodule

@ -0,0 +1 @@
Subproject commit d15c8530cb7480ce39ffa85a2dd9819d2d4fc645