diff options
| author | Patrick Spek <p.spek@tyil.nl> | 2020-03-26 12:58:25 +0100 |
|---|---|---|
| committer | Patrick Spek <p.spek@tyil.nl> | 2020-03-26 12:58:25 +0100 |
| commit | 3ef3c08fa8f60c38916cd0db61732d197d6c3cda (patch) | |
| tree | a772743329d7595ddd21c4d0a31e7946c2ba107a | |
| parent | a59a1d377fcb97557ab01b72d383dbf57ea74536 (diff) | |
Move dist files around
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | lib/actions/dist.bash | 2 | ||||
| -rw-r--r-- | lib/actions/fetch.bash | 10 | ||||
| -rw-r--r-- | lib/actions/install.bash | 8 |
4 files changed, 11 insertions, 10 deletions
@@ -4,4 +4,5 @@ bin lib/libmoar.so include share +src tmp diff --git a/lib/actions/dist.bash b/lib/actions/dist.bash index 4b49167..9c23046 100644 --- a/lib/actions/dist.bash +++ b/lib/actions/dist.bash @@ -27,7 +27,7 @@ action() { done # Include the sources of all components - for src in dist/src/* + for src in src/* do dist_include "/$src" done diff --git a/lib/actions/fetch.bash b/lib/actions/fetch.bash index 55167c9..8582865 100644 --- a/lib/actions/fetch.bash +++ b/lib/actions/fetch.bash @@ -9,7 +9,7 @@ RSTAR_DEPS_BIN+=( action() { # Ensure the directory to download to exists - mkdir -p "$BASEDIR/dist/src/core" + mkdir -p "$BASEDIR/src" # Download all core components for component in moarvm nqp rakudo @@ -17,7 +17,7 @@ action() { download_core "$component" done - mkdir -p "$BASEDIR/dist/src/modules" + mkdir -p "$BASEDIR/src/rakudo-star-modules" # Download all modules available over http list_modules "http" | while read -r name _ url prefix @@ -39,7 +39,7 @@ download_core() { version="$(config_etc_kv "dist_$1.txt" "version")" source="$(config_etc_kv "dist_$1.txt" "url" | sed "s/%s/$version/g")" - destination="$BASEDIR/dist/src/core/$1-$version" + destination="$BASEDIR/src/$1-$version" if [[ -d $destination ]] then @@ -61,7 +61,7 @@ download_module_git() { local name=$1 local url=$2 local ref=$3 - local destination="$BASEDIR/dist/src/modules/$name" + local destination="$BASEDIR/src/rakudo-star-modules/$name" if [[ -d "$destination" ]] then @@ -80,7 +80,7 @@ download_module_http() { local name=$1 local url=$2 local prefix=$3 - local destination="$BASEDIR/dist/src/modules/$name" + local destination="$BASEDIR/src/rakudo-star-modules/$name" local tarball local extracted diff --git a/lib/actions/install.bash b/lib/actions/install.bash index 8f6993b..19cac9a 100644 --- a/lib/actions/install.bash +++ b/lib/actions/install.bash @@ -59,7 +59,7 @@ action() { do info "Installing $module" - install_raku_module "$BASEDIR/dist/src/modules/$module" \ + install_raku_module "$BASEDIR/src/rakudo-star-modules/$module" \ && continue failed_modules+=("$module") @@ -92,7 +92,7 @@ action() { build_moarvm() { info "Starting build on MoarVM" - build_prepare "$BASEDIR/dist/src/core/moarvm-$VERSION" || return + build_prepare "$BASEDIR/src/moarvm-$VERSION" || return perl Configure.pl \ "$@" \ && make \ @@ -103,7 +103,7 @@ build_moarvm() { build_nqp() { info "Starting build on NQP" - build_prepare "$BASEDIR/dist/src/core/nqp-$VERSION" || return + build_prepare "$BASEDIR/src/nqp-$VERSION" || return perl Configure.pl \ --backend="$RSTAR_BACKEND" \ "$@" \ @@ -115,7 +115,7 @@ build_nqp() { build_rakudo() { info "Starting build on Rakudo" - build_prepare "$BASEDIR/dist/src/core/rakudo-$VERSION" || return + build_prepare "$BASEDIR/src/rakudo-$VERSION" || return perl Configure.pl \ --backend="$RSTAR_BACKEND" \ "$@" \ |