summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Lepiller <julien@lepiller.eu>2019-11-13 22:18:28 +0100
committerJulien Lepiller <julien@lepiller.eu>2019-11-13 22:47:41 +0100
commit570f3b63709717a97a4a4501a6135e2c1f18bcdf (patch)
tree6c1d8fcd611a749f50371e37df75efec35314c8f
parentbc1177870d233152e58c26d3f13310521b37017b (diff)
downloadpatches-570f3b63709717a97a4a4501a6135e2c1f18bcdf.tar
patches-570f3b63709717a97a4a4501a6135e2c1f18bcdf.tar.gz
gnu: antlr3: Fix building after changes in ant-build-system.
* gnu/packages/java.scm (antlr3, antlr3-3.1, antlr3-3.3): Fix copying resources causing an error message later in the bootstrap chain.
-rw-r--r--gnu/packages/java.scm20
1 files changed, 13 insertions, 7 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 75eee9e967..4734bba68c 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -6742,14 +6742,16 @@ import org.antlr.grammar.v3.ANTLRTreePrinter;"))
(add-before 'build 'fix-build-xml
(lambda _
(substitute* "build.xml"
- (("<exec") "<copy todir=\"${classes.dir}\">
+ (("target name=\"compile\">")
+ "target name=\"compile\">
+<copy todir=\"${classes.dir}\">
<fileset dir=\"tool/src/main/resources\">
<include name=\"**/*.stg\"/>
<include name=\"**/*.st\"/>
<include name=\"**/*.sti\"/>
<include name=\"**/STLexer.tokens\"/>
</fileset>
-</copy><exec"))
+</copy>"))
#t)))))
(native-inputs
`(("antlr" ,antlr2)
@@ -6855,14 +6857,16 @@ import org.antlr.grammar.v2.ANTLRTreePrinter;"))
(add-before 'build 'fix-build-xml
(lambda _
(substitute* "build.xml"
- (("<exec") "<copy todir=\"${classes.dir}\">
+ (("target name=\"compile\">")
+ "target name=\"compile\">
+<copy todir=\"${classes.dir}\">
<fileset dir=\"tool/src/main/resources\">
<include name=\"**/*.stg\"/>
<include name=\"**/*.st\"/>
<include name=\"**/*.sti\"/>
<include name=\"**/STLexer.tokens\"/>
</fileset>
-</copy><exec"))
+</copy>"))
#t)))))
(native-inputs
`(("antlr" ,antlr2)
@@ -6874,7 +6878,7 @@ import org.antlr.grammar.v2.ANTLRTreePrinter;"))
("antlr" ,antlr2)
("antlr3" ,antlr3-3.1)))))
-(define antlr3-3.1
+(define-public antlr3-3.1
(package
(inherit antlr3)
(version "3.1")
@@ -6932,14 +6936,16 @@ import org.antlr.grammar.v2.ANTLRTreePrinter;"))
(add-before 'build 'fix-build-xml
(lambda _
(substitute* "build.xml"
- (("<exec") "<copy todir=\"${classes.dir}\">
+ (("target name=\"compile\">")
+ "target name=\"compile\">
+<copy todir=\"${classes.dir}\">
<fileset dir=\"src\">
<include name=\"**/*.stg\"/>
<include name=\"**/*.st\"/>
<include name=\"**/*.sti\"/>
<include name=\"**/STLexer.tokens\"/>
</fileset>
-</copy><exec"))
+</copy>"))
#t)))))
(native-inputs
`(("antlr" ,antlr2)))