diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2005-11-03 13:16:26 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2005-11-03 13:16:26 +0000 |
| commit | 771f3479c1bb8a7410d6588942880228fc9ddfeb (patch) | |
| tree | 13a70655be92f708d02a79a857ef94bb90f958f0 | |
| parent | acfa29635859e39a8f38a0d2e73d4d8bc2832cf9 (diff) | |
| download | scala-771f3479c1bb8a7410d6588942880228fc9ddfeb.tar.gz scala-771f3479c1bb8a7410d6588942880228fc9ddfeb.tar.bz2 scala-771f3479c1bb8a7410d6588942880228fc9ddfeb.zip | |
IzPack now works with a non-patched distribution.
| -rw-r--r-- | build.xml | 5 | ||||
| -rw-r--r-- | config/build.default.properties | 2 |
2 files changed, 4 insertions, 3 deletions
@@ -525,7 +525,7 @@ <!-- A path containing the IzPack library --> <path id="izpack.classpath"> - <pathelement location="${izpack.jar}"/> + <pathelement location="${izpack.home}/lib/compiler.jar"/> </path> <target name="izpack.all" depends="distrib.all, izpack.unix, izpack.win, izpack.mac" @@ -564,7 +564,8 @@ </copy> <izpack input="${resource.dir}/install-nsc.xml" output="${distrib.unix.dir}/${distrib.name}-install-${distrib.version}.jar" - installerType="standard" basedir="${basedir}"/> + installerType="standard" basedir="${basedir}" + izPackDir="${izpack.home}"/> </target> <target name="izpack.mac" depends="izpack.unix"/> diff --git a/config/build.default.properties b/config/build.default.properties index cf123820bd..5f56a2da9b 100644 --- a/config/build.default.properties +++ b/config/build.default.properties @@ -71,7 +71,7 @@ java.jar=${java.home}/jre/lib/rt.jar ant.jar=${ant.home}/lib/ant.jar # The path to the IzPack tools ('standalone-compiler.jar'). -izpack.jar=/usr/local/lib/standalone-compiler.jar +izpack.home=/usr/local/ # LOCATION OF BUILD PRODUCTS ############################################################################## |