more build testing

Author: codeanticode

.gitignore

@@ -1,13 +1,18 @@
-dist
 mode/processing-core.zip
+mode/mode/*.jar
 
-.DS_Store
-*/**/.DS_Store
+mode/libraries/vr/library
+mode/tools/SDKUpdated/tool
 
-build
-*/**/build
-bin
-*/**/bin
+core/debug/.gradle
+core/debug/.idea
+core/debug/gradle
 
+**/.DS_Store
+**/build
+**/bin
+**/dist
+
+.local.properties
 .gradle
 

build.gradle

@@ -1,3 +1,8 @@
+import java.nio.file.Files
+import org.zeroturnaround.zip.ZipUtil
+import org.apache.commons.io.FileUtils
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+
 apply plugin: 'java'
 
 buildscript {
@@ -7,10 +12,15 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath group: 'commons-io', name: 'commons-io', version: '2.5'
+        classpath group: 'org.zeroturnaround', name: 'zt-zip', version: '1.9'        
     }
 }
 
 allprojects {
+    apply plugin: 'java'    
+    apply plugin: 'java-library'
+
     Properties modeProperties = new Properties()
     modeProperties.load(project.rootProject.file('mode/mode.properties').newDataInputStream())
     ext.modeVersion = modeProperties.getProperty('prettyVersion')
@@ -43,3 +53,43 @@ allprojects {
 clean.doFirst {
     delete "dist"
 }
+
+task dist {
+  dependsOn subprojects.build
+  doLast {
+        def root = "$buildDir/zip/AndroidMode"
+        
+        // Copy assets to build dir
+        FileUtils.copyDirectory(file("mode/templates"), file("$root/templates"))
+        FileUtils.copyDirectory(file("mode/examples"), file("$root/examples"))
+        FileUtils.copyDirectory(file("mode/icons"), file("$root/icons"))
+        FileUtils.copyDirectory(file("mode/mode"), file("$root/mode"))
+        FileUtils.copyDirectory(file("mode/theme"), file("$root/theme"))
+                   
+        Files.copy(file("mode/processing-core.zip").toPath(),
+                   file("$root/processing-core.zip").toPath(), REPLACE_EXISTING);
+
+        Files.copy(file("mode/mode.properties").toPath(),
+                   file("$root/mode.properties").toPath(), REPLACE_EXISTING);
+
+        FileUtils.copyDirectory(file("mode/tools/SDKUpdater/tool"), 
+                                file("$root/tools/SDKUpdater/tool"))
+        FileUtils.copyDirectory(file("mode/tools/SDKUpdater/src"), 
+                                file("$root/tools/SDKUpdater/src"))
+        
+        FileUtils.copyDirectory(file("mode/libraries/vr/examples"), 
+                                file("$root/libraries/vr/examples"))
+        FileUtils.copyDirectory(file("mode/libraries/vr/library"), 
+                                file("$root/libraries/vr/library"))
+        FileUtils.copyDirectory(file("mode/libraries/vr/src"), 
+                                file("$root/libraries/vr/src"))
+        Files.copy(file("mode/libraries/vr/library.properties").toPath(),
+                   file("$root/libraries/vr/library.properties").toPath(), REPLACE_EXISTING);                             
+
+        File distFolder = file("dist");
+        distFolder.mkdirs();
+        ZipUtil.pack(file("$buildDir/zip"), new File("dist/AndroidMode.zip"));
+        Files.copy(file("mode/mode.properties").toPath(),
+                   file("dist/AndroidMode.txt").toPath(), REPLACE_EXISTING);
+    }
+}

build.xml

@@ -11,7 +11,6 @@ import static org.gradle.api.internal.artifacts.ArtifactAttributes.ARTIFACT_FORM
 import java.nio.file.Files
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 
-apply plugin: 'java-library'
 apply plugin: 'maven'
 
 /**

core/build.gradle

@@ -1,9 +1,7 @@
 import java.nio.file.Files
+import org.zeroturnaround.zip.ZipUtil
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 
-apply plugin: 'java'
-apply plugin: 'java-library'
-
 dependencies {
 
     def PROCESSING_VERSION = '3.3.7'
@@ -38,25 +36,22 @@ task permissions(type:Exec) {
    commandLine 'python', 'permissions.py'
 } 
 
+
 task wrapper(type: Wrapper) {
-   gradleVersion = '4.4.1' //version required
+   gradleVersion = '4.4.1' //version required for gradle wrapper
 }
 wrapper.doLast {
   File wrapperFolder = file("mode/gradlew");
   wrapperFolder.mkdirs();
   file("gradle").renameTo(file("mode/gradlew/gradle"))
   file("gradlew").renameTo(file("mode/gradlew/gradlew"))
   file("gradlew.bat").renameTo(file("mode/gradlew/gradlew.bat"))
+  ZipUtil.pack(file("mode/gradlew"), new File("mode/gradlew.zip"));
+  delete "mode/gradlew"
 
   println("Done with creating wrapper")
 }
-task myZip(type: Zip) {
-   from 'mode/gradlew/'
-   include '*'
-   include '*/*' //to include contents of a folder present inside Reports directory
-   archiveName 'gradlew.zip'
-   destinationDir(file('mode'))
-}
+
 
 task updateGradlew(type:Exec) {
    // This task retrieves the latest list of Android permissions and adds them

gradle.properties

@@ -11,7 +11,6 @@ import static org.gradle.api.internal.artifacts.ArtifactAttributes.ARTIFACT_FORM
 import java.nio.file.Files
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 
-apply plugin: 'java-library'
 apply plugin: 'maven'
 
 /**
@@ -132,9 +131,6 @@ sourceSets {
         java {
             srcDirs = ['src/']
         }
-        resources {
-            srcDirs = ['src/']
-        }
     }
 }
 
@@ -160,12 +156,15 @@ jar.doLast { task ->
 
 clean.doFirst {
     delete "dist"
+    delete "library"
 }
 
 build.doLast {
     // // Copying vr jar to library folder
+    File vrJar = file("library/vr.jar")
+    vrJar.mkdirs();
     Files.copy(file("$buildDir/libs/vr.jar").toPath(),
-               file("library/vr.jar").toPath(), REPLACE_EXISTING);   
+               vrJar.toPath(), REPLACE_EXISTING);   
 
     // // Copying the files for release on JCentral
     File distFolder = file("dist");

mode/build.gradle

@@ -1,9 +1,6 @@
 import java.nio.file.Files
 import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 
-apply plugin: 'java'
-apply plugin: 'java-library'
-
 dependencies {
     def PROCESSING_VERSION = '3.3.7'
     compile group: 'org.processing', name: 'pde', version: "$PROCESSING_VERSION"
@@ -17,21 +14,17 @@ sourceSets {
     main {
         java {
             srcDirs = ['src/']
-        }
-        resources {
-            srcDirs = ['src/']
-        }        
+        } 
     }
 }
 
 clean.doFirst {
-    delete "tool/SDKUpdater.jar"
+    delete "tool"
 }
 
 build.doLast {
-    // copy jar file to tool folder
+    // Copy jar file to tool folder
     File toolJar = file("tool/SDKUpdater.jar");
-    //create intermediate folder if they don't exist
     toolJar.mkdirs();
     Files.copy(file("$buildDir/libs/SDKUpdater.jar").toPath(),
                toolJar.toPath(), REPLACE_EXISTING);