diff options
| author | KHobbits <rob@khobbits.co.uk> | 2011-12-13 03:11:11 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2011-12-13 03:11:11 +0000 |
| commit | 61d77e5a44b0af72f68f4f62fb566aed8bb339dd (patch) | |
| tree | 29ba7ea77c526f6e906404821e8ceff7c3e78d0e /BuildAll | |
| parent | 1da72b33b33d5c0e7450177b03b5d66dbb34f6ed (diff) | |
| download | Essentials-61d77e5a44b0af72f68f4f62fb566aed8bb339dd.tar Essentials-61d77e5a44b0af72f68f4f62fb566aed8bb339dd.tar.gz Essentials-61d77e5a44b0af72f68f4f62fb566aed8bb339dd.tar.lz Essentials-61d77e5a44b0af72f68f4f62fb566aed8bb339dd.tar.xz Essentials-61d77e5a44b0af72f68f4f62fb566aed8bb339dd.zip | |
Update copylibs.
Diffstat (limited to 'BuildAll')
| -rw-r--r-- | BuildAll/nbproject/build-impl.xml | 8 | ||||
| -rw-r--r-- | BuildAll/nbproject/genfiles.properties | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/BuildAll/nbproject/build-impl.xml b/BuildAll/nbproject/build-impl.xml index 34bc10d88..7c88bb114 100644 --- a/BuildAll/nbproject/build-impl.xml +++ b/BuildAll/nbproject/build-impl.xml @@ -20,10 +20,10 @@ is divided into following sections: --> <project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="BuildAll-impl"> - <fail message="Please build using Ant 1.7.1 or higher."> + <fail message="Please build using Ant 1.8.0 or higher."> <condition> <not> - <antversion atleast="1.7.1"/> + <antversion atleast="1.8.0"/> </not> </condition> </fail> @@ -223,6 +223,7 @@ is divided into following sections: <property name="javac.fork" value="${jdkBug6558476}"/> <property name="jar.index" value="false"/> <property name="jar.index.metainf" value="${jar.index}"/> + <property name="copylibs.rebase" value="true"/> <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/> </target> <target name="-post-init"> @@ -409,6 +410,7 @@ is divided into following sections: <property environment="env"/> <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/> <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}"> + <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> <jvmarg value="${profiler.info.jvmargs.agent}"/> <jvmarg line="${profiler.info.jvmargs}"/> <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/> @@ -539,7 +541,7 @@ is divided into following sections: </chainedmapper> </pathconvert> <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/> - <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> + <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}"> <fileset dir="${build.classes.dir}"/> <manifest> <attribute name="Class-Path" value="${jar.classpath}"/> diff --git a/BuildAll/nbproject/genfiles.properties b/BuildAll/nbproject/genfiles.properties index d832e2cec..64276c0d9 100644 --- a/BuildAll/nbproject/genfiles.properties +++ b/BuildAll/nbproject/genfiles.properties @@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=28e38971@1.44.1.45 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=51b33957 -nbproject/build-impl.xml.script.CRC32=66b89647 -nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45 +nbproject/build-impl.xml.script.CRC32=c8376938 +nbproject/build-impl.xml.stylesheet.CRC32=c12040a1@1.47.1.46 |