[lmi-commits] [lmi] odd/multiarch da7b85f 10/10: Rename set_arch.sh -> set_toolchain.sh

[Greg Chicares]

branch: odd/multiarch
commit da7b85f5fe6bb2aa9c035d04c3b7a1f556ff0510
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Rename set_arch.sh -> set_toolchain.sh
---
 GNUmakefile                     | 4 ++--
 INSTALL                         | 2 +-
 gui_test.sh                     | 2 +-
 gwc/.zshrc                      | 2 +-
 install_msw.sh                  | 2 +-
 msw_generic.make                | 2 +-
 nychthemeral_test.sh            | 2 +-
 run.sh                          | 2 +-
 set_arch.sh => set_toolchain.sh | 6 +++---
 tabs/5/startup_script           | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 5198549..ec62791 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -84,7 +84,7 @@ MAKEFLAGS := \
 # more closely, changing the value of $(datadir), and perhaps using
 # some other standard directories that are commented out for now.
 
-# alternative to 'set_arch.sh'
+# alternative to 'set_toolchain.sh'
 LMI_COMPILER ?= gcc
 LMI_TRIPLET  ?= i686-w64-mingw32
 
@@ -189,7 +189,7 @@ gpl_files := \
 # the 'make' command line to override any definition of the same
 # variable in $(local_options).
 
-# alternative to 'set_arch.sh'
+# alternative to 'set_toolchain.sh'
 export PATH := $(localbindir):$(locallibdir):$(PATH)
 
 MAKETARGET = \
diff --git a/INSTALL b/INSTALL
index 79d6756..a285fbc 100644
--- a/INSTALL
+++ b/INSTALL
@@ -79,7 +79,7 @@ Installation proceeds silently for anywhere from a few 
minutes to a couple
 of hours, depending on your computer. When you see "Finished building lmi",
 copy and paste these lines into the shell:
 
-  export LMI_COMPILER=gcc ; export LMI_TRIPLET=i686-w64-mingw32 ; . 
./set_arch.sh
+  export LMI_COMPILER=gcc ; export LMI_TRIPLET=i686-w64-mingw32 ; . 
./set_toolchain.sh
   /opt/lmi/bin/lmi_wx_shared --data_path=/opt/lmi/data
 
 You should see lmi's GUI. Try "File | New | Illustration", then press "OK";
diff --git a/gui_test.sh b/gui_test.sh
index 3a386bc..4a3cbfd 100755
--- a/gui_test.sh
+++ b/gui_test.sh
@@ -36,7 +36,7 @@ set -e
 # provides no convenient alternative):
 setopt PIPE_FAIL
 
-. ./set_arch.sh
+. ./set_toolchain.sh
 
 lmi_build_type=$(/usr/share/libtool/build-aux/config.guess)
 case "$lmi_build_type" in
diff --git a/gwc/.zshrc b/gwc/.zshrc
index dea0c97..234f5db 100644
--- a/gwc/.zshrc
+++ b/gwc/.zshrc
@@ -3,7 +3,7 @@
 export LMI_COMPILER=gcc
 export LMI_TRIPLET=i686-w64-mingw32
 
-# To work with lmi, it is important to source 'set_arch.sh'. It's
+# To work with lmi, it is crucial to source 'set_toolchain.sh'. It's
 # deliberately not sourced here, so that it can assume that some
 # things have already been set up: for instance, it assumes that
 #   /usr/share/libtool/build-aux/config.guess
diff --git a/install_msw.sh b/install_msw.sh
index b895bc8..1575870 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -210,7 +210,7 @@ do
 
     find /cache_for_lmi/downloads -type f | xargs md5sum
 
-    . ./set_arch.sh
+    . ./set_toolchain.sh
 # Alternative:
 #   export 
PATH=/opt/lmi/"${LMI_COMPILER}_${LMI_TRIPLET}"/local/bin:/opt/lmi/"${LMI_COMPILER}_${LMI_TRIPLET}"/local/lib:$minimal_path
 
diff --git a/msw_generic.make b/msw_generic.make
index 33b55a5..5a67b79 100644
--- a/msw_generic.make
+++ b/msw_generic.make
@@ -35,7 +35,7 @@ PERFORM := wine
 
 # $(winebindir) is where 'install_miscellanea.make' places 'md5sum.exe'.
 
-# alternative to 'set_arch.sh'
+# alternative to 'set_toolchain.sh'
 w0 := $(shell winepath -w $(localbindir) | sed -e's/\\/\\\\/g')
 w1 := $(shell winepath -w $(locallibdir) | sed -e's/\\/\\\\/g')
 w2 := $(shell winepath -w $(winebindir)  | sed -e's/\\/\\\\/g')
diff --git a/nychthemeral_test.sh b/nychthemeral_test.sh
index 62c7be8..97844f0 100755
--- a/nychthemeral_test.sh
+++ b/nychthemeral_test.sh
@@ -36,7 +36,7 @@ set -e
 # provides no convenient alternative):
 setopt PIPE_FAIL
 
-. ./set_arch.sh
+. ./set_toolchain.sh
 
 coefficiency=${coefficiency:-"--jobs=$(nproc)"}
 
diff --git a/run.sh b/run.sh
index 1c2d967..aaf33e2 100755
--- a/run.sh
+++ b/run.sh
@@ -22,5 +22,5 @@
 # snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
 set -e
-. ./set_arch.sh
+. ./set_toolchain.sh
 exec "$@"
diff --git a/set_arch.sh b/set_toolchain.sh
similarity index 97%
rename from set_arch.sh
rename to set_toolchain.sh
index bdd96d5..54b7caa 100755
--- a/set_arch.sh
+++ b/set_toolchain.sh
@@ -21,15 +21,15 @@
 # email: <address@hidden>
 # snail: Chicares, 186 Belle Woods Drive, Glastonbury CT 06033, USA
 
-# Invoke as ". ./set_arch.sh" without the quotes.
+# Invoke as ". ./set_toolchain.sh" without the quotes.
 #
 # $LMI_COMPILER and $LMI_TRIPLET can be overridden at the command
 # line, e.g.:
 #
 #   export LMI_COMPILER
 #   export LMI_TRIPLET
-#   LMI_COMPILER=gcc ; LMI_TRIPLET=i686-w64-mingw32 ; . ./set_arch.sh
-#   LMI_COMPILER=gcc ; LMI_TRIPLET=x86_64-w64-mingw32 ; . ./set_arch.sh
+#   LMI_COMPILER=gcc ; LMI_TRIPLET=i686-w64-mingw32 ; . ./set_toolchain.sh
+#   LMI_COMPILER=gcc ; LMI_TRIPLET=x86_64-w64-mingw32 ; . ./set_toolchain.sh
 #
 # where the 'export' commands need be run only once, presumably in a
 # shell startup file.
diff --git a/tabs/5/startup_script b/tabs/5/startup_script
index bc7ed26..52d0a86 100755
--- a/tabs/5/startup_script
+++ b/tabs/5/startup_script
@@ -3,7 +3,7 @@
 a='schroot --chroot=cross-lmi'
 
 b='cd /opt/lmi/bin'
-c='LMI_TRIPLET=i686-w64-mingw32 ; LMI_COMPILER=gcc ; . 
/opt/lmi/src/lmi/set_arch.sh'
+c='LMI_TRIPLET=i686-w64-mingw32 ; LMI_COMPILER=gcc ; . 
/opt/lmi/src/lmi/set_toolchain.sh'
 d='wine ./lmi_wx_shared --ash_nazg --data_path=/opt/lmi/data'
 e='/opt/lmi/src/lmi/gui_test.sh'