Skip to content
Snippets Groups Projects
Commit 9f21bc6d authored by dgelessus's avatar dgelessus
Browse files

Set home property for tom-task correctly

This allows reverting the undocumented change to tom-task.xml and also
fixes a mysterious sporadic issue with tom not finding the include files
(probably related to the Gradle daemon).
parent 27dbe3d4
No related branches found
No related tags found
No related merge requests found
Pipeline #121871 passed
...@@ -15,7 +15,7 @@ sourceSets { ...@@ -15,7 +15,7 @@ sourceSets {
} }
} }
ant.properties["org.eventb.core.ast.home"] = "." ant.properties["org.eventb.core.ast.home"] = projectDir.toString()
ant.importBuild 'tom/tom-task.xml' ant.importBuild 'tom/tom-task.xml'
task tom() << { task tom() << {
...@@ -23,7 +23,7 @@ task tom() << { ...@@ -23,7 +23,7 @@ task tom() << {
classpath: ant.references['tom.classpath'], classpath: ant.references['tom.classpath'],
srcdir: 'src', srcdir: 'src',
destdir: 'src', destdir: 'src',
options: "-I ./tom", options: "-I ${projectDir}/tom",
pretty: 'true', pretty: 'true',
optimize: 'true') { optimize: 'true') {
include(name: '**/*.t') include(name: '**/*.t')
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</description> </description>
<property name="tom.home" <property name="tom.home"
location="${org.eventb.core.ast.home}/../tools/tom-2.8" /> location="${org.eventb.core.ast.home}/tools/tom-2.8" />
<path id="tom.classpath"> <path id="tom.classpath">
<fileset dir="${tom.home}/lib"> <fileset dir="${tom.home}/lib">
<include name="**/*.jar"/> <include name="**/*.jar"/>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment