From 61127a5291fa997d79ea6feb314f49bcc614ba72 Mon Sep 17 00:00:00 2001
From: Kevin Glynn <kevin.glynn@twigletsoftware.com>
Date: Wed, 23 Mar 2011 16:33:09 +0100
Subject: [PATCH 1/3] fix spelling

---
 CSharpTranslator/antlr3/build/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CSharpTranslator/antlr3/build/build.xml b/CSharpTranslator/antlr3/build/build.xml
index d738891..9d24b6c 100644
--- a/CSharpTranslator/antlr3/build/build.xml
+++ b/CSharpTranslator/antlr3/build/build.xml
@@ -40,7 +40,7 @@
 
   <target name="dummyrelease" description="make a release archive (doesn't change git repository)" depends="init,switch,buildcs2j,signtxfiles,mkcs2jlibprojsrc,mkarchive"/>
 
-  <target name="dist" decsription="">
+  <target name="dist" description="Distribute final zip to final resting place">
     <copy todir="${release.dir}" file="${release.zip}"/>
     <copy tofile="${release.dir}/cs2j-latest.zip" file="${release.zip}"/>
   </target>

From 5231bbd4e0fc99ce84b7d8a66e31ef54ed7483a0 Mon Sep 17 00:00:00 2001
From: Kevin Glynn <kevin.glynn@twigletsoftware.com>
Date: Thu, 24 Mar 2011 12:56:03 +0100
Subject: [PATCH 2/3] update contact address

---
 .../antlr3/src/CS2JTranslator/CS2JMain/Templates.cs             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/Templates.cs b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/Templates.cs
index a4a6022..760c1f6 100644
--- a/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/Templates.cs
+++ b/CSharpTranslator/antlr3/src/CS2JTranslator/CS2JMain/Templates.cs
@@ -21,7 +21,7 @@ itsmine(now, includeDate) ::= <<
 //
 // This code is to be used for evaluation of the CS2J tool ONLY.
 //
-// For more information about CS2J please contact cs2jcontact@scorm.com
+// For more information about CS2J please contact info@twigletsoftware.com
 <if(includeDate)>
 //
 // Translated: <now><\n>

From 4377e2a9b796699f21f89ea7b16fd02ba48f5e6c Mon Sep 17 00:00:00 2001
From: Kevin Glynn <kevin.glynn@twigletsoftware.com>
Date: Thu, 24 Mar 2011 13:57:21 +0100
Subject: [PATCH 3/3] mkit (and mkit.bat) now reuse ant builder

---
 CSharpTranslator/antlr3/build/build.xml | 10 +++----
 CSharpTranslator/antlr3/mkit            | 38 +++++++++++++------------
 CSharpTranslator/antlr3/mkit.bat        |  3 ++
 3 files changed, 28 insertions(+), 23 deletions(-)
 create mode 100644 CSharpTranslator/antlr3/mkit.bat

diff --git a/CSharpTranslator/antlr3/build/build.xml b/CSharpTranslator/antlr3/build/build.xml
index 9d24b6c..cdff60e 100644
--- a/CSharpTranslator/antlr3/build/build.xml
+++ b/CSharpTranslator/antlr3/build/build.xml
@@ -136,23 +136,23 @@
   <target name="buildgrammars" description="invokes ANTLR to convert grammar files to C# source">
     <ant-antlr3 xmlns:antlr="antlib:org/apache/tools/ant/antlr" verbose="true"
                       target="${cs2j.parser.dir}/cs.g" 
-                      make="true" conversiontimeout="15000" />
+                      make="true" />
     <ant-antlr3 xmlns:antlr="antlib:org/apache/tools/ant/antlr" verbose="true"
                       target="${cs2j.transform.dir}/TemplateExtracter.g" 
                       libdirectory="${cs2j.parser.dir}" 
-                      make="true" conversiontimeout="15000" />
+                      make="true" />
     <ant-antlr3 xmlns:antlr="antlib:org/apache/tools/ant/antlr" verbose="true"
                       target="${cs2j.transform.dir}/JavaMaker.g" 
                       libdirectory="${cs2j.parser.dir}" 
