[Nhibernate-commit] SF.net SVN: nhibernate:[5667] trunk/nhibernate

[<pa...@us...>]

Revision: 5667
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5667&view=rev
Author:   patearl
Date:     2011-04-11 17:04:42 +0000 (Mon, 11 Apr 2011)

Log Message:
-----------
Improved ANTLR batch files and menus.

Modified Paths:
--------------
    trunk/nhibernate/ShowBuildMenu.bat
    trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHql.bat
    trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlDebug.bat
    trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlSqlWalker.bat
    trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlSqlWalkerDebug.bat
    trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGenerator.bat

Added Paths:
-----------
    trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGeneratorDebug.bat

Modified: trunk/nhibernate/ShowBuildMenu.bat
===================================================================
--- trunk/nhibernate/ShowBuildMenu.bat	2011-04-11 11:41:09 UTC (rev 5666)
+++ trunk/nhibernate/ShowBuildMenu.bat	2011-04-11 17:04:42 UTC (rev 5667)
@@ -122,32 +122,36 @@
 echo C.  Regenerate SqlGenerator.cs from SqlGenerator.g.
 echo D.  Regenerate Hql.g in debug mode.
 echo E.  Regenerate HqlSqlWalker.g in debug mode.
-echo H.  Quick instructions on using debug mode.
+echo F.  Regenerate SqlGenerator.g in debug mode.
+echo G.  Quick instructions on using debug mode.
 echo.
 
 if exist %SYSTEMROOT%\System32\choice.exe ( goto grammar-prompt-choice )
 goto grammar-prompt-set
 
 :grammar-prompt-choice
-choice /C:abcde
+choice /C:abcdefg
 
 if errorlevel 255 goto end
-if errorlevel 5 goto antlr-debug
-if errorlevel 4 goto antlr-hqlsqlwalker-debug
-if errorlevel 3 goto antlr-hql-debug
+if errorlevel 7 goto antlr-debug
+if errorlevel 6 goto antlr-sqlgenerator-debug
+if errorlevel 5 goto antlr-hqlsqlwalker-debug
+if errorlevel 4 goto antlr-hql-debug
+if errorlevel 3 goto antlr-sqlgenerator
 if errorlevel 2 goto antlr-hqlsqlwalker
 if errorlevel 1 goto antlr-hql
 if errorlevel 0 goto end
 
 :grammar-prompt-set
-set /p OPT=[A, B, C, D, E, H]? 
+set /p OPT=[A, B, C, D, E, F, G]? 
 
 if /I "%OPT%"=="A" goto antlr-hql
 if /I "%OPT%"=="B" goto antlr-hqlsqlwalker
 if /I "%OPT%"=="C" goto antlr-sqlgenerator
 if /I "%OPT%"=="D" goto antlr-hql-debug
 if /I "%OPT%"=="E" goto antlr-hqlsqlwalker-debug
-if /I "%OPT%"=="H" goto antlr-debug
+if /I "%OPT%"=="F" goto antlr-sqlgenerator
+if /I "%OPT%"=="G" goto antlr-debug
 goto grammar-prompt-set
 
 :antlr-hql
@@ -170,12 +174,17 @@
 call src\NHibernate\Hql\Ast\ANTLR\AntlrHqlSqlWalkerDebug.bat
 goto end
 
+:antlr-sqlgenerator-debug
+call src\NHibernate\Hql\Ast\ANTLR\AntlrSqlGeneratorDebug.bat
+goto end
+
 :antlr-debug
 echo To use the debug grammar:
 echo   1.  Create a unit test that runs the hql parser on the input you're interested in.
+echo       The one you want to debug must be the first grammar parsed.
 echo   2.  Run the unit test.  It will appear to stall.
-echo   3.  Download and run AntlrWorks.
-echo   4.  Choose "Debug Remote" and allow the default ports.
+echo   3.  Download and run AntlrWorks (java -jar AntlrWorks.jar).
+echo   4.  Choose "Debug Remote" and accept the default port.
 echo   5.  You should now be connected and able to step through your grammar.
 goto end
 

Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHql.bat
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHql.bat	2011-04-11 11:41:09 UTC (rev 5666)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHql.bat	2011-04-11 17:04:42 UTC (rev 5667)
@@ -1,5 +1,5 @@
+@echo off
 rem I wanted to put this in the nant build file, but I had very annoying problems with 64-bit java running from the 32-bit nant process.
-@echo off
 pushd %~dp0
 java.exe -cp ..\..\..\..\..\Tools\Antlr\antlr-3.2.jar org.antlr.Tool -o Generated Hql.g
 popd
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlDebug.bat
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlDebug.bat	2011-04-11 11:41:09 UTC (rev 5666)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlDebug.bat	2011-04-11 17:04:42 UTC (rev 5667)
@@ -1,5 +1,5 @@
+@echo off
 rem I wanted to put this in the nant build file, but I had very annoying problems with 64-bit java running from the 32-bit nant process.
-@echo off
 pushd %~dp0
 java.exe -cp ..\..\..\..\..\Tools\Antlr\antlr-3.2.jar org.antlr.Tool -debug -o Generated Hql.g
 popd
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlSqlWalker.bat
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlSqlWalker.bat	2011-04-11 11:41:09 UTC (rev 5666)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlSqlWalker.bat	2011-04-11 17:04:42 UTC (rev 5667)
@@ -1,5 +1,5 @@
+@echo off
 rem I wanted to put this in the nant build file, but I had very annoying problems with 64-bit java running from the 32-bit nant process.
-@echo off
 pushd %~dp0
 java.exe -cp ..\..\..\..\..\Tools\Antlr\antlr-3.2.jar org.antlr.Tool -o Generated HqlSqlWalker.g
 popd
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlSqlWalkerDebug.bat
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlSqlWalkerDebug.bat	2011-04-11 11:41:09 UTC (rev 5666)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrHqlSqlWalkerDebug.bat	2011-04-11 17:04:42 UTC (rev 5667)
@@ -1,5 +1,5 @@
+@echo off
 rem I wanted to put this in the nant build file, but I had very annoying problems with 64-bit java running from the 32-bit nant process.
-@echo off
 pushd %~dp0
 java.exe -cp ..\..\..\..\..\Tools\Antlr\antlr-3.2.jar org.antlr.Tool -debug -o Generated HqlSqlWalker.g
 popd
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGenerator.bat
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGenerator.bat	2011-04-11 11:41:09 UTC (rev 5666)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGenerator.bat	2011-04-11 17:04:42 UTC (rev 5667)
@@ -1,5 +1,5 @@
+@echo off
 rem I wanted to put this in the nant build file, but I had very annoying problems with 64-bit java running from the 32-bit nant process.
-@echo off
 pushd %~dp0
 java.exe -cp ..\..\..\..\..\Tools\Antlr\antlr-3.2.jar org.antlr.Tool -o Generated SqlGenerator.g
 popd
\ No newline at end of file

Added: trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGeneratorDebug.bat
===================================================================
--- trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGeneratorDebug.bat	                        (rev 0)
+++ trunk/nhibernate/src/NHibernate/Hql/Ast/ANTLR/AntlrSqlGeneratorDebug.bat	2011-04-11 17:04:42 UTC (rev 5667)
@@ -0,0 +1,5 @@
+@echo off
+rem I wanted to put this in the nant build file, but I had very annoying problems with 64-bit java running from the 32-bit nant process.
+pushd %~dp0
+java.exe -cp ..\..\..\..\..\Tools\Antlr\antlr-3.2.jar org.antlr.Tool -debug -o Generated SqlGenerator.g
+popd
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.