You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by ca...@apache.org on 2016/05/19 09:31:28 UTC

[03/16] incubator-quarks git commit: Build api using gradle

Build api using gradle


Project: http://git-wip-us.apache.org/repos/asf/incubator-quarks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-quarks/commit/5d4024c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-quarks/tree/5d4024c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-quarks/diff/5d4024c1

Branch: refs/heads/gradle
Commit: 5d4024c145ccd5f7ed6e05ce9f375ca624976656
Parents: 258e690
Author: Daniel J. Debrunner <de...@us.ibm.com>
Authored: Wed May 18 09:58:27 2016 -0700
Committer: Daniel J. Debrunner <de...@us.ibm.com>
Committed: Wed May 18 09:59:24 2016 -0700

----------------------------------------------------------------------
 build.gradle | 17 +++++++----------
 build.xml    |  5 +++++
 2 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/5d4024c1/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index cdfa5c4..7420faa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,13 @@ subprojects {
 
     apply plugin: 'java'
 
+    // Temp: Change the location of test classes
+    // to match the ant build. This can be removed
+    // once the build is all gradle
+    sourceSets {
+      test.output.classesDir file('test.classes')
+    }
+
     repositories {
       mavenCentral()
     }
@@ -27,18 +34,8 @@ subprojects {
                     'org.slf4j:slf4j-api:1.7.12'
        testCompile 'junit:junit:4.12'
     }
-
-task copy << {
-    //def manifestCp = ''
-    //configurations.compile.copy().allDependencies
-    //    .each { dep -> println dep.files }
-
-    println configurations.compile.copy().collect() { it.getName() }.join(' ')
-}
-
 } 
 
 clean.doFirst {
     delete target
 }
-

http://git-wip-us.apache.org/repos/asf/incubator-quarks/blob/5d4024c1/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 93f3fdc..cf1892f 100644
--- a/build.xml
+++ b/build.xml
@@ -98,6 +98,9 @@
   <macrodef name="subprojects">
       <attribute name="target"/>
       <sequential>		
+
+      <!-- These are being built by Gradle
+            
         <ant dir="api/function" target="@{target}" useNativeBasedir="true"/>
         <ant dir="api/execution" target="@{target}" useNativeBasedir="true"/>
         <ant dir="api/window" target="@{target}" useNativeBasedir="true"/>
@@ -106,6 +109,8 @@
         <ant dir="api/topology" target="@{target}" useNativeBasedir="true"/>
         <ant dir="spi/graph" target="@{target}" useNativeBasedir="true"/>
         <ant dir="spi/topology" target="@{target}" useNativeBasedir="true"/>
+        -->
+
         <ant dir="runtime/appservice" target="@{target}" useNativeBasedir="true"/>
         <ant dir="runtime/etiao" target="@{target}" useNativeBasedir="true"/>
         <ant dir="runtime/jmxcontrol" target="@{target}" useNativeBasedir="true"/>