-                      make="true" conversiontimeout="15000" />
+                      make="true" />
     <ant-antlr3 xmlns:antlr="antlib:org/apache/tools/ant/antlr" verbose="true"
                       target="${cs2j.transform.dir}/NetMaker.g" 
                       libdirectory="${cs2j.parser.dir}" 
-                      make="true" conversiontimeout="15000" />
+                      make="true" />
     <ant-antlr3 xmlns:antlr="antlib:org/apache/tools/ant/antlr" verbose="true"
                       target="${cs2j.transform.dir}/JavaPrettyPrint.g" 
                       libdirectory="${cs2j.parser.dir}" 
-                      make="true" conversiontimeout="15000" />
+                      make="true" />
   </target>
 
   <target name="switch" description="switched to release branch">
diff --git a/CSharpTranslator/antlr3/mkit b/CSharpTranslator/antlr3/mkit
index ea4b8be..5251adb 100755
--- a/CSharpTranslator/antlr3/mkit
+++ b/CSharpTranslator/antlr3/mkit
@@ -2,24 +2,26 @@
 
 set -e
 
-cd src/CSharpParser
-java -Xmx512m -jar ../../jar/antlr-3.3.jar -Xconversiontimeout 15000 -make -verbose cs.g
-cd ../../
-
-cd src/CS2JTranslator/CS2JTransform
-#  echo TemplateExtracer.g
-java -Xmx512m -jar ../../../jar/antlr-3.3.jar -Xconversiontimeout 15000 -make -verbose -lib ../../CSharpParser TemplateExtracter.g 
-#  echo JavaMaker.g
-java -Xmx512m -jar ../../../jar/antlr-3.3.jar -Xconversiontimeout 15000 -make -verbose -lib ../../CSharpParser JavaMaker.g 
-#  echo NetMaker.g
-java -Xmx512m -jar ../../../jar/antlr-3.3.jar -Xconversiontimeout 15000 -make -verbose -lib ../../CSharpParser NetMaker.g 
-#  echo JavaPrettyPrint.g
-java -Xmx512m -jar ../../../jar/antlr-3.3.jar -Xconversiontimeout 15000 -make -verbose -lib ../../CSharpParser JavaPrettyPrint.g 
-cd ../../../
-
-cd src
-xbuild
-cd ../
+ant -f build/build.xml buildcs2j
 
+## cd src/CSharpParser
+## java -Xmx512m -jar ../../jar/antlr-3.3.jar -Xconversiontimeout 15000 -make -verbose cs.g
+## cd ../../
+## 
+## cd src/CS2JTranslator/CS2JTransform
+## #  echo TemplateExtracer.g
+## java -Xmx512m -jar ../../../jar/antlr-3.3.jar -Xconversiontimeout 15000 -make -verbose -lib ../../CSharpParser TemplateExtracter.g 
+## #  echo JavaMaker.g
+## java -Xmx512m -jar ../../../jar/antlr-3.3.jar -Xconversiontimeout 15000 -make -verbose -lib ../../CSharpParser JavaMaker.g 
+## #  echo NetMaker.g
+## java -Xmx512m -jar ../../../jar/antlr-3.3.jar -Xconversiontimeout 15000 -make -verbose -lib ../../CSharpParser NetMaker.g 
+## #  echo JavaPrettyPrint.g
+## java -Xmx512m -jar ../../../jar/antlr-3.3.jar -Xconversiontimeout 15000 -make -verbose -lib ../../CSharpParser JavaPrettyPrint.g 
+## cd ../../../
+## 
+## cd src
+## xbuild
+## cd ../
+## 
 echo 'All Done'
 
diff --git a/CSharpTranslator/antlr3/mkit.bat b/CSharpTranslator/antlr3/mkit.bat
new file mode 100644
index 0000000..54d6dc5
--- /dev/null
+++ b/CSharpTranslator/antlr3/mkit.bat
@@ -0,0 +1,3 @@
+@echo off
+ant -f build/build.xml buildcs2j
+echo 'All Done'
\ No newline at end of file