Skip to content

Commit

Permalink
Release 0.9.14 #80
Browse files Browse the repository at this point in the history
  • Loading branch information
@xonixx
xonixx committed Nov 21, 2021
1 parent 16c7a25 commit 6dc7485
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 54 deletions.
2 changes: 1 addition & 1 deletion Makesurefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

@define NEXT_VERSION="0.9.13"
@define NEXT_VERSION="0.9.14"
@define TUSH_REPO=https://github.com/adolfopa/tush

@define GOAWK_VERSION=1.9.1
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ By default, all scripts inside goals are executed with `bash`. If you want to us

```
$ ./makesure -h
makesure ver. 0.9.13
makesure ver. 0.9.14
Usage: makesure [options...] [-f buildfile] [goals...]
-f,--file buildfile
set buildfile to use (default Makesurefile)
Expand Down
59 changes: 33 additions & 26 deletions makesure
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
if command -v gawk >/dev/null;then makesure_awk='gawk -ltime -v Gawk=1';makesure_pre='';else makesure_awk=awk;makesure_pre='function gettimeofday(){}';fi
exec $makesure_awk -v "Version=0.9.13" -v "Prog=$0" "$makesure_pre"'
exec $makesure_awk -v "Version=0.9.14" -v "Prog=$0" "$makesure_pre"'
BEGIN {
Shell = "bash"
SupportedShells["bash"]
Expand All @@ -17,23 +17,27 @@ BEGIN {
prepareArgs()
MyDirScript = "MYDIR=" quoteArg(getMyDir(ARGV[1])) ";export MYDIR;cd \"$MYDIR\""
Error=""
makesure()
}
function makesure() {
while (getline > 0) {
Lines[NR]=$0
if ($1 ~ /^@/ && "@define" != $1) reparseCli()
if ("@options" == $1) handleOptions()
else if ("@define" == $1) handleDefine()
else if ("@shell" == $1) handleShell()
else if ("@goal" == $1) { if ("@glob" == $2 || "@glob" == $3) handleGoalGlob(); else handleGoal() }
else if ("@doc" == $1) handleDoc()
else if ("@depends_on" == $1) handleDependsOn()
else if ("@reached_if" == $1) handleReachedIf()
else if ("@lib" == $1) handleLib()
else if ("@use_lib" == $1) handleUseLib()
else if ($1 ~ /^@/) addError("Unknown directive: " $1)
else handleCodeLine($0)
}
doWork()
realExit(0)
}
{
Lines[NR]=$0
if ($1 ~ /^@/ && "@define" != $1) reparseCli()
if ("@options" == $1) handleOptions()
else if ("@define" == $1) handleDefine()
else if ("@shell" == $1) handleShell()
else if ("@goal" == $1) { if ("@glob" == $2 || "@glob" == $3) handleGoalGlob(); else handleGoal() }
else if ("@doc" == $1) handleDoc()
else if ("@depends_on" == $1) handleDependsOn()
else if ("@reached_if" == $1) handleReachedIf()
else if ("@lib" == $1) handleLib()
else if ("@use_lib" == $1) handleUseLib()
else if ($1 ~ /^@/) addError("Unknown directive: " $1)
else handleCodeLine($0)
}
END { if (!Died) doWork() }
function prepareArgs( i,arg) {
for (i = 2; i < ARGC; i++) {
arg = ARGV[i]
Expand Down Expand Up @@ -274,13 +278,16 @@ function registerReachedIf(goalName, preScript) {
$1 = ""
ReachedIf[goalName] = preScript trim($0)
}
function checkBeforeRun( i,dep,depCnt,goalName) {
for (goalName in GoalsByName) {
function checkBeforeRun( i,j,dep,depCnt,goalName,visited) {
for (i = 0; i in GoalNames; i++) {
goalName = GoalNames[i]
if (visited[goalName]++)
continue
depCnt = DependenciesCnt[goalName]
for (i=0; i < depCnt; i++) {
dep = Dependencies[goalName, i]
for (j=0; j < depCnt; j++) {
dep = Dependencies[goalName, j]
if (!(dep in GoalsByName))
addError("Goal " quote2(goalName,1) " has unknown dependency '\''" dep "'\''", DependenciesLineNo[goalName, i])
addError("Goal " quote2(goalName,1) " has unknown dependency '\''" dep "'\''", DependenciesLineNo[goalName, j])
}
if (goalName in GoalToLib) {
if (!(GoalToLib[goalName] in Lib))
Expand Down Expand Up @@ -336,7 +343,7 @@ body,goalBody,goalBodies,resolvedGoals,exitCode, t0,t1,t2, goalTimed, list) {
goalName = GoalNames[i]
body = trim(Code[goalName])
reachedIf = ReachedIf[goalName]
reachedGoals[goalName] = reachedIf ? checkConditionReached(definesLine[0], reachedIf) : 0
reachedGoals[goalName] = reachedIf ? checkConditionReached(goalName, definesLine[0], reachedIf) : 0
emptyGoals[goalName] = length(body) == 0
depCnt = DependenciesCnt[goalName]
for (j=0; j < depCnt; j++) {
Expand Down Expand Up @@ -386,7 +393,6 @@ body,goalBody,goalBodies,resolvedGoals,exitCode, t0,t1,t2, goalTimed, list) {
if (exitCode != 0)
realExit(exitCode)
}
realExit(0)
}
}
function resolveGoalsToRun(result, i, goalName, loop) {
Expand All @@ -409,7 +415,6 @@ function checkGoalOnly() { if ("goal" != Mode && "goal_glob" != Mode) addError("
function currentGoalName() { return isPrelude() ? "" : arrLast(GoalNames) }
function currentLibName() { return arrLast(LibNames) }
function realExit(code) {
Died = 1
if (DefinesFile)
rm(DefinesFile)
exit code
Expand All @@ -421,8 +426,10 @@ function die(msg, out) {
close(out)
realExit(1)
}
function checkConditionReached(definesLine, conditionStr, script) {
function checkConditionReached(goalName, definesLine, conditionStr, script) {
script = definesLine
if (goalName in GoalToLib)
script = script "\n" Lib[GoalToLib[goalName]]
script = script "\n" conditionStr
return shellExec(script) == 0
}
Expand Down
59 changes: 33 additions & 26 deletions makesure_candidate
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
if command -v gawk >/dev/null;then makesure_awk='gawk -ltime -v Gawk=1';makesure_pre='';else makesure_awk=awk;makesure_pre='function gettimeofday(){}';fi
exec $makesure_awk -v "Version=0.9.13" -v "Prog=$0" "$makesure_pre"'
exec $makesure_awk -v "Version=0.9.14" -v "Prog=$0" "$makesure_pre"'
BEGIN {
Shell = "bash"
SupportedShells["bash"]
Expand All @@ -17,23 +17,27 @@ BEGIN {
prepareArgs()
MyDirScript = "MYDIR=" quoteArg(getMyDir(ARGV[1])) ";export MYDIR;cd \"$MYDIR\""
Error=""
makesure()
}
function makesure() {
while (getline > 0) {
Lines[NR]=$0
if ($1 ~ /^@/ && "@define" != $1) reparseCli()
if ("@options" == $1) handleOptions()
else if ("@define" == $1) handleDefine()
else if ("@shell" == $1) handleShell()
else if ("@goal" == $1) { if ("@glob" == $2 || "@glob" == $3) handleGoalGlob(); else handleGoal() }
else if ("@doc" == $1) handleDoc()
else if ("@depends_on" == $1) handleDependsOn()
else if ("@reached_if" == $1) handleReachedIf()
else if ("@lib" == $1) handleLib()
else if ("@use_lib" == $1) handleUseLib()
else if ($1 ~ /^@/) addError("Unknown directive: " $1)
else handleCodeLine($0)
}
doWork()
realExit(0)
}
{
Lines[NR]=$0
if ($1 ~ /^@/ && "@define" != $1) reparseCli()
if ("@options" == $1) handleOptions()
else if ("@define" == $1) handleDefine()
else if ("@shell" == $1) handleShell()
else if ("@goal" == $1) { if ("@glob" == $2 || "@glob" == $3) handleGoalGlob(); else handleGoal() }
else if ("@doc" == $1) handleDoc()
else if ("@depends_on" == $1) handleDependsOn()
else if ("@reached_if" == $1) handleReachedIf()
else if ("@lib" == $1) handleLib()
else if ("@use_lib" == $1) handleUseLib()
else if ($1 ~ /^@/) addError("Unknown directive: " $1)
else handleCodeLine($0)
}
END { if (!Died) doWork() }
function prepareArgs( i,arg) {
for (i = 2; i < ARGC; i++) {
arg = ARGV[i]
Expand Down Expand Up @@ -274,13 +278,16 @@ function registerReachedIf(goalName, preScript) {
$1 = ""
ReachedIf[goalName] = preScript trim($0)
}
function checkBeforeRun( i,dep,depCnt,goalName) {
for (goalName in GoalsByName) {
function checkBeforeRun( i,j,dep,depCnt,goalName,visited) {
for (i = 0; i in GoalNames; i++) {
goalName = GoalNames[i]
if (visited[goalName]++)
continue
depCnt = DependenciesCnt[goalName]
for (i=0; i < depCnt; i++) {
dep = Dependencies[goalName, i]
for (j=0; j < depCnt; j++) {
dep = Dependencies[goalName, j]
if (!(dep in GoalsByName))
addError("Goal " quote2(goalName,1) " has unknown dependency '\''" dep "'\''", DependenciesLineNo[goalName, i])
addError("Goal " quote2(goalName,1) " has unknown dependency '\''" dep "'\''", DependenciesLineNo[goalName, j])
}
if (goalName in GoalToLib) {
if (!(GoalToLib[goalName] in Lib))
Expand Down Expand Up @@ -336,7 +343,7 @@ body,goalBody,goalBodies,resolvedGoals,exitCode, t0,t1,t2, goalTimed, list) {
goalName = GoalNames[i]
body = trim(Code[goalName])
reachedIf = ReachedIf[goalName]
reachedGoals[goalName] = reachedIf ? checkConditionReached(definesLine[0], reachedIf) : 0
reachedGoals[goalName] = reachedIf ? checkConditionReached(goalName, definesLine[0], reachedIf) : 0
emptyGoals[goalName] = length(body) == 0
depCnt = DependenciesCnt[goalName]
for (j=0; j < depCnt; j++) {
Expand Down Expand Up @@ -386,7 +393,6 @@ body,goalBody,goalBodies,resolvedGoals,exitCode, t0,t1,t2, goalTimed, list) {
if (exitCode != 0)
realExit(exitCode)
}
realExit(0)
}
}
function resolveGoalsToRun(result, i, goalName, loop) {
Expand All @@ -409,7 +415,6 @@ function checkGoalOnly() { if ("goal" != Mode && "goal_glob" != Mode) addError("
function currentGoalName() { return isPrelude() ? "" : arrLast(GoalNames) }
function currentLibName() { return arrLast(LibNames) }
function realExit(code) {
Died = 1
if (DefinesFile)
rm(DefinesFile)
exit code
Expand All @@ -421,8 +426,10 @@ function die(msg, out) {
close(out)
realExit(1)
}
function checkConditionReached(definesLine, conditionStr, script) {
function checkConditionReached(goalName, definesLine, conditionStr, script) {
script = definesLine
if (goalName in GoalToLib)
script = script "\n" Lib[GoalToLib[goalName]]
script = script "\n" conditionStr
return shellExec(script) == 0
}
Expand Down

0 comments on commit 6dc7485

Please sign in to comment.