Redesign @goal_glob #34

xonixx · Aug 23, 2021 · fad6dc4 · fad6dc4
1 parent 34f106e
commit fad6dc4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/makesure.awk b/makesure.awk
@@ -198,7 +198,7 @@ function handleGoalGlob(   goal_name,priv,i) {
   } else $3 = ""
   calcGlob(trim($0))
   for (i=0; i<arrLen(GlobFiles); i++){
-    registerGoal(GlobFiles[i], priv)
+    registerGoal((goal_name ? goal_name "@" : "") GlobFiles[i], priv)
   }
 }
 

diff --git a/tests/11_goal_glob.sh b/tests/11_goal_glob.sh
@@ -11,4 +11,7 @@
 @goal test1
 @depends_on 11_goal_glob_1.txt
 @depends_on 11_goal_glob_2.txt
-@depends_on 11_goal_glob_3.txt
+@depends_on 11_goal_glob_3.txt
+
+@goal goal_name @glob 11_goal_glob*.txt
+  echo "goal_name ::: $ITEM :: $INDEX :: $TOTAL"
diff --git a/tests/11_goal_glob.tush b/tests/11_goal_glob.tush
@@ -5,6 +5,9 @@ $ cd "$MYDIR"; ./makesure -f tests/11_goal_glob.sh test1 -l
 |   11_goal_glob_2.txt - test goal_glob
 |   11_goal_glob_3.txt - test goal_glob
 |   test1
+|   goal_name@11_goal_glob_1.txt
+|   goal_name@11_goal_glob_2.txt
+|   goal_name@11_goal_glob_3.txt
 
 $ cd "$MYDIR"; ./makesure -f tests/11_goal_glob.sh test1
 |   goal '11_goal_glob_1.txt' ...