Redesign @goal_glob #34

xonixx · Aug 23, 2021 · 94e833a · 94e833a
1 parent 1bb39bb
commit 94e833a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/makesure.awk b/makesure.awk
@@ -31,8 +31,7 @@ BEGIN {
 "@options"    == $1 { handleOptions();    next }
 "@define"     == $1 { handleDefine();     next }
 "@shell"      == $1 { handleShell();      next }
-"@goal"       == $1 { handleGoal();       next }
-"@goal_glob"  == $1 { handleGoalGlob();   next }
+"@goal"       == $1 { if ("@glob" == $2 || "@glob" == $3) handleGoalGlob(); else handleGoal(); next }
 "@doc"        == $1 { handleDoc();        next }
 "@depends_on" == $1 { handleDependsOn();  next }
 "@reached_if" == $1 { handleReachedIf();  next }
@@ -193,6 +192,10 @@ function parseGoalLine(   priv) {
 function handleGoalGlob(   goal_name,priv,i) {
   started("goal_glob")
   priv = parseGoalLine()
+  goal_name = $2; $2 = ""
+  if ("@glob" == goal_name) {
+    goal_name = ""
+  } else $3 = ""
   calcGlob(trim($0))
   for (i=0; i<arrLen(GlobFiles); i++){
     registerGoal(GlobFiles[i], priv)

diff --git a/tests/14_doc.sh b/tests/14_doc.sh
@@ -6,6 +6,6 @@
 @depends_on a
 @doc doc for b
 
-@goal_glob 14_doc.tush
+@goal @glob 14_doc.tush
 @depends_on a b
 @doc doc for glob
diff --git a/tests/14_doc_multi2.sh b/tests/14_doc_multi2.sh
@@ -1,4 +1,4 @@
 
-@goal_glob 14_doc.tush
+@goal @glob 14_doc.tush
 @doc d1
 @doc d2
diff --git a/tests/15_private.sh b/tests/15_private.sh
@@ -5,8 +5,8 @@ echo a
 @goal b @private
 echo b
 
-@goal_glob 15_private.sh
+@goal @glob 15_private.sh
 echo $ITEM
 
-@goal_glob 15_private.tush @private
+@goal @glob 15_private.tush @private
 echo $ITEM