NetBeansバージョンアップ

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index bc4af0c..7555c64 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -20,12 +20,12 @@ is divided into following sections:
 \r
         -->\r
 <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="NicoBrowser-impl">\r
-    <import file="jnlp-impl.xml"/>\r
     <import file="groovy-build.xml"/>\r
-    <fail message="Please build using Ant 1.7.1 or higher.">\r
+    <import file="jnlp-impl.xml"/>\r
+    <fail message="Please build using Ant 1.8.0 or higher.">\r
         <condition>\r
             <not>\r
-                <antversion atleast="1.7.1"/>\r
+                <antversion atleast="1.8.0"/>\r
             </not>\r
         </condition>\r
     </fail>\r
@@ -228,6 +228,7 @@ is divided into following sections:
         </condition>\r
         <property name="jar.index" value="false"/>\r
         <property name="jar.index.metainf" value="${jar.index}"/>\r
+        <property name="copylibs.rebase" value="true"/>\r
         <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>\r
     </target>\r
     <target name="-post-init">\r
@@ -414,6 +415,7 @@ is divided into following sections:
                 <property environment="env"/>\r
                 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>\r
                 <java classname="@{classname}" dir="${profiler.info.dir}" fork="true" jvm="${profiler.info.jvm}">\r
+                    <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
                     <jvmarg value="${profiler.info.jvmargs.agent}"/>\r
                     <jvmarg line="${profiler.info.jvmargs}"/>\r
                     <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>\r
@@ -549,7 +551,7 @@ is divided into following sections:
                     </chainedmapper>\r
                 </pathconvert>\r
                 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>\r
-                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" runtimeclasspath="${run.classpath.without.build.classes.dir}">\r
+                <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}">\r
                     <fileset dir="${build.classes.dir}"/>\r
                     <manifest>\r
                         <attribute name="Class-Path" value="${jar.classpath}"/>\r
@@ -874,6 +876,14 @@ is divided into following sections:
             -->\r
     <target depends="init" if="have.sources" name="-javadoc-build">\r
         <mkdir dir="${dist.javadoc.dir}"/>\r
+        <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">\r
+            <and>\r
+                <isset property="endorsed.classpath.cmd.line.arg"/>\r
+                <not>\r
+                    <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>\r
+                </not>\r
+            </and>\r
+        </condition>\r
         <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">\r
             <classpath>\r
                 <path path="${javac.classpath}"/>\r
@@ -885,6 +895,7 @@ is divided into following sections:
                 <include name="**/*.java"/>\r
                 <exclude name="*.java"/>\r
             </fileset>\r
+            <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>\r
         </javadoc>\r
         <copy todir="${dist.javadoc.dir}">\r
             <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">\r

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 5933ab2..52c5d7e 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -4,8 +4,8 @@ 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.\r
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.\r
 nbproject/build-impl.xml.data.CRC32=4e83c611\r
-nbproject/build-impl.xml.script.CRC32=6c45b283\r
-nbproject/build-impl.xml.stylesheet.CRC32=0ae3a408@1.44.1.45\r
+nbproject/build-impl.xml.script.CRC32=1e2b035d\r
+nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.2.46\r
 nbproject/groovy-build.xml.data.CRC32=d1b53a37\r
 nbproject/groovy-build.xml.script.CRC32=542f299d\r
 nbproject/groovy-build.xml.stylesheet.CRC32=451a613c@1.15.1\r