MediaInfoWrapperを依存プロジェクトとして追加

diff --git a/frontend/nbproject/build-impl.xml b/frontend/nbproject/build-impl.xml
index 3a85528..67567dc 100644 (file)
--- a/frontend/nbproject/build-impl.xml
+++ b/frontend/nbproject/build-impl.xml
@@ -578,6 +578,13 @@ is divided into following sections:
         </propertyfile>\r
         <antcall target="-maybe-call-dep">\r
             <param name="call.built.properties" value="${built-jar.properties}"/>\r
+            <param location="${project.MediaInfoWrapper}" name="call.subproject"/>\r
+            <param location="${project.MediaInfoWrapper}/build.xml" name="call.script"/>\r
+            <param name="call.target" value="jar"/>\r
+            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>\r
+        </antcall>\r
+        <antcall target="-maybe-call-dep">\r
+            <param name="call.built.properties" value="${built-jar.properties}"/>\r
             <param location="${project.NicoBrowser}" name="call.subproject"/>\r
             <param location="${project.NicoBrowser}/build.xml" name="call.script"/>\r
             <param name="call.target" value="jar"/>\r
@@ -1021,6 +1028,13 @@ is divided into following sections:
         </propertyfile>\r
         <antcall target="-maybe-call-dep">\r
             <param name="call.built.properties" value="${built-clean.properties}"/>\r
+            <param location="${project.MediaInfoWrapper}" name="call.subproject"/>\r
+            <param location="${project.MediaInfoWrapper}/build.xml" name="call.script"/>\r
+            <param name="call.target" value="clean"/>\r
+            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>\r
+        </antcall>\r
+        <antcall target="-maybe-call-dep">\r
+            <param name="call.built.properties" value="${built-clean.properties}"/>\r
             <param location="${project.NicoBrowser}" name="call.subproject"/>\r
             <param location="${project.NicoBrowser}/build.xml" name="call.script"/>\r
             <param name="call.target" value="clean"/>\r

diff --git a/frontend/nbproject/genfiles.properties b/frontend/nbproject/genfiles.properties
index 5e75c03..74f1367 100644 (file)
--- a/frontend/nbproject/genfiles.properties
+++ b/frontend/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=57a231c5\r
+build.xml.data.CRC32=35872fd9\r
 build.xml.script.CRC32=df4c1a98\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=57a231c5\r
-nbproject/build-impl.xml.script.CRC32=2ad4b08e\r
+nbproject/build-impl.xml.data.CRC32=35872fd9\r
+nbproject/build-impl.xml.script.CRC32=28485f27\r
 nbproject/build-impl.xml.stylesheet.CRC32=0c01fd8e@1.43.1.45\r

diff --git a/frontend/nbproject/project.properties b/frontend/nbproject/project.properties
index 9693789..1ba01dc 100644 (file)
--- a/frontend/nbproject/project.properties
+++ b/frontend/nbproject/project.properties
@@ -30,6 +30,7 @@ includes=**
 jar.compress=false\r
 javac.classpath=\\r
     ${reference.NicoBrowser.jar}:\\r
+    ${reference.MediaInfoWrapper.jar}:\\r
     ${libs.Commons-Configuration.classpath}:\\r
     ${libs.Commons-Lang.classpath}:\\r
     ${libs.Log4J.classpath}:\\r
@@ -76,7 +77,9 @@ meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false\r
 no.dependencies=true\r
 platform.active=default_platform\r
+project.MediaInfoWrapper=../../MediaInfoWrapper\r
 project.NicoBrowser=../../NicoBrowser\r
+reference.MediaInfoWrapper.jar=${project.MediaInfoWrapper}/dist/MediaInfoWrapper.jar\r
 reference.NicoBrowser.jar=${project.NicoBrowser}/dist/NicoBrowser.jar\r
 run.classpath=\\r
     ${javac.classpath}:\\r

diff --git a/frontend/nbproject/project.xml b/frontend/nbproject/project.xml
index e2884eb..3b374a8 100755 (executable)
--- a/frontend/nbproject/project.xml
+++ b/frontend/nbproject/project.xml
@@ -14,6 +14,14 @@
         </data>\r
         <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">\r
             <reference>\r
+                <foreign-project>MediaInfoWrapper</foreign-project>\r
+                <artifact-type>jar</artifact-type>\r
+                <script>build.xml</script>\r
+                <target>jar</target>\r
+                <clean-target>clean</clean-target>\r
+                <id>jar</id>\r
+            </reference>\r
+            <reference>\r
                 <foreign-project>NicoBrowser</foreign-project>\r
                 <artifact-type>jar</artifact-type>\r
                 <script>build.xml</script>\r