Avoid references to gap.sh

A few legit references remain. E.g. `BuildPackage.sh` uses it as a fallback for older GAP versions.
hulpke · Dec 15, 2022 · b0ba728 · b0ba728
1 parent 86bc34d
commit b0ba728
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 17 deletions.
diff --git a/Makefile.rules b/Makefile.rules
@@ -939,7 +939,7 @@ endif
 ########################################################################
 
 GAPARGS=
-TESTGAPcore = $(abs_builddir)/bin/gap.sh --quitonbreak -b -q -r $(GAPARGS)
+TESTGAPcore = $(abs_builddir)/gap --quitonbreak -b -q -r $(GAPARGS)
 TESTGAPauto = $(TESTGAPcore) -m 100m -o 1g -x 80
 TESTGAP = $(TESTGAPauto) -A
 

diff --git a/dev/bisect.sh b/dev/bisect.sh
@@ -95,6 +95,12 @@ make -j8 || exit 125
 echo "HEAD: "$(git rev-parse HEAD)
 echo "Running tests..."
 
+if [-x bin/gap.sh ] ; then
+  GAP=bin/gap.sh
+else
+  GAP=./gap
+fi
+
 echo '
 # if ErrorLevel is not defined, something is very wrong, so skip the commit
 if not IsBound(ErrorLevel) then
@@ -131,4 +137,4 @@ else
   Print("Commit is bad\\n");
   QuitGap(1);
 fi;
-' | bin/gap.sh -A -b -q
+' | ${GAP} -A -b -q
diff --git a/dev/ci-gather-coverage.sh b/dev/ci-gather-coverage.sh
@@ -12,7 +12,7 @@ set -ex
 SRCDIR=${SRCDIR:-$PWD}
 
 # Make sure any Error() immediately exits GAP with exit code 1.
-GAP="bin/gap.sh --quitonbreak --alwaystrace -q"
+GAP="./gap --quitonbreak --alwaystrace -q"
 
 # change into BUILDDIR (creating it if necessary), and turn it into an absolute path
 if [[ -n "$BUILDDIR" ]]

diff --git a/dev/ci.sh b/dev/ci.sh
@@ -10,7 +10,7 @@ set -ex
 SRCDIR=${SRCDIR:-$PWD}
 
 # Make sure any Error() immediately exits GAP with exit code 1.
-GAP="bin/gap.sh --quitonbreak"
+GAP="./gap --quitonbreak"
 
 # change into BUILDDIR (creating it if necessary), and turn it into an absolute path
 if [[ -n "$BUILDDIR" ]]

diff --git a/dev/releases/make_archives.py b/dev/releases/make_archives.py
@@ -179,7 +179,7 @@
     for x in [ ["package-infos", "PackageInfos-to-JSON"], ["help-links", "HelpLinks-to-JSON"] ]:
         notice(f"Constructing {x[0]} JSON file")
         json_output = subprocess.run(
-                ["./bin/gap.sh", "-r", "--quiet", "--quitonbreak", f"dev/releases/{x[1]}.g"],
+                ["./gap", "-r", "--quiet", "--quitonbreak", f"dev/releases/{x[1]}.g"],
                 check=True, capture_output=True, text=True)
         formatted_json = json.dumps(json.loads(json_output.stdout), indent=2)
         with working_directory(tmpdir):

diff --git a/doc/make_doc.in b/doc/make_doc.in
@@ -3,7 +3,7 @@
 set -e
 set -o pipefail
 
-GAP=@abs_top_builddir@/bin/gap.sh
+GAP=@abs_top_builddir@/gap
 GAPARGS="-b -m 1g -x 80 -q --quitonbreak"
 if [ "$1" == "nopdf" ]; then
   NOPDF=", \"nopdf\""

diff --git a/doc/ref/runexamples.g b/doc/ref/runexamples.g
@@ -19,7 +19,7 @@ for i in [1..Length(exsref)] do
        ", WS",
 ##         ", RS",
 ##         ", WSRS",
-       ");' | ../../bin/gap.sh -b -r -A -q -L wsp > ", resfile ));
+       ");' | ../../gap -b -r -A -q -L wsp > ", resfile ));
   str := StringFile(resfile);
   if str{[Length(str)-22..Length(str)]} = "# Running list 1 . . .\n" then
     RemoveFile(resfile);

diff --git a/doc/tut/runexamples.g b/doc/tut/runexamples.g
@@ -19,7 +19,7 @@ for i in [1..Length(exstut)] do
        ", WS",
 ##         ", RS",
 ##         ", WSRS",
-       ");' | ../../bin/gap.sh -b -r -A -q -L wsp > ", resfile ));
+       ");' | ../../gap -b -r -A -q -L wsp > ", resfile ));
   str := StringFile(resfile);
   if str{[Length(str)-22..Length(str)]} = "# Running list 1 . . .\n" then
     RemoveFile(resfile);

diff --git a/hpcgap/demo/intersection.g b/hpcgap/demo/intersection.g
@@ -18,31 +18,31 @@
 #     v4.7.8-1937-g27f9adb
 #     ./make.hpc GC=boehm-par GCBLKSIZE=32768 ZMQ=no
 #
-#     sh bin/gap.sh
+#     ./gap
 #     [ 1.863809, 1.059302, 1.029212, 1.016774, 1.025828, 1.002134
 #     , 1.011906, 0.990309, 1.009315, 0.975533 ] 
 #
-#     sh bin/gap.sh -m 2g
+#     ./gap -m 2g
 #     [ 1.139157, 1.140261, 1.131134, 1.141077, 1.146236, 1.154671
 #     , 1.090985, 0.918337, 0.909092, 0.914071 ]  
 #
 #     export GC_DONT_GC=1
-#     sh bin/gap.sh -m 3g
+#     ./gap -m 3g
 #
 #     [ 1.200419, 1.188618, 1.19537, 1.27388, 1.199707, 1.2004
 #     , 1.189136, 1.190223, 1.197886, 1.194482 ]
 #
 #     ./make.hpc ZMQ=no
-#     sh bin/gap.sh
+#     ./gap
 #     [ 1.177997, 1.204405, 1.148141, 1.199733, 1.15236, 1.155158
 #     , 1.155291, 1.200296, 1.149203, 1.173227 ]
 #
-#     sh bin/gap.sh -m 2g
+#     ./gap -m 2g
 #     [ 1.210171, 1.203508, 1.210213, 1.197907, 1.200302, 1.274284
 #     , 0.986507, 0.912661, 0.924253, 0.913704 ]
 #
 #     export GC_DONT_GC=1
-#     sh bin/gap.sh -m 3g
+#     ./gap -m 3g
 #     [ 1.991388, 1.166975, 1.192522, 1.183164, 1.209047, 1.199393,
 #       1.205105, 1.213722, 1.211879, 1.215503 ]
 #     

diff --git a/src/gap.c b/src/gap.c
@@ -1526,9 +1526,7 @@ void InitializeGap (
         if ( READ_GAP_ROOT("lib/init.g") == 0 ) {
                 Pr( "gap: hmm, I cannot find 'lib/init.g' maybe",
                     0, 0);
-                Pr( " use option '-l <gaproot>'?\n If you ran the GAP"
-                    " binary directly, try running the 'gap.sh' or 'gap.bat'"
-                    " script instead.", 0, 0);
+                Pr( " use option '-l <gaproot>'?", 0, 0);
             }
       }
       GAP_CATCH {