gradle and ant builds work

Author: codeanticode

build.gradle

@@ -19,9 +19,9 @@ allprojects {
 
     repositories {
         jcenter()
-        flatDir dirs: "$rootDir/core/library"
-        flatDir dirs: "$rootDir/core/build/libs"
-        flatDir dirs: "$rootDir/libraries/vr/library"
+        flatDir dirs: "$rootDir/libs/core/library"
+        flatDir dirs: "$rootDir/libs/core/build/libs"
+        flatDir dirs: "$rootDir/libs/vr/library"
         flatDir dirs: "$sdkdir/tools/lib"        
         flatDir dirs: android_platform
         flatDir dirs: android_tools_lib
@@ -33,8 +33,8 @@ allprojects {
 
 dependencies {
     compile name: 'android'
-    compile project(":core")
-    compile project(":libraries:vr")
+    compile project(":libs:core")
+    compile project(":libs:vr")
     compile group: 'org.processing', name: 'core', version: '3.3.6'
     compile group: 'org.processing', name: 'pde', version: '3.3.6'
     compile group: 'org.processing', name: 'java-mode', version: '3.3.6'
@@ -70,7 +70,7 @@ task dist {
         Files.copy(file("$buildDir/libs/processing-android.jar").toPath(),
                    file("mode/AndroidMode.jar").toPath(), REPLACE_EXISTING);
 
-        Files.copy(file("core/build/libs/processing-core.zip").toPath(),
+        Files.copy(file("libs/core/build/libs/processing-core.zip").toPath(),
                    file("$root/processing-core.zip").toPath(), REPLACE_EXISTING);
 
         Files.copy(file("mode.properties").toPath(),
@@ -81,16 +81,16 @@ task dist {
         FileUtils.copyDirectory(file("tools/SDKUpdater/src"), 
                                 file("$root/tools/SDKUpdater/src"))
 
-        FileUtils.copyDirectory(file("libraries/vr/examples"), 
-                                file("$root/libraries/vr/examples"))
-        FileUtils.copyDirectory(file("libraries/vr/gvrsdk"), 
-                                file("$root/libraries/vr/gvrsdk"))
-        FileUtils.copyDirectory(file("libraries/vr/library"), 
-                                file("$root/libraries/vr/library"))
-        FileUtils.copyDirectory(file("libraries/vr/src"), 
-                                file("$root/libraries/vr/src"))
-        Files.copy(file("libraries/vr/library.properties").toPath(),
-                   file("$root/libraries/vr/library.properties").toPath(), REPLACE_EXISTING);                             
+        FileUtils.copyDirectory(file("libs/vr/examples"), 
+                                file("$root/libs/vr/examples"))
+        FileUtils.copyDirectory(file("libs/vr/gvrsdk"), 
+                                file("$root/libs/vr/gvrsdk"))
+        FileUtils.copyDirectory(file("libs/vr/library"), 
+                                file("$root/libs/vr/library"))
+        FileUtils.copyDirectory(file("libs/vr/src"), 
+                                file("$root/libs/vr/src"))
+        Files.copy(file("libs/vr/library.properties").toPath(),
+                   file("$root/libs/vr/library.properties").toPath(), REPLACE_EXISTING);                             
 
         ZipUtil.pack(file("$buildDir/zip"), new File("release/AndroidMode.zip"))        
         Files.copy(file("mode.properties").toPath(),

build.xml

@@ -35,9 +35,9 @@
 	   includeAntRuntime="false"
  	   classpath="${processing.dir}/core/library/core.jar;
  	              ${processing.dir}/java/mode/JavaMode.jar; 
-                  ${processing.dir}/java/mode/org.eclipse.core.runtime.jar;
-                  ${processing.dir}/app/pde.jar;
-                  mode/gradle-tooling-api-4.4.1.jar"
+                ${processing.dir}/java/mode/org.eclipse.core.runtime.jar;
+                ${processing.dir}/app/pde.jar;
+                mode/gradle-tooling-api-4.4.1.jar"
 	   debug="on">
       <src path="src" />
     </javac>
@@ -64,12 +64,12 @@
         <include name="theme/**" />
       	<include name="tools/SDKUpdater/tool/**" />
         <include name="tools/SDKUpdater/src/**" />      	
-        <include name="libraries/vr/library.properties" />        
-        <include name="libraries/vr/examples/**" />
-        <include name="libraries/vr/gvrsdk/**" />
-        <include name="libraries/vr/lib/**" />
-        <include name="libraries/vr/library/**" />
-        <include name="libraries/vr/src/**" />        
+        <include name="libs/vr/library.properties" />        
+        <include name="libs/vr/examples/**" />
+        <include name="libs/vr/gvrsdk/**" />
+        <include name="libs/vr/lib/**" />
+        <include name="libs/vr/library/**" />
+        <include name="libs/vr/src/**" />        
         <exclude name="**/._*" />
       </zipfileset>
     </zip>
@@ -79,19 +79,19 @@
   </target>
 
   <!-- - - - - - - - - - - - - - - - - - -->
-  <!-- Subprojects: Core, Libraries -->
+  <!-- Subprojects: libraries, tools     -->
   <!-- - - - - - - - - - - - - - - - - - -->
 
   <target name="subprojects-clean">
-    <subant buildpath="core" target="clean"/>
-    <subant buildpath="tools/SDKUpdater" target="clean"/>  	
-    <subant buildpath="libraries/vr" target="clean"/>
+    <subant buildpath="libs/core" target="clean"/>
+    <subant buildpath="libs/vr" target="clean"/>
+    <subant buildpath="tools/SDKUpdater" target="clean"/>  	    
   </target>
 
   <target name="subprojects-build">
-    <subant buildpath="core" target="build"/>
+    <subant buildpath="libs/core" target="build"/>
+    <subant buildpath="libs/vr" target="build"/>  	
   	<subant buildpath="tools/SDKUpdater" target="build"/>
-    <subant buildpath="libraries/vr" target="build"/>  	
   </target>
 
 </project>