changeset 8039:65b41355c1af

{IDE ONLY] Fix IDE files for Eclipse, NetBeans and IntelliJ
author snorthov
date Thu, 11 Sep 2014 10:19:45 -0400
parents 6dea37f368c8
children cf836d5d76d2
files .idea/fxpackager.iml modules/fxpackager/.classpath netbeans/fxpackager/nbproject/build-impl.xml netbeans/fxpackager/nbproject/genfiles.properties netbeans/fxpackager/nbproject/project.properties netbeans/fxpackager/nbproject/project.xml
diffstat 6 files changed, 52 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/.idea/fxpackager.iml	Thu Sep 11 08:02:39 2014 -0600
+++ b/.idea/fxpackager.iml	Thu Sep 11 10:19:45 2014 -0400
@@ -10,7 +10,7 @@
       <excludeFolder url="file://$MODULE_DIR$/modules/fxpackager/build" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="graphics" exported="" />
+    <orderEntry type="module" module-name="controls" exported="" />
     <orderEntry type="inheritedJdk" />
   </component>
 </module>
--- a/modules/fxpackager/.classpath	Thu Sep 11 08:02:39 2014 -0600
+++ b/modules/fxpackager/.classpath	Thu Sep 11 10:19:45 2014 -0400
@@ -18,5 +18,5 @@
       <attribute name="optional" value="true"/>
     </attributes>
   </classpathentry>
-  <classpathentry kind="src" exported="true" path="/graphics"/>
+  <classpathentry kind="src" exported="true" path="/controls"/>
 </classpath>
--- a/netbeans/fxpackager/nbproject/build-impl.xml	Thu Sep 11 08:02:39 2014 -0600
+++ b/netbeans/fxpackager/nbproject/build-impl.xml	Thu Sep 11 10:19:45 2014 -0400
@@ -896,6 +896,14 @@
         <propertyfile file="${built-jar.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-jar.properties}"/>
+            <param location="${project.controls}" name="call.subproject"/>
+            <param location="${project.controls}/build.xml" name="call.script"/>
+            <param name="call.target" value="jar"/>
+            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
+        </antcall>
     </target>
     <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
     <target depends="init" name="-check-automatic-build">
@@ -1381,6 +1389,14 @@
         <propertyfile file="${built-clean.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
+        <antcall target="-maybe-call-dep">
+            <param name="call.built.properties" value="${built-clean.properties}"/>
+            <param location="${project.controls}" name="call.subproject"/>
+            <param location="${project.controls}/build.xml" name="call.script"/>
+            <param name="call.target" value="clean"/>
+            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
+            <param name="transfer.not.archive.disabled" value="true"/>
+        </antcall>
     </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>
--- a/netbeans/fxpackager/nbproject/genfiles.properties	Thu Sep 11 08:02:39 2014 -0600
+++ b/netbeans/fxpackager/nbproject/genfiles.properties	Thu Sep 11 10:19:45 2014 -0400
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=254a6495
+build.xml.data.CRC32=675f28c4
 build.xml.script.CRC32=18f445c7
-build.xml.stylesheet.CRC32=8064a381@1.65.0.46
+build.xml.stylesheet.CRC32=8064a381@1.74.2.48
 # 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=254a6495
-nbproject/build-impl.xml.script.CRC32=a5f9940c
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.1.48
+nbproject/build-impl.xml.data.CRC32=675f28c4
+nbproject/build-impl.xml.script.CRC32=38296f1e
+nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.2.48
--- a/netbeans/fxpackager/nbproject/project.properties	Thu Sep 11 08:02:39 2014 -0600
+++ b/netbeans/fxpackager/nbproject/project.properties	Thu Sep 11 10:19:45 2014 -0400
@@ -32,7 +32,8 @@
 includes=**
 jar.compress=false
 javac.classpath=\
-    ${file.reference.ant-1.8.2.jar}
+    ${file.reference.ant-1.8.2.jar}:\
+    ${reference.controls.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=-XDignore.symbol.file
 javac.deprecation=false
@@ -64,6 +65,8 @@
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false
 platform.active=default_platform
+project.controls=../controls
+reference.controls.jar=${project.controls}/dist/controls.jar
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
--- a/netbeans/fxpackager/nbproject/project.xml	Thu Sep 11 08:02:39 2014 -0600
+++ b/netbeans/fxpackager/nbproject/project.xml	Thu Sep 11 10:19:45 2014 -0400
@@ -1,15 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>fxpackager</name>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>fxpackager</name>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>controls</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+        </references>
+    </configuration>
+</project>