azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ant task - "build.xml": comments added to <macrodef>s

Browse Source
This commit is contained in:
Evgeny Goldin
2012-01-16 00:05:15 +02:00
parent 4e1f831cce
commit 2522cbc9c8
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-tools/build.xml
+8 -8
View File
@@ -21,14 +21,14 @@
</presetdef> </presetdef>
<!-- Invokes <java> for compiled Hello class and verifies the output -->
<macrodef name="hello-java"> <macrodef name="hello-java">
<attribute name="root"/> <attribute name="root"/>
<attribute name="args" default=""/> <attribute name="args" default=""/>
<attribute name="out"/> <attribute name="out"/>
<sequential> <sequential>
<var name = "java-out" unset = "true"/> <var name = "java-out" unset = "true"/>
<run-java outputproperty = "java-out" <run-java outputproperty = "java-out" classname = "namespace">
classname = "namespace">
<arg line = "@{args}"/> <arg line = "@{args}"/>
</run-java> </run-java>
<if> <if>
@@ -43,6 +43,7 @@
</sequential> </sequential>
</macrodef> </macrodef>
<!-- Compiles "Hello.kt" as a single file and a folder, runs <java> and verifies the output -->
<macrodef name="hello-test"> <macrodef name="hello-test">
<attribute name="root"/> <attribute name="root"/>
<attribute name="args" default=""/> <attribute name="args" default=""/>
@@ -51,17 +52,17 @@
<taskdef resource = "org/jetbrains/jet/buildtools/ant/antlib.xml" <taskdef resource = "org/jetbrains/jet/buildtools/ant/antlib.xml"
classpathref = "dist.jars"/> classpathref = "dist.jars"/>
<delete dir = "${tests-dir}" verbose = "false" includes="**/*.class"/> <delete dir = "${tests-dir}" verbose = "false" includes = "**/*.class"/>
<kotlinc destdir = "${tests-dir}" file = "@{root}/Hello.kt" /> <kotlinc destdir = "${tests-dir}" file = "@{root}/Hello.kt" />
<hello-java root = "@{root}" args = "@{args}" out = "@{out}"/> <hello-java root = "@{root}" args = "@{args}" out = "@{out}"/>
<delete dir = "${tests-dir}" verbose = "false" includes="**/*.class"/> <delete dir = "${tests-dir}" verbose = "false" includes = "**/*.class"/>
<kotlinc destdir = "${tests-dir}" srcdir = "@{root}" /> <kotlinc destdir = "${tests-dir}" srcdir = "@{root}" />
<hello-java root = "@{root}" args = "@{args}" out = "@{out}"/> <hello-java root = "@{root}" args = "@{args}" out = "@{out}"/>
</sequential> </sequential>
</macrodef> </macrodef>
<!-- Compiles and runs with <java> web demo longer examples -->
<macrodef name="longer-examples"> <macrodef name="longer-examples">
<sequential> <sequential>
<taskdef resource = "org/jetbrains/jet/buildtools/ant/antlib.xml" <taskdef resource = "org/jetbrains/jet/buildtools/ant/antlib.xml"
@@ -77,7 +78,6 @@
</sequential> </sequential>
</macrodef> </macrodef>
<!-- Creates build tools distribution jar --> <!-- Creates build tools distribution jar -->
<target name="buildToolsJar" depends="compile"> <target name="buildToolsJar" depends="compile">
<mkdir dir ="${output}/classes/buildTools"/> <mkdir dir ="${output}/classes/buildTools"/>
@@ -111,7 +111,7 @@
<hello-test root="${basedir}/build-tools/test/hello/4" args="IT" out="Ciao!"/> <hello-test root="${basedir}/build-tools/test/hello/4" args="IT" out="Ciao!"/>
<hello-test root="${basedir}/build-tools/test/hello/5" args="Donald-Duck" out="Hello, Donald-Duck!"/> <hello-test root="${basedir}/build-tools/test/hello/5" args="Donald-Duck" out="Hello, Donald-Duck!"/>
<!-- Compiles and runs all longer examples (99 Bottles of Beer, Maze, Life, HTML Builder) --> <!-- Compiles and runs web demo longer examples (99 Bottles of Beer, Maze, Life, HTML Builder) -->
<longer-examples/> <longer-examples/>
</target> </target>
</project> </project>