Fix Windows build problems mentioned in #154. Add History entries.

cucumber · Jan 21, 2012 · 135aabe · 135aabe
1 parent 34814b4
commit 135aabe
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/History.md b/History.md
@@ -1,3 +1,9 @@
+## [1.0.0.RC11](https://github.com/cucumber/cucumber-jvm/compare/v1.0.0.RC6...v1.0.0.RC11)
+
+* [Build] The build is Maven-based again. It turned out to be the best choice.
+* [Scala] The module is back to life. ([#154](https://github.com/cucumber/cucumber-jvm/issues/154) Jon-Anders Teigen)
+* [Build] The build should work on Windows again. ([#154](https://github.com/cucumber/cucumber-jvm/issues/154) Aslak Hellesøy)
+
 ## 1.0.0.RC6
 
 * [Build] Maven pom.xml files are back (generated from ivy.xml). Ant+Ivy still needed for bootstrapping. 

diff --git a/groovy/pom.xml b/groovy/pom.xml
@@ -82,13 +82,14 @@
 import groovy.text.SimpleTemplateEngine
 import gherkin.I18n
 
+def _ = File.separator
 def engine = new SimpleTemplateEngine()
-def templateSource = new File("${basedir}/src/main/code_generator/I18n.groovy.txt").getText()
+def templateSource = new File("${basedir}${_}src${_}main${_}code_generator${_}I18n.groovy.txt").getText()
 
 I18n.all.each { i18n ->
     def binding = ["i18n":i18n]
     template = engine.createTemplate(templateSource).make(binding)
-    def file = new File("${basedir}/target/generated-sources/i18n/java/cucumber/runtime/groovy/${i18n.underscoredIsoCode.toUpperCase()}.java")
+    def file = new File("${basedir}${_}target${_}generated-sources${_}i18n${_}java${_}cucumber${_}runtime${_}groovy${_}${i18n.underscoredIsoCode.toUpperCase()}.java")
     file.parentFile.mkdirs()
     file.write(template.toString(), "UTF-8")
 }

diff --git a/java/pom.xml b/java/pom.xml
@@ -32,14 +32,15 @@
 import groovy.text.SimpleTemplateEngine
 import gherkin.I18n
 
+def _ = File.separator
 def engine = new SimpleTemplateEngine()
-def templateSource = new File("${project.basedir}/src/main/code_generator/I18n.java.txt").getText()
+def templateSource = new File("${project.basedir}${_}src${_}main${_}code_generator${_}I18n.java.txt").getText()
 
 I18n.all.each { i18n ->
     i18n.codeKeywords.each { kw ->
         def binding = ["i18n":i18n, "kw":kw]
         template = engine.createTemplate(templateSource).make(binding)
-        def file = new File("${basedir}/target/generated-sources/i18n/java/cucumber/annotation/${i18n.underscoredIsoCode}/${kw}.java")
+        def file = new File("${basedir}${_}target${_}generated-sources${_}i18n${_}java${_}cucumber${_}annotation${_}${i18n.underscoredIsoCode}${_}${kw}.java")
         file.parentFile.mkdirs()
         file.write(template.toString(), "UTF-8")
     }

diff --git a/scala/pom.xml b/scala/pom.xml
@@ -91,12 +91,13 @@
                                 <groovy><![CDATA[
 import groovy.text.SimpleTemplateEngine
 
+def _ = File.separator
 def engine = new SimpleTemplateEngine()
-def templateSource = new File("${basedir}/src/main/code_generator/I18n.scala.txt").getText()
+def templateSource = new File("${basedir}${_}src${_}main${_}code_generator${_}I18n.scala.txt").getText()
 
 template = engine.createTemplate(templateSource)
 template = template.make(null)
-def file = new File("${basedir}/target/i18n/cucumber/runtime/I18n.scala")
+def file = new File("${basedir}${_}target${_}i18n${_}cucumber${_}runtime${_}I18n.scala")
 file.parentFile.mkdirs()
 file.write(template.toString(), "UTF-8")
         ]]></groovy>