changeset 4178:e48b05c36e15

Fix the IDE's to reference build/libs instead of .libs, use "swt-debug.jar"
author snorthov
date Thu, 04 Jul 2013 06:15:22 -0400
parents d63f879fbfc3
children 2417bb85eda7
files .hgignore build.gradle buildSrc/.classpath idea/buildSrc.iml idea/javafx.iml netbeans/buildSrc/nbproject/project.properties netbeans/fxpackager/nbproject/project.properties netbeans/graphics/nbproject/project.properties netbeans/swt/nbproject/project.properties
diffstat 9 files changed, 169 insertions(+), 175 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Thu Jul 04 10:12:33 2013 +0200
+++ b/.hgignore	Thu Jul 04 06:15:22 2013 -0400
@@ -9,7 +9,6 @@
 \.idea/tasks.xml$
 \.idea/workspace.xml$
 ^\.gradle/
-^\.libs/
 ^buildSrc/\.gradle/
 ^idea/out/
 build/
--- a/build.gradle	Thu Jul 04 10:12:33 2013 +0200
+++ b/build.gradle	Thu Jul 04 06:15:22 2013 -0400
@@ -1126,30 +1126,28 @@
     // available in some known location. Maybe in the future the Gradle plugins to each
     // of the IDEs will be good enough that we won't need this hack anymore.
     classes << {
-        // Copy all of the download libraries to .libs for the sake of the IDEs
-        File libsDir = rootProject.file(".libs");
-        if (!libsDir.exists()) {
-            libsDir.mkdirs();
-            for (File f : [configurations.compile.files, configurations.antlr3.files].flatten()) {
-                copy {
-                    into libsDir
-                    from f.getParentFile()
-                    include "**/plugin.jar"
-                    include "**/antlr-3.1.3.jar"
-                    include "**/stringtemplate-3.2.jar"
-                    include "**/antlr-runtime-3.1.3.jar"
-                    includeEmptyDirs = false
-                }
-                // Have to rename the swt jar because it is some platform specific name but
-                // for the sake of the IDEs we need to have a single stable name that works
-                // on every platform
-                copy {
-                    into libsDir
-                    from f.getParentFile()
-                    include "**/*swt*.jar"
-                    includeEmptyDirs = false
-                    rename ".*swt.*jar", "swt\\.jar"
-                }
+        // Copy all of the download libraries to the libs directory for the sake of the IDEs
+        File libsDir = rootProject.file("build/libs");
+        libsDir.mkdirs();
+        for (File f : [configurations.compile.files, configurations.antlr3.files].flatten()) {
+            copy {
+                into libsDir
+                from f.getParentFile()
+                include "**/plugin.jar"
+                include "**/antlr-3.1.3.jar"
+                include "**/stringtemplate-3.2.jar"
+                include "**/antlr-runtime-3.1.3.jar"
+                includeEmptyDirs = false
+            }
+            // Have to rename the swt jar because it is some platform specific name but
+            // for the sake of the IDEs we need to have a single stable name that works
+            // on every platform
+            copy {
+                into libsDir
+                from f.getParentFile()
+                include "**/*swt*.jar"
+                includeEmptyDirs = false
+                rename ".*swt.*jar", "swt-debug\\.jar"
             }
         }
     }
@@ -1430,18 +1428,16 @@
     jar.dependsOn buildJavaFXPackager
 
     classes << {
-        // Copy all of the download libraries to .libs for the sake of the IDEs
-        File libsDir = rootProject.file(".libs");
+        // Copy all of the download libraries to libs directory for the sake of the IDEs
+        File libsDir = rootProject.file("build/libs");
         File antLib = new File(libsDir, "ant-1.8.2.jar")
-        if (!antLib.exists()) {
-            libsDir.mkdirs();
-            for (File f : configurations.compile.files) {
-                copy {
-                    into libsDir
-                    from f.getParentFile()
-                    include "**/ant-1.8.2.jar"
-                    includeEmptyDirs = false
-                }
+        libsDir.mkdirs();
+        for (File f : configurations.compile.files) {
+            copy {
+                into libsDir
+                from f.getParentFile()
+                include "**/ant-1.8.2.jar"
+                includeEmptyDirs = false
             }
         }
     }
--- a/buildSrc/.classpath	Thu Jul 04 10:12:33 2013 +0200
+++ b/buildSrc/.classpath	Thu Jul 04 06:15:22 2013 -0400
@@ -3,12 +3,12 @@
   <classpathentry kind="src" path="build/generated-src/antlr"/>
   <classpathentry kind="src" path="src/main/java"/>
   <classpathentry kind="src" path="src/test/java"/>
-  <classpathentry kind="lib" exported="true" path="../.libs/ant-1.8.2.jar"/>
-  <classpathentry kind="lib" exported="true" path="../.libs/antlr-3.1.3.jar"/>
-  <classpathentry kind="lib" exported="true" path="../.libs/antlr-runtime-3.1.3.jar"/>
-  <classpathentry kind="lib" exported="true" path="../.libs/plugin.jar"/>
-  <classpathentry kind="lib" exported="true" path="../.libs/stringtemplate-3.2.jar"/>
-  <classpathentry kind="lib" exported="true" path="../.libs/swt.jar"/>
+  <classpathentry kind="lib" exported="true" path="../build/libs/ant-1.8.2.jar"/>
+  <classpathentry kind="lib" exported="true" path="../build/libs/antlr-3.1.3.jar"/>
+  <classpathentry kind="lib" exported="true" path="../build/libs/antlr-runtime-3.1.3.jar"/>
+  <classpathentry kind="lib" exported="true" path="../build/libs/plugin.jar"/>
+  <classpathentry kind="lib" exported="true" path="../build/libs/stringtemplate-3.2.jar"/>
+  <classpathentry kind="lib" exported="true" path="../build/libs/swt-debug.jar"/>
   <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
   <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
   <classpathentry kind="output" path="bin"/>
--- a/idea/buildSrc.iml	Thu Jul 04 10:12:33 2013 +0200
+++ b/idea/buildSrc.iml	Thu Jul 04 06:15:22 2013 -0400
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
   <component name="EclipseModuleManager">
-    <libelement value="jar://$MODULE_DIR$/../.libs/ant-1.8.2.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/../.libs/antlr-3.1.3.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/../.libs/antlr-runtime-3.1.3.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/../.libs/stringtemplate-3.2.jar!/" />
-    <libelement value="jar://$MODULE_DIR$/../.libs/swt.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/../build/libs/ant-1.8.2.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/../build/libs/antlr-3.1.3.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/../build/libs/antlr-runtime-3.1.3.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/../build/libs/stringtemplate-3.2.jar!/" />
+    <libelement value="jar://$MODULE_DIR$/../build/libs/swt-debug.jar!/" />
     <src_description expected_position="0">
       <src_folder value="file://$MODULE_DIR$/../buildSrc/build/generated-src/antlr" expected_position="0" />
       <src_folder value="file://$MODULE_DIR$/../buildSrc/src/main/java" expected_position="1" />
@@ -31,7 +31,7 @@
     <orderEntry type="module-library" exported="">
       <library name="ant-1.8.2.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../.libs/ant-1.8.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../build/libs/ant-1.8.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -40,7 +40,7 @@
     <orderEntry type="module-library" exported="">
       <library name="antlr-3.1.3.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../.libs/antlr-3.1.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../build/libs/antlr-3.1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -49,7 +49,7 @@
     <orderEntry type="module-library" exported="">
       <library name="antlr-runtime-3.1.3.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../.libs/antlr-runtime-3.1.3.jar!/" />
+          <root url="jar://$MODULE_DIR$/../build/libs/antlr-runtime-3.1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
@@ -58,16 +58,16 @@
     <orderEntry type="module-library" exported="">
       <library name="stringtemplate-3.2.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../.libs/stringtemplate-3.2.jar!/" />
+          <root url="jar://$MODULE_DIR$/../build/libs/stringtemplate-3.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
       </library>
     </orderEntry>
     <orderEntry type="module-library" exported="">
-      <library name="swt.jar">
+      <library name="swt-debug.jar">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../.libs/swt.jar!/" />
+          <root url="jar://$MODULE_DIR$/../build/libs/swt-debug.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
--- a/idea/javafx.iml	Thu Jul 04 10:12:33 2013 +0200
+++ b/idea/javafx.iml	Thu Jul 04 06:15:22 2013 -0400
@@ -4,11 +4,10 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$/..">
       <excludeFolder url="file://$MODULE_DIR$/../.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/../.libs" />
+      <excludeFolder url="file://$MODULE_DIR$/../build/libs" />
     </content>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="inheritedJdk" />
-    <orderEntry type="library" name="gradle-1.4" level="application" />
   </component>
 </module>
 
--- a/netbeans/buildSrc/nbproject/project.properties	Thu Jul 04 10:12:33 2013 +0200
+++ b/netbeans/buildSrc/nbproject/project.properties	Thu Jul 04 06:15:22 2013 -0400
@@ -27,16 +27,16 @@
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.ant-1.8.2.jar=../../.libs/ant-1.8.2.jar
-file.reference.antlr-3.1.3.jar=../../.libs/antlr-3.1.3.jar
-file.reference.antlr-runtime-3.1.3.jar=../../.libs/antlr-runtime-3.1.3.jar
+file.reference.ant-1.8.2.jar=../../build/libs/ant-1.8.2.jar
+file.reference.antlr-3.1.3.jar=../../build/libs/antlr-3.1.3.jar
+file.reference.antlr-runtime-3.1.3.jar=../../build/libs/antlr-runtime-3.1.3.jar
 file.reference.build-generated-src=../../buildSrc/build/generated-src
 file.reference.main-antlr=../../buildSrc/src/main/antlr
 file.reference.generated-src.antlr=../../buildSrc/build/generated-src/antlr
 file.reference.main-java=../../buildSrc/src/main/java
-file.reference.plugin.jar=../../.libs/plugin.jar
-file.reference.stringtemplate-3.2.jar=../../.libs/stringtemplate-3.2.jar
-file.reference.swt.jar=../../.libs/swt.jar
+file.reference.plugin.jar=../../build/libs/plugin.jar
+file.reference.stringtemplate-3.2.jar=../../build/libs/stringtemplate-3.2.jar
+file.reference.swt-debug.jar=../../build/libs/swt-debug.jar
 includes=**
 jar.compress=false
 javac.classpath=\
@@ -45,7 +45,7 @@
     ${file.reference.antlr-runtime-3.1.3.jar}:\
     ${file.reference.plugin.jar}:\
     ${file.reference.stringtemplate-3.2.jar}:\
-    ${file.reference.swt.jar}
+    ${file.reference.swt-debug.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
--- a/netbeans/fxpackager/nbproject/project.properties	Thu Jul 04 10:12:33 2013 +0200
+++ b/netbeans/fxpackager/nbproject/project.properties	Thu Jul 04 06:15:22 2013 -0400
@@ -27,9 +27,8 @@
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
-file.reference.ant-1.8.2.jar=../../.libs/ant-1.8.2.jar
+file.reference.ant-1.8.2.jar=../../build/libs/ant-1.8.2.jar
 file.reference.main-java=../../modules/fxpackager/src/main/java
-file.reference.main-java-1=../../modules/fxpackager/test/main/java
 includes=**
 jar.compress=false
 javac.classpath=\
@@ -45,7 +44,8 @@
     ${javac.classpath}:\
     ${build.classes.dir}:\
     ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
+    ${libs.junit_4.classpath}:\
+    ${file.reference.ant-1.8.2.jar}
 javac.test.processorpath=\
     ${javac.test.classpath}
 javadoc.additionalparam=
@@ -76,4 +76,4 @@
     ${build.test.classes.dir}
 source.encoding=UTF-8
 src.dir=${file.reference.main-java}
-test.src.dir=${file.reference.main-java-1}
+test.src.dir=${file.reference.main-java}
--- a/netbeans/graphics/nbproject/project.properties	Thu Jul 04 10:12:33 2013 +0200
+++ b/netbeans/graphics/nbproject/project.properties	Thu Jul 04 06:15:22 2013 -0400
@@ -1,107 +1,107 @@
-annotation.processing.enabled=true
-annotation.processing.enabled.in.editor=false
-annotation.processing.processors.list=
-annotation.processing.run.all.processors=true
-annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
-application.title=graphics
-application.vendor=cyang
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-build.generated.sources.dir=${build.dir}/generated-sources
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-# Uncomment to specify the preferred debugger connection transport:
-#debug.transport=dt_socket
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/graphics.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-endorsed.classpath=
-excludes=
-file.reference.builders.jar=../../modules/builders/build/libs/builders.jar
-file.reference.generated-src-jsl-decora=../../modules/graphics/build/generated-src/jsl-decora
-file.reference.generated-src-jsl-prism=../../modules/graphics/build/generated-src/jsl-prism
-file.reference.hlsl-Decora=../../modules/graphics/build/hlsl/Decora
-file.reference.hlsl-Prism=../../modules/graphics/build/hlsl/Prism
-file.reference.main-docs=../../modules/graphics/src/main/docs
-file.reference.main-java=../../modules/graphics/src/main/java
-file.reference.main-jsl-decora=../../modules/graphics/src/main/jsl-decora
-file.reference.main-jsl-prism=../../modules/graphics/src/main/jsl-prism
-file.reference.plugin.jar=../../.libs/plugin.jar
-file.reference.resources-jsl-decora=../../modules/graphics/build/resources/jsl-decora
-file.reference.resources-jsl-prism=../../modules/graphics/build/resources/jsl-prism
-file.reference.stringtemplate-3.2.jar=../../.libs/stringtemplate-3.2.jar
-file.reference.stub-java=../../modules/graphics/src/stub/java
-file.reference.swt.jar=../../.libs/swt.jar
-file.reference.test-java=../../modules/graphics/src/test/java
-includes=**
-jar.compress=false
-javac.classpath=\
-    ${file.reference.builders.jar}:\
-    ${file.reference.plugin.jar}:\
-    ${file.reference.stringtemplate-3.2.jar}:\
-    ${file.reference.swt.jar}:\
-    ${libs.junit_4.classpath}:\
-    ${reference.base.jar}:\
-    ${reference.buildSrc.jar}
-# Space-separated list of extra javac options
-javac.compilerargs=-XDignore.symbol.file
-javac.deprecation=false
-javac.processorpath=\
-    ${javac.classpath}
-javac.source=1.8
-javac.target=1.8
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
-javac.test.processorpath=\
-    ${javac.test.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-main.class=
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-mkdist.disabled=false
-platform.active=JDK_1.8
-project.base=../base
-project.buildSrc=../buildSrc
-reference.base.jar=${project.base}/dist/base.jar
-reference.buildSrc.jar=${project.buildSrc}/dist/buildSrc.jar
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project.
-# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
-# To set system properties for unit tests define test-sys-prop.name=value:
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=${file.reference.main-java}
-src.java.dir=${file.reference.stub-java}
-src.jsl-decora.dir=${file.reference.resources-jsl-decora}
-src.jsl-decora2.dir=${file.reference.generated-src-jsl-decora}
-src.jsl-prism.dir=${file.reference.resources-jsl-prism}
-src.jsl-prism2.dir=${file.reference.generated-src-jsl-prism}
-test.src.dir=${file.reference.test-java}
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=graphics
+application.vendor=cyang
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/graphics.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+file.reference.builders.jar=../../modules/builders/build/libs/builders.jar
+file.reference.generated-src-jsl-decora=../../modules/graphics/build/generated-src/jsl-decora
+file.reference.generated-src-jsl-prism=../../modules/graphics/build/generated-src/jsl-prism
+file.reference.hlsl-Decora=../../modules/graphics/build/hlsl/Decora
+file.reference.hlsl-Prism=../../modules/graphics/build/hlsl/Prism
+file.reference.main-docs=../../modules/graphics/src/main/docs
+file.reference.main-java=../../modules/graphics/src/main/java
+file.reference.main-jsl-decora=../../modules/graphics/src/main/jsl-decora
+file.reference.main-jsl-prism=../../modules/graphics/src/main/jsl-prism
+file.reference.plugin.jar=../../build/libs/plugin.jar
+file.reference.resources-jsl-decora=../../modules/graphics/build/resources/jsl-decora
+file.reference.resources-jsl-prism=../../modules/graphics/build/resources/jsl-prism
+file.reference.stringtemplate-3.2.jar=../../build/libs/stringtemplate-3.2.jar
+file.reference.stub-java=../../modules/graphics/src/stub/java
+file.reference.swt-debug.jar=../../build/libs/swt-debug.jar
+file.reference.test-java=../../modules/graphics/src/test/java
+includes=**
+jar.compress=false
+javac.classpath=\
+    ${file.reference.builders.jar}:\
+    ${file.reference.plugin.jar}:\
+    ${file.reference.stringtemplate-3.2.jar}:\
+    ${file.reference.swt-debug.jar}:\
+    ${libs.junit_4.classpath}:\
+    ${reference.base.jar}:\
+    ${reference.buildSrc.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=-XDignore.symbol.file
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.8
+javac.target=1.8
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}:\
+    ${libs.junit.classpath}:\
+    ${libs.junit_4.classpath}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+main.class=
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=JDK_1.8
+project.base=../base
+project.buildSrc=../buildSrc
+reference.base.jar=${project.base}/dist/base.jar
+reference.buildSrc.jar=${project.buildSrc}/dist/buildSrc.jar
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project.
+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
+# To set system properties for unit tests define test-sys-prop.name=value:
+run.jvmargs=
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=${file.reference.main-java}
+src.java.dir=${file.reference.stub-java}
+src.jsl-decora.dir=${file.reference.resources-jsl-decora}
+src.jsl-decora2.dir=${file.reference.generated-src-jsl-decora}
+src.jsl-prism.dir=${file.reference.resources-jsl-prism}
+src.jsl-prism2.dir=${file.reference.generated-src-jsl-prism}
+test.src.dir=${file.reference.test-java}
--- a/netbeans/swt/nbproject/project.properties	Thu Jul 04 10:12:33 2013 +0200
+++ b/netbeans/swt/nbproject/project.properties	Thu Jul 04 06:15:22 2013 -0400
@@ -28,11 +28,11 @@
 endorsed.classpath=
 excludes=
 file.reference.main-java=../../modules/swt/src/main/java
-file.reference.swt.jar=../../.libs/swt.jar
+file.reference.swt-debug.jar=../../build/libs/sw-debug.jar
 includes=**
 jar.compress=false
 javac.classpath=\
-    ${file.reference.swt.jar}:\
+    ${file.reference.swt-debug.jar}:\
     ${reference.base.jar}:\
     ${reference.graphics.jar}
 # Space-separated list of extra javac options