Parameterized goals #115 fix failing with gawk

xonixx · Jan 21, 2023 · 7dbae83 · 7dbae83
1 parent f6be1b7
commit 7dbae83
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Makesurefile b/Makesurefile
@@ -197,15 +197,15 @@ in_begin && $1 ~ /^split/ { next }
 
 @goal tested_gawk51 @private
 @depends_on installed_gawk51
-  AWKLIBPATH="$(pwd)/soft/gawk51_libs" AWK="$(pwd)/soft/gawk51" ./makesure tested
+  MAKESURE_AWKLIBPATH="$(pwd)/soft/gawk51_libs" AWK="$(pwd)/soft/gawk51" ./makesure tested
 
 @goal tested_gawk511 @private
 @depends_on installed_gawk511
-  AWKLIBPATH="$(pwd)/soft/gawk511_libs" AWK="$(pwd)/soft/gawk511" ./makesure tested
+  MAKESURE_AWKLIBPATH="$(pwd)/soft/gawk511_libs" AWK="$(pwd)/soft/gawk511" ./makesure tested
 
 @goal tested_gawk521 @private
 @depends_on installed_gawk521
-  AWKLIBPATH="$(pwd)/soft/gawk521_libs" AWK="$(pwd)/soft/gawk521" ./makesure tested
+  MAKESURE_AWKLIBPATH="$(pwd)/soft/gawk521_libs" AWK="$(pwd)/soft/gawk521" ./makesure tested
 
 @goal tested_goawk @private
 @depends_on installed_goawk

diff --git a/makesure.awk b/makesure.awk
@@ -413,7 +413,7 @@ body,goalBody,goalBodies,resolvedGoals,exitCode, t0,t1,t2, goalTimed, list) {
 
     topologicalSort(0,GoalNames) # first do topological sort disregarding @reached_if to catch loops
 
-    instantiateGoals()
+#    instantiateGoals()
 
 #    printDepsTree("a")
 

diff --git a/makesure_dev b/makesure_dev
@@ -11,6 +11,10 @@ AWK_DIR="$mydir"
 
 if awk 'BEGIN { exit index(ENVIRON["AWK"],"gawk")>0 ? 0 : 1 }'
 then
+  if [ -n $MAKESURE_AWKLIBPATH ]
+  then
+    export AWKLIBPATH="$MAKESURE_AWKLIBPATH"
+  fi
   exec $AWK $AWK_OPTS -v "Version=$NEXT_VERSION" -v "Prog=$0" -v Gawk=1 -l time -f "$AWK_DIR/makesure.awk" Makesurefile "$@"
 else
   exec $AWK $AWK_OPTS -v "Version=$NEXT_VERSION" -v "Prog=$0" -f "$AWK_DIR/mawk_ext.awk" -f "$AWK_DIR/makesure.awk" Makesurefile "$@"