Move bin/gash to scripts.
* bin/gash.in: Move this... * scripts/gash.in: ...here. * configure, build-aux/build-guile.sh, makefile, check.sh, test.sh, .gitignore: Update references.
This commit is contained in:
parent
bbcb78de14
commit
c5e5a34fc0
|
@ -10,7 +10,6 @@
|
||||||
/bin/cp
|
/bin/cp
|
||||||
/bin/dirname
|
/bin/dirname
|
||||||
/bin/find
|
/bin/find
|
||||||
/bin/gash
|
|
||||||
/bin/grep
|
/bin/grep
|
||||||
/bin/ls
|
/bin/ls
|
||||||
/bin/mkdir
|
/bin/mkdir
|
||||||
|
@ -50,6 +49,7 @@ config.status
|
||||||
coverage/*
|
coverage/*
|
||||||
lcov.info
|
lcov.info
|
||||||
pre-inst-env
|
pre-inst-env
|
||||||
|
scripts/gash
|
||||||
scripts/geesh
|
scripts/geesh
|
||||||
tests/spec/oil
|
tests/spec/oil
|
||||||
tests/spec/oil-link
|
tests/spec/oil-link
|
||||||
|
|
|
@ -89,7 +89,6 @@ ${srcdest}bin/compress
|
||||||
${srcdest}bin/cp
|
${srcdest}bin/cp
|
||||||
${srcdest}bin/dirname
|
${srcdest}bin/dirname
|
||||||
${srcdest}bin/find
|
${srcdest}bin/find
|
||||||
${srcdest}bin/gash
|
|
||||||
${srcdest}bin/grep
|
${srcdest}bin/grep
|
||||||
${srcdest}bin/ls
|
${srcdest}bin/ls
|
||||||
${srcdest}bin/mkdir
|
${srcdest}bin/mkdir
|
||||||
|
@ -103,6 +102,7 @@ ${srcdest}bin/touch
|
||||||
${srcdest}bin/tr
|
${srcdest}bin/tr
|
||||||
${srcdest}bin/wc
|
${srcdest}bin/wc
|
||||||
${srcdest}bin/which
|
${srcdest}bin/which
|
||||||
|
${srcdest}scripts/gash
|
||||||
"
|
"
|
||||||
|
|
||||||
export host=$($GUILE -c "(display %host-type)")
|
export host=$($GUILE -c "(display %host-type)")
|
||||||
|
|
4
check.sh
4
check.sh
|
@ -2,7 +2,7 @@ if [ -n "$V" ]; then
|
||||||
set -x
|
set -x
|
||||||
fi
|
fi
|
||||||
DIFF=diff
|
DIFF=diff
|
||||||
SHELL=${SHELL-bin/gash}
|
SHELL=${SHELL-scripts/gash}
|
||||||
|
|
||||||
tests='
|
tests='
|
||||||
00-exit
|
00-exit
|
||||||
|
@ -172,7 +172,7 @@ fail=0
|
||||||
total=0
|
total=0
|
||||||
for t in $tests; do
|
for t in $tests; do
|
||||||
if [ "$PARSE" ]; then
|
if [ "$PARSE" ]; then
|
||||||
bin/gash -p "test/$t.sh"
|
scripts/gash -p "test/$t.sh"
|
||||||
else
|
else
|
||||||
sh test.sh "test/$t" &> test/"$t".log
|
sh test.sh "test/$t" &> test/"$t".log
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -87,8 +87,8 @@ sh
|
||||||
"
|
"
|
||||||
|
|
||||||
for shell in $SHELLS; do
|
for shell in $SHELLS; do
|
||||||
subst ${srcdest}bin/gash.in bin/$shell
|
subst ${srcdest}scripts/gash.in scripts/$shell
|
||||||
chmod +x bin/$shell
|
chmod +x scripts/$shell
|
||||||
done
|
done
|
||||||
|
|
||||||
BUILTINS="
|
BUILTINS="
|
||||||
|
|
|
@ -155,7 +155,7 @@
|
||||||
(("@GZIP@") (which "gzip"))
|
(("@GZIP@") (which "gzip"))
|
||||||
(("@XZ@") (which "xz")))
|
(("@XZ@") (which "xz")))
|
||||||
(for-each
|
(for-each
|
||||||
(lambda (s) (make-script "bin/gash.in" s)) ',shells)
|
(lambda (s) (make-script "scripts/gash.in" s)) ',shells)
|
||||||
(for-each
|
(for-each
|
||||||
(lambda (s) (make-script "bin/builtin.in" s)) ',builtins))
|
(lambda (s) (make-script "bin/builtin.in" s)) ',builtins))
|
||||||
#t))
|
#t))
|
||||||
|
@ -164,7 +164,7 @@
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
(bin (string-append out "/bin"))
|
(bin (string-append out "/bin"))
|
||||||
(libexec/gash (string-append out "/libexec/gash")))
|
(libexec/gash (string-append out "/libexec/gash")))
|
||||||
(install-file "bin/gash" bin)
|
(install-file "scripts/gash" bin)
|
||||||
(for-each
|
(for-each
|
||||||
(lambda (name)
|
(lambda (name)
|
||||||
(install-file (string-append "bin/" name) libexec/gash))
|
(install-file (string-append "bin/" name) libexec/gash))
|
||||||
|
|
12
makefile
12
makefile
|
@ -5,7 +5,7 @@ default: all
|
||||||
|
|
||||||
.config.make: makefile
|
.config.make: makefile
|
||||||
|
|
||||||
bin/gash: bin/gash.in
|
scripts/gash: scripts/gash.in
|
||||||
$(MAKE) do-configure
|
$(MAKE) do-configure
|
||||||
|
|
||||||
gash/config.scm:
|
gash/config.scm:
|
||||||
|
@ -33,21 +33,21 @@ ifneq ($(BASH),)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
check-gash: all
|
check-gash: all
|
||||||
SHELL=bin/gash ./check.sh
|
SHELL=scripts/gash ./check.sh
|
||||||
|
|
||||||
check-parse: all
|
check-parse: all
|
||||||
SHELL='bin/gash -p' PARSE=1 ./check.sh
|
SHELL='scripts/gash -p' PARSE=1 ./check.sh
|
||||||
|
|
||||||
check-geesh: all
|
check-geesh: all
|
||||||
SHELL='bin/gash --geesh' ./check.sh
|
SHELL='scripts/gash --geesh' ./check.sh
|
||||||
|
|
||||||
install: all
|
install: all
|
||||||
mkdir -p $(DESTDIR)$(bindir)
|
mkdir -p $(DESTDIR)$(bindir)
|
||||||
cp bin/gash $(DESTDIR)$(bindir)/gash
|
cp scripts/gash $(DESTDIR)$(bindir)/gash
|
||||||
mkdir -p $(DESTDIR)$(guile_site_dir)
|
mkdir -p $(DESTDIR)$(guile_site_dir)
|
||||||
tar -cf- gash/*.scm | tar -C $(DESTDIR)$(guile_site_dir) -xf-
|
tar -cf- gash/*.scm | tar -C $(DESTDIR)$(guile_site_dir) -xf-
|
||||||
mkdir -p $(DESTDIR)$(guile_site_ccache_dir)
|
mkdir -p $(DESTDIR)$(guile_site_ccache_dir)
|
||||||
cp bin/gash.go $(DESTDIR)$(guile_site_ccache_dir)
|
cp scripts/gash.go $(DESTDIR)$(guile_site_ccache_dir)
|
||||||
tar -cf- gash/*.go | tar -C $(DESTDIR)$(guile_site_ccache_dir) -xf-
|
tar -cf- gash/*.go | tar -C $(DESTDIR)$(guile_site_ccache_dir) -xf-
|
||||||
mkdir -p $(DESTDIR)$(docdir)
|
mkdir -p $(DESTDIR)$(docdir)
|
||||||
cp -f COPYING README TODO $(docdir)
|
cp -f COPYING README TODO $(docdir)
|
||||||
|
|
Loading…
Reference in New Issue