Skip to content

Commit 135aabe

Browse files
committed
Fix Windows build problems mentioned in #154. Add History entries.
1 parent 34814b4 commit 135aabe

File tree

4 files changed

+15
-6
lines changed

4 files changed

+15
-6
lines changed

History.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## [1.0.0.RC11](https://github.com/cucumber/cucumber-jvm/compare/v1.0.0.RC6...v1.0.0.RC11)
2+
3+
* [Build] The build is Maven-based again. It turned out to be the best choice.
4+
* [Scala] The module is back to life. ([#154](https://github.com/cucumber/cucumber-jvm/issues/154) Jon-Anders Teigen)
5+
* [Build] The build should work on Windows again. ([#154](https://github.com/cucumber/cucumber-jvm/issues/154) Aslak Hellesøy)
6+
17
## 1.0.0.RC6
28

39
* [Build] Maven pom.xml files are back (generated from ivy.xml). Ant+Ivy still needed for bootstrapping.

groovy/pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,14 @@
8282
import groovy.text.SimpleTemplateEngine
8383
import gherkin.I18n
8484
85+
def _ = File.separator
8586
def engine = new SimpleTemplateEngine()
86-
def templateSource = new File("${basedir}/src/main/code_generator/I18n.groovy.txt").getText()
87+
def templateSource = new File("${basedir}${_}src${_}main${_}code_generator${_}I18n.groovy.txt").getText()
8788
8889
I18n.all.each { i18n ->
8990
def binding = ["i18n":i18n]
9091
template = engine.createTemplate(templateSource).make(binding)
91-
def file = new File("${basedir}/target/generated-sources/i18n/java/cucumber/runtime/groovy/${i18n.underscoredIsoCode.toUpperCase()}.java")
92+
def file = new File("${basedir}${_}target${_}generated-sources${_}i18n${_}java${_}cucumber${_}runtime${_}groovy${_}${i18n.underscoredIsoCode.toUpperCase()}.java")
9293
file.parentFile.mkdirs()
9394
file.write(template.toString(), "UTF-8")
9495
}

java/pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,15 @@
3232
import groovy.text.SimpleTemplateEngine
3333
import gherkin.I18n
3434
35+
def _ = File.separator
3536
def engine = new SimpleTemplateEngine()
36-
def templateSource = new File("${project.basedir}/src/main/code_generator/I18n.java.txt").getText()
37+
def templateSource = new File("${project.basedir}${_}src${_}main${_}code_generator${_}I18n.java.txt").getText()
3738
3839
I18n.all.each { i18n ->
3940
i18n.codeKeywords.each { kw ->
4041
def binding = ["i18n":i18n, "kw":kw]
4142
template = engine.createTemplate(templateSource).make(binding)
42-
def file = new File("${basedir}/target/generated-sources/i18n/java/cucumber/annotation/${i18n.underscoredIsoCode}/${kw}.java")
43+
def file = new File("${basedir}${_}target${_}generated-sources${_}i18n${_}java${_}cucumber${_}annotation${_}${i18n.underscoredIsoCode}${_}${kw}.java")
4344
file.parentFile.mkdirs()
4445
file.write(template.toString(), "UTF-8")
4546
}

scala/pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,13 @@
9191
<groovy><![CDATA[
9292
import groovy.text.SimpleTemplateEngine
9393
94+
def _ = File.separator
9495
def engine = new SimpleTemplateEngine()
95-
def templateSource = new File("${basedir}/src/main/code_generator/I18n.scala.txt").getText()
96+
def templateSource = new File("${basedir}${_}src${_}main${_}code_generator${_}I18n.scala.txt").getText()
9697
9798
template = engine.createTemplate(templateSource)
9899
template = template.make(null)
99-
def file = new File("${basedir}/target/i18n/cucumber/runtime/I18n.scala")
100+
def file = new File("${basedir}${_}target${_}i18n${_}cucumber${_}runtime${_}I18n.scala")
100101
file.parentFile.mkdirs()
101102
file.write(template.toString(), "UTF-8")
102103
]]></groovy>

0 commit comments

Comments
 (0)