aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-04-22 12:45:50 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-04-22 12:45:50 +0200
commit3ea6e51b28a06ad4c8b70e9f4d206a56e4771027 (patch)
treefa51f54b2ed460b5544ac0153389d1380e991189
parent1fc77270c6af777adb80e1df917da7dc36c75d14 (diff)
Rename directory/option environment to environments
To be consistent with machines/ and toolchains/
-rw-r--r--bbot/worker.cli2
-rw-r--r--bbot/worker.cxx4
-rwxr-xr-xetc/bootstrap/bbot-bootstrap-macos.sh2
-rw-r--r--etc/bootstrap/bbot-bootstrap-msvc.bat4
-rw-r--r--etc/bootstrap/bbot-bootstrap.service4
-rwxr-xr-xetc/bootstrap/bbot-bootstrap.sh10
-rwxr-xr-xetc/environments/default (renamed from etc/environment/default)2
-rw-r--r--etc/environments/default-msvc.bat (renamed from etc/environment/default-msvc.bat)2
-rw-r--r--tests/integration/testscript4
-rw-r--r--tests/worker/startup.test6
10 files changed, 20 insertions, 20 deletions
diff --git a/bbot/worker.cli b/bbot/worker.cli
index 61d3f4c..56c7c6b 100644
--- a/bbot/worker.cli
+++ b/bbot/worker.cli
@@ -69,7 +69,7 @@ namespace bbot
current working directory is used."
}
- dir_path --environment
+ dir_path --environments
{
"<dir>",
"The directory containing the environment setup executables. If not
diff --git a/bbot/worker.cxx b/bbot/worker.cxx
index 25ceede..382e334 100644
--- a/bbot/worker.cxx
+++ b/bbot/worker.cxx
@@ -551,8 +551,8 @@ try
//
try
{
- env_dir = ops.environment_specified ()
- ? ops.environment ()
+ env_dir = ops.environments_specified ()
+ ? ops.environments ()
: dir_path::home_directory ();
if (!dir_exists (env_dir))
diff --git a/etc/bootstrap/bbot-bootstrap-macos.sh b/etc/bootstrap/bbot-bootstrap-macos.sh
index e0a8ac7..8fee3b9 100755
--- a/etc/bootstrap/bbot-bootstrap-macos.sh
+++ b/etc/bootstrap/bbot-bootstrap-macos.sh
@@ -3,7 +3,7 @@
# open -a Terminal -n -F ~/bbot-bootstrap-macos.sh
if ~/bbot-bootstrap.sh --cxx clang++ --build /tmp \
- --environment "$HOME/environment"; then
+ --environments "$HOME/environments"; then
sleep 2
sudo shutdown -h now
fi
diff --git a/etc/bootstrap/bbot-bootstrap-msvc.bat b/etc/bootstrap/bbot-bootstrap-msvc.bat
index 4b60f5d..b502c7b 100644
--- a/etc/bootstrap/bbot-bootstrap-msvc.bat
+++ b/etc/bootstrap/bbot-bootstrap-msvc.bat
@@ -12,7 +12,7 @@ set "VCVARS=%MSVC%\VC\Auxiliary\Build\vcvars64.bat"
set "BUILD=C:\tmp"
set "INSTALL=C:\build2"
set "BOOTSTRAP=C:\bootstrap"
-set "ENVIRONMENT=C:\environment"
+set "ENVIRONMENTS=C:\environments"
set "TFTP=196.254.111.222"
rem set "TFTP=10.1.0.1:55123"
@@ -22,7 +22,7 @@ rem If we already have the bbot worker, assume we are bootstrapped.
rem
if exist %INSTALL%\bin\bbot-worker.exe (
set "PATH=%INSTALL%\bin;%PATH%"
- bbot-worker.exe --startup --build %BUILD% --environment %ENVIRONMENT%^
+ bbot-worker.exe --startup --build %BUILD% --environments %ENVIRONMENTS%^
--tftp-host %TFTP% --verbose %VERBOSE%
goto end
)
diff --git a/etc/bootstrap/bbot-bootstrap.service b/etc/bootstrap/bbot-bootstrap.service
index ecb0da4..8ff2aab 100644
--- a/etc/bootstrap/bbot-bootstrap.service
+++ b/etc/bootstrap/bbot-bootstrap.service
@@ -15,12 +15,12 @@ WorkingDirectory=/home/build
Environment=CXX=g++
Environment=BUILD=/tmp
-Environment=ENVIRONMENT=/home/build/environment
+Environment=ENVIRONMENTS=/home/build/environments
ExecStart=/usr/local/bin/bbot-bootstrap.sh \
--cxx ${CXX} \
--build ${BUILD} \
- --environment ${ENVIRONMENT}
+ --environments ${ENVIRONMENTS}
StandardInput=tty-force
StandardOutput=inherit
diff --git a/etc/bootstrap/bbot-bootstrap.sh b/etc/bootstrap/bbot-bootstrap.sh
index 9473abe..9e7ace8 100755
--- a/etc/bootstrap/bbot-bootstrap.sh
+++ b/etc/bootstrap/bbot-bootstrap.sh
@@ -35,7 +35,7 @@ run ()
#
cxx=g++
build=/tmp
-environment="$HOME/environment"
+environments="$HOME/environments"
# Parse options.
#
@@ -57,12 +57,12 @@ while test $# -ne 0; do
build="$1"
shift
;;
- --environment)
+ --environments)
shift
if test $# -eq 0; then
- error "missing environment directory after --environment"
+ error "missing environments directory after --environments"
fi
- environment="$1"
+ environments="$1"
shift
;;
*)
@@ -90,7 +90,7 @@ export PATH
# If we already have the bbot worker, assume we are bootstrapped.
#
if bbot-worker --version >/dev/null 2>&1; then
- exec bbot-worker --startup --build "$build" --environment "$environment" \
+ exec bbot-worker --startup --build "$build" --environments "$environments" \
--tftp-host "$tftp" --verbose "$verbose"
fi
diff --git a/etc/environment/default b/etc/environments/default
index 82107f6..f4a19aa 100755
--- a/etc/environment/default
+++ b/etc/environments/default
@@ -1,6 +1,6 @@
#!/bin/sh
-# file : etc/environment/default
+# file : etc/environments/default
# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
# license : TBC; see accompanying LICENSE file
diff --git a/etc/environment/default-msvc.bat b/etc/environments/default-msvc.bat
index 64c325d..40ec364 100644
--- a/etc/environment/default-msvc.bat
+++ b/etc/environments/default-msvc.bat
@@ -1,6 +1,6 @@
@echo off
-rem file : etc/environment/default-msvc.bat
+rem file : etc/environments/default-msvc.bat
rem copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
rem license : TBC; see accompanying LICENSE file
diff --git a/tests/integration/testscript b/tests/integration/testscript
index f43bf02..bf66324 100644
--- a/tests/integration/testscript
+++ b/tests/integration/testscript
@@ -93,6 +93,6 @@ a = $0
EOI
chmod ugo+x default;
sleep $wait;
- $w --verbose 3 --startup --tftp-host $tftp --environment \
- &$machine/*** &manifest $~ 2>|
+ $w --verbose 3 --startup --tftp-host $tftp --environments $~ \
+ &$machine/*** &manifest 2>|
}
diff --git a/tests/worker/startup.test b/tests/worker/startup.test
index d13e6c5..1cf5d3c 100644
--- a/tests/worker/startup.test
+++ b/tests/worker/startup.test
@@ -42,7 +42,7 @@ cat <<EOI >=manifest;
repository: https://pkg.example.org/1/
machine: linux-gcc
EOI
-$* --environment $~ --tftp-host "$tftp/$@" 2>>"EOE" != 0;
+$* --environments $~ --tftp-host "$tftp/$@" 2>>"EOE" != 0;
error: no environment setup executable in $representation($~) for target ''
EOE
diff -u - manifest <<EOO
@@ -68,7 +68,7 @@ cat <<EOI >=manifest;
machine: linux-gcc
target: x86_64-linux-gnu
EOI
-$* --environment $~ --tftp-host "$tftp/$@" 2>>"EOE" != 0;
+$* --environments $~ --tftp-host "$tftp/$@" 2>>"EOE" != 0;
environment setup failed
error: process $~/x86_64-linux-gnu terminated with non-zero exit code
EOE
@@ -95,7 +95,7 @@ cat <<EOI >=manifest;
machine: linux-gcc
target: x86_64-linux-gnu
EOI
-$* --environment $~ --tftp-host "$tftp/$@" 2>>"EOE"
+$* --environments $~ --tftp-host "$tftp/$@" 2>>"EOE"
x86_64-linux-gnu
$0
EOE