[llvm-commits] CVS: llvm/win32/dobison.cmd doflex.cmd

[Jeff Cohen]

Changes in directory llvm/win32:

dobison.cmd updated: 1.1 -> 1.2
doflex.cmd updated: 1.1 -> 1.2
---
Log message:

Fine tune Visual Studio's use of bison/flex.

---
Diffs of the changes:  (+19 -18)

 dobison.cmd |   20 ++++++++++----------
 doflex.cmd  |   17 +++++++++--------
 2 files changed, 19 insertions(+), 18 deletions(-)


Index: llvm/win32/dobison.cmd
diff -u llvm/win32/dobison.cmd:1.1 llvm/win32/dobison.cmd:1.2
--- llvm/win32/dobison.cmd:1.1	Wed Oct 26 00:37:35 2005
+++ llvm/win32/dobison.cmd	Wed Oct 26 20:10:37 2005
@@ -7,16 +7,16 @@
 
 if "%2"=="debug" (set flags=-tvdo) else (set flags=-vdo)
 
-rem Try and run bison.  If it is present, great.
-bison -p%1 %flags%%3.cpp %4
-if errorlevel 1 goto error
-move %3.hpp %3.h
-goto done
+rem Test for presence of bison.
+bison --help >NUL
+if errorlevel 1 goto nobison
 
-:error
-echo Bison could not run.  Using pre-generated files.
+rem Run bison.
+bison -p%1 %flags%%3.cpp %4 && move %3.hpp %3.h
+exit
+
+:nobison
+echo Bison not found.  Using pre-generated files.
 copy %~pn4.cpp %3.cpp
 copy %~pn4.h %3.h
-
-:done
-exit 0
+exit


Index: llvm/win32/doflex.cmd
diff -u llvm/win32/doflex.cmd:1.1 llvm/win32/doflex.cmd:1.2
--- llvm/win32/doflex.cmd:1.1	Wed Oct 26 00:37:35 2005
+++ llvm/win32/doflex.cmd	Wed Oct 26 20:10:37 2005
@@ -6,14 +6,15 @@
 
 if "%1"=="debug" (set flags=-t) else (set flags=-t)
 
-rem Try and run flex.  If it is present, great.
+rem Test for presence of flex.
+flex --help >NUL
+if errorlevel 1 goto noflex
+
+rem Run flex.
 flex %flags% >%2.cpp %3
-if errorlevel 1 goto error
-goto done
+exit
 
-:error
-echo Flex could not run.  Using pre-generated files.
+:noflex
+echo Flex not found.  Using pre-generated files.
 copy %~pn3.cpp %2.cpp
-
-:done
-exit 0
+exit