Permalink
Browse files

Fixes parser failure due to variable named input; and fixes scripts t…

…o detect this more easily
  • Loading branch information...
TimLethbridge committed Jun 23, 2017
1 parent 5490dc5 commit a7bf2caad74de0af2a7cb74c467481d5572fd302
Showing with 13 additions and 5 deletions.
  1. +1 −1 UmpleParser/src/GrammarParsing.ump
  2. +6 −2 dev-tools/bumple
  3. +6 −2 dev-tools/fbumple
@@ -309,7 +309,7 @@ class GrammarAnalyzer
File file = null;
//filename of the file to be parsed
input = null;
String input = null;
//if a balanced rule is created, it needs to know if the current context is nospaces or not
noSpaces = false;
View
@@ -15,11 +15,15 @@ echo This should take 2-5 minutes. Do not interrupt.
echo You should always have done 'git pull' before running this and resolved conflicts
set logfile="/tmp/umplebuildlog$$.txt"
ant -Dmyenv=$buildenv | tee $logfile
grep -qi failed $logfile
if ($status == 0) then
set failedstatus=$status
grep -qi 'Error ' $logfile
if ($status == 0 || $failedstatus == 0) then
echo "************************"
echo Script bumple ended ABNORMALLY at $UMPLEROOT
echo The word FAILED was found in the above. Build was NOT SUCCESSFUL.
echo The word FAILED or ERROR was found in the above. Build was NOT SUCCESSFUL.
echo Build log is at $logfile
echo Test log can be opened in a web browser at $UMPLEROOT/dist/qa/index.php
else
View
@@ -15,11 +15,15 @@ echo This should take 1-2 minutes and does not run tests. Do not interrupt. Then
echo You should always have done 'git pull' before running this and resolved conflicts
set logfile="/tmp/umplebuildlog$$.txt"
ant -Dmyenv=$buildenv first-build | tee $logfile
grep -qi failed $logfile
if ($status == 0) then
set failedstatus=$status
grep -qi 'Error ' $logfile
if ($status == 0 || $failedstatus == 0) then
echo "************************"
echo Script fbumple ended ABNORMALLY at $UMPLEROOT
echo The word FAILED was found in the above. Build was NOT SUCCESSFUL.
echo The word FAILED or Error was found in the above. First Build was NOT SUCCESSFUL.
echo Build log is at $logfile
else
rm $logfile

0 comments on commit a7bf2ca

Please sign in to comment.