diff options
| author | wisberg <wisberg> | 2005-06-18 13:33:49 +0000 |
|---|---|---|
| committer | wisberg <wisberg> | 2005-06-18 13:33:49 +0000 |
| commit | f7b040b3b6e82a3cd61a7e991b87ad33208f5420 (patch) | |
| tree | 019c3bc307f9ce8a03b66a4087262c4c2ba240d6 /build/release | |
| parent | 2547987d0678849041168566c0e0e0c547cbe997 (diff) | |
| download | aspectj-f7b040b3b6e82a3cd61a7e991b87ad33208f5420.tar.gz aspectj-f7b040b3b6e82a3cd61a7e991b87ad33208f5420.zip | |
install before examples, vm-setup fix
Diffstat (limited to 'build/release')
| -rw-r--r-- | build/release/build.xml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/build/release/build.xml b/build/release/build.xml index b0f403f36..e44adac7c 100644 --- a/build/release/build.xml +++ b/build/release/build.xml @@ -56,7 +56,6 @@ location="${java15.home}/bin/java"/> <mkdir dir="${aj.logs.dir}"/> - </target> <target name="all" depends="init"> @@ -77,6 +76,7 @@ <build-aspectj vm="${max.vm}" target="all"/> <build-aspectj vm="${max.vm}" target="test-each-module"/> <build-aspectj vm="${max.vm}" target="junitreport"/> + <antcall target="install"/> <antcall target="product-tests"/> <!-- TODO re-enable antcall target="harness-tests"/ --> <build-aspectj vm="13" target="compile-runtime-11"/> @@ -243,19 +243,18 @@ <setup-vm vm="${max.vm}"/> <antcall target="${do.target}"/> </target> - <macrodef name="setup-vm"> <attribute name="vm"/> <sequential> - <property name="wjf.bjh" location="${java@{vm}.home}"/> - <property name="wjf.cmd" location="${wjf.bjh}/bin/java"/> + <property name="wjf@{vm}.bjh" location="${java@{vm}.home}"/> + <property name="wjf@{vm}.cmd" location="${wjf@{vm}.bjh}/bin/java"/> <delete file="${java.home.file}"/> <propertyfile file="${java.home.file}"> <entry key="build.java.version" value="@{vm}"/> - <entry key="build.java.home" value="${wjf.bjh}"/> - <entry key="build.java.command" value="${wjf.cmd}"/> + <entry key="build.java.home" value="${wjf@{vm}.bjh}"/> + <entry key="build.java.command" value="${wjf@{vm}.cmd}"/> </propertyfile> </sequential> - </macrodef> + </macrodef> </project>
\ No newline at end of file |