NetBeans7用設定ファイル, ターゲットをJava6に変更

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 690f349..e753776 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -20,8 +20,8 @@ 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="groovy-build.xml"/>\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
         <condition>\r
             <not>\r
@@ -56,43 +56,6 @@ is divided into following sections:
         <property file="nbproject/project.properties"/>\r
     </target>\r
     <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">\r
-        <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>\r
-        <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>\r
-        <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>\r
-        <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>\r
-        <condition property="platform.javac" value="${platform.home}/bin/javac">\r
-            <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>\r
-        </condition>\r
-        <property name="platform.javac" value="${platform.javac.tmp}"/>\r
-        <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>\r
-        <condition property="platform.java" value="${platform.home}/bin/java">\r
-            <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>\r
-        </condition>\r
-        <property name="platform.java" value="${platform.java.tmp}"/>\r
-        <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>\r
-        <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">\r
-            <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>\r
-        </condition>\r
-        <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>\r
-        <condition property="platform.invalid" value="true">\r
-            <or>\r
-                <contains string="${platform.javac}" substring="$${platforms."/>\r
-                <contains string="${platform.java}" substring="$${platforms."/>\r
-                <contains string="${platform.javadoc}" substring="$${platforms."/>\r
-            </or>\r
-        </condition>\r
-        <fail unless="platform.home">Must set platform.home</fail>\r
-        <fail unless="platform.bootcp">Must set platform.bootcp</fail>\r
-        <fail unless="platform.java">Must set platform.java</fail>\r
-        <fail unless="platform.javac">Must set platform.javac</fail>\r
-        <fail if="platform.invalid">\r
- The J2SE Platform is not correctly set up.\r
- Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files. \r
- Either open the project in the IDE and setup the Platform with the same name or add it manually.\r
- For example like this:\r
-     ant -Duser.properties.file=&lt;path_to_property_file&gt; jar (where you put the property "platforms.${platform.active}.home" in a .properties file)\r
-  or ant -Dplatforms.${platform.active}.home=&lt;path_to_JDK_home&gt; jar (where no properties file is used) \r
-  </fail>\r
         <available file="${manifest.file}" property="manifest.available"/>\r
         <condition property="splashscreen.available">\r
             <and>\r
@@ -226,6 +189,15 @@ is divided into following sections:
         <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">\r
             <length length="0" string="${endorsed.classpath}" when="greater"/>\r
         </condition>\r
+        <condition else="false" property="jdkBug6558476">\r
+            <and>\r
+                <matches pattern="1\.[56]" string="${java.specification.version}"/>\r
+                <not>\r
+                    <os family="unix"/>\r
+                </not>\r
+            </and>\r
+        </condition>\r
+        <property name="javac.fork" value="${jdkBug6558476}"/>\r
         <property name="jar.index" value="false"/>\r
         <property name="jar.index.metainf" value="${jar.index}"/>\r
         <available file="${meta.inf.dir}/persistence.xml" property="has.persistence.xml"/>\r
@@ -272,7 +244,7 @@ is divided into following sections:
                 <property location="${build.dir}/empty" name="empty.dir"/>\r
                 <mkdir dir="${empty.dir}"/>\r
                 <mkdir dir="@{apgeneratedsrcdir}"/>\r
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">\r
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">\r
                     <src>\r
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">\r
                             <include name="*"/>\r
@@ -311,7 +283,7 @@ is divided into following sections:
             <sequential>\r
                 <property location="${build.dir}/empty" name="empty.dir"/>\r
                 <mkdir dir="${empty.dir}"/>\r
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">\r
+                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">\r
                     <src>\r
                         <dirset dir="@{gensrcdir}" erroronmissingdir="false">\r
                             <include name="*"/>\r
@@ -368,7 +340,7 @@ is divided into following sections:
             <attribute default="**" name="testincludes"/>\r
             <sequential>\r
                 <property name="junit.forkmode" value="perTest"/>\r
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">\r
+                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">\r
                     <batchtest todir="${build.test.results.dir}">\r
                         <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">\r
                             <filename name="@{testincludes}"/>\r
@@ -444,9 +416,6 @@ is divided into following sections:
                     <classpath>\r
                         <path path="@{classpath}"/>\r
                     </classpath>\r
-                    <bootclasspath>\r
-                        <path path="${platform.bootcp}"/>\r
-                    </bootclasspath>\r
                 </nbjpdastart>\r
             </sequential>\r
         </macrodef>\r
@@ -462,9 +431,7 @@ is divided into following sections:
         </macrodef>\r
     </target>\r
     <target name="-init-debug-args">\r
-        <exec executable="${platform.java}" outputproperty="version-output">\r
-            <arg value="-version"/>\r
-        </exec>\r
+        <property name="version-output" value="java version &quot;${ant.java.version}"/>\r
         <condition property="have-jdk-older-than-1.4">\r
             <or>\r
                 <contains string="${version-output}" substring="java version &quot;1.0"/>\r
@@ -489,7 +456,7 @@ is divided into following sections:
             <attribute default="${debug.classpath}" name="classpath"/>\r
             <element name="customize" optional="true"/>\r
             <sequential>\r
-                <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">\r
+                <java classname="@{classname}" dir="${work.dir}" fork="true">\r
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
                     <jvmarg line="${debug-args-line}"/>\r
                     <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>\r
@@ -514,7 +481,7 @@ is divided into following sections:
             <attribute default="${run.classpath}" name="classpath"/>\r
             <element name="customize" optional="true"/>\r
             <sequential>\r
-                <java classname="@{classname}" dir="${work.dir}" fork="true" jvm="${platform.java}">\r
+                <java classname="@{classname}" dir="${work.dir}" fork="true">\r
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>\r
                     <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>\r
                     <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>\r
@@ -697,7 +664,7 @@ is divided into following sections:
             <path path="${run.classpath}"/>\r
             <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>\r
         </pathconvert>\r
-        <echo level="info">${platform.java} -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>\r
+        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>\r
     </target>\r
     <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">\r
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>\r
@@ -724,7 +691,7 @@ is divided into following sections:
         <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>\r
         <echo level="info">To run this application from the command line without Ant, try:</echo>\r
         <property location="${dist.jar}" name="dist.jar.resolved"/>\r
-        <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>\r
+        <echo level="info">java -jar "${dist.jar.resolved}"</echo>\r
     </target>\r
     <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">\r
         <delete>\r
@@ -874,7 +841,7 @@ is divided into following sections:
             -->\r
     <target depends="init" if="have.sources" name="-javadoc-build">\r
         <mkdir dir="${dist.javadoc.dir}"/>\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
+        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" 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
             </classpath>\r

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 0862f5c..5d2bb25 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,11 +1,11 @@
-build.xml.data.CRC32=4e83c611\r
+build.xml.data.CRC32=d1b53a37\r
 build.xml.script.CRC32=02aac843\r
 build.xml.stylesheet.CRC32=28e38971@1.43.1.45\r
 # 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=98229f3b\r
+nbproject/build-impl.xml.data.CRC32=d1b53a37\r
+nbproject/build-impl.xml.script.CRC32=4e433beb\r
 nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45\r
-nbproject/groovy-build.xml.data.CRC32=4e83c611\r
-nbproject/groovy-build.xml.script.CRC32=e12d80ae\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

diff --git a/nbproject/groovy-build.xml b/nbproject/groovy-build.xml
index 4ce48b9..ae01434 100644 (file)
--- a/nbproject/groovy-build.xml
+++ b/nbproject/groovy-build.xml
@@ -29,7 +29,7 @@
                     <classpath>\r
                         <path path="@{classpath}"/>\r
                     </classpath>\r
-                    <javac debug="@{debug}" deprecation="${javac.deprecation}" encoding="${source.encoding}" source="${javac.source}" target="${javac.target}" fork="yes" executable="${platform.javac}" tempdir="${java.io.tmpdir}">\r
+                    <javac debug="@{debug}" deprecation="${javac.deprecation}" encoding="${source.encoding}" source="${javac.source}" target="${javac.target}">\r
                         <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>\r
                         <customize/>\r
                     </javac>\r

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 9ece101..e663427 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,3 +1,6 @@
+annotation.processing.enabled=true\r
+annotation.processing.enabled.in.editor=false\r
+annotation.processing.run.all.processors=true\r
 application.homepage=http://feather.cocolog-nifty.com/\r
 application.title=NicoBrowser - \u30e9\u30f3\u30ad\u30f3\u30b0\u3001\u516c\u958b\u30de\u30a4\u30ea\u30b9\u30c8\u304b\u3089\u306e\u30cb\u30b3\u30cb\u30b3\u52d5\u753b\u81ea\u52d5\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\r
 application.vendor=yukihane\r
@@ -42,8 +45,10 @@ javac.classpath=\
 # Space-separated list of extra javac options\r
 javac.compilerargs=\r
 javac.deprecation=false\r
-javac.source=1.5\r
-javac.target=1.5\r
+javac.processorpath=\\r
+    ${javac.classpath}\r
+javac.source=1.6\r
+javac.target=1.6\r
 javac.test.classpath=\\r
     ${javac.classpath}:\\r
     ${build.classes.dir}:\\r
@@ -82,7 +87,8 @@ libs.Rome.classpath=../../../java/commons/rome-0.9/rome-0.9.jar;../../../java/co
 main.class=nicobrowser.main.Main\r
 manifest.file=manifest.mf\r
 meta.inf.dir=${src.dir}/META-INF\r
-platform.active=JDK_1.5\r
+mkdist.disabled=false\r
+platform.active=default_platform\r
 run.classpath=\\r
     ${javac.classpath}:\\r
     ${build.classes.dir}\r

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 1171b01..7fcdea1 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -13,7 +13,6 @@
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">\r
             <name>NicoBrowser</name>\r
             <minimum-ant-version>1.6.5</minimum-ant-version>\r
-            <explicit-platform explicit-source-supported="true"/>\r
             <source-roots>\r
                 <root id="src.dir"/>\r
             </source-roots>\r