Merge pull request #308 from sgoings/master

Avian UX Upgrade: Init Gradle Java Build

.travis.yml

@@ -1,8 +1,15 @@
 language: cpp
 env:
   global:
-  - secure: Pe7OLUvdk3DeTAShyaYsdAXBcnjdNOrtfTPt1mCP5+JKBUw3z0n7BpTgATVRBmkn866pDqxL0N3+jBgjKUpEpqOj23bTB2AeDdIzlYkFGvTd3GQQV1lMFn16I9LOgWJhkfICTJ1rIYiNf8xSkJoeKGB7eGUM0KGsTvelFfsaGVc=
+    - secure: Pe7OLUvdk3DeTAShyaYsdAXBcnjdNOrtfTPt1mCP5+JKBUw3z0n7BpTgATVRBmkn866pDqxL0N3+jBgjKUpEpqOj23bTB2AeDdIzlYkFGvTd3GQQV1lMFn16I9LOgWJhkfICTJ1rIYiNf8xSkJoeKGB7eGUM0KGsTvelFfsaGVc=
-script: ./test/ci.sh
+    - secure: OWgsHP9ijb7oLpZVJqlovccT+OO3uAWEZxVdT/rNFS1riGoTSwi1ptlHUw/lEZY1Lw1dEaSW6kfc2rqpTgsHOFQpcdJeK8E29TLn1x25kYaGzo6JY2wWi5q4I3IMRRcFEharXlucJUO6yZWqhDXZTD4J8yf+wXt4blSRrAXil50=
+    - secure: T19BYOl5UB5vTDD3Q2np0iHroPm1elHhCW7AOkUPnjXE+mwMTWQlRm1LxbZ+tv1dykUSlhBwdLP7dNWRzWa1JbAY6Y2SbMmwfdryZTBaELcXWsTcGOP80pKx1ruY30mQfyguVukfIZj8qvRSIMwXCYm+Do+XffC8fmqXSTBRulA=
+    - TERM=dumb
+
+script: "./test/ci.sh"
+
 after_success:
+- make clean build
+- ./gradlew artifactoryPublish
 - make javadoc
-- .utility/push-javadoc-to-gh-pages.sh
+- ".utility/push-javadoc-to-gh-pages.sh"

build.gradle

@@ -4,31 +4,14 @@ buildscript {
   }
 
   dependencies {
-    classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.0.0'
+    classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:2.2.4'
   }
 }
 
 apply plugin: 'native-component'
 apply plugin: 'ivy-publish'
-apply plugin: 'com.jfrog.artifactory'
+apply plugin: 'java'
-
+apply plugin: 'artifactory-publish'
-artifactory {
-  contextUrl = "http://oss.jfrog.org"
-
-  resolve {
-    repository {
-      repoKey = 'libs-releases'
-    }
-  }
-
-  publish {
-    repository {
-      repoKey = 'oss-snapshot-local'
-      username = System.env.BINTRAY_USER
-      password = System.env.BINTRAY_API_KEY
-    }
-  }
-}
 
 model {
   platforms {
@@ -39,6 +22,27 @@ model {
   }
 }
 
+tasks.withType(JavaCompile) {
+  sourceCompatibility = "1.6"
+  targetCompatibility = "1.6"
+
+  options.with {
+    encoding = "UTF-8"
+    bootClasspath = sourceSets.main.output.classesDir
+  }
+}
+
+sourceSets {
+  main {
+    java {
+      srcDir 'classpath'
+    }
+    resources {
+      srcDir 'classpath'
+    }
+  }
+}
+
 publishing {
   repositories {
     ivy {
@@ -82,6 +86,31 @@ publishing {
   }
 }
 
+artifactory {
+  contextUrl = "http://oss.jfrog.org"
+
+  resolve {
+    repository {
+      repoKey = 'libs-releases'
+    }
+  }
+
+  publish {
+    repository {
+      repoKey = 'oss-snapshot-local'
+      username = System.env.BINTRAY_USER
+      password = System.env.BINTRAY_API_KEY
+      ivy {
+        ivyLayout = "[organisation]/[module]/[revision]/ivy-[revision].xml"
+      }
+    }
+
+    defaults {
+      publications 'linux-x86_64'
+    }
+  }
+}
+
 task wrapper(type: Wrapper) {
   gradleVersion = '2.0'
 }

makefile

@@ -1,7 +1,7 @@
 MAKEFLAGS = -s
 
 name = avian
-version = 1.0.2
+version := $(shell grep version gradle.properties | cut -d'=' -f2)
 
 build-arch := $(shell uname -m \
 	| sed 's/^i.86$$/i386/' \

test/ci.sh

@@ -9,26 +9,16 @@ run() {
   "${@}"
 }
 
-if [ -z "${test_target}" ]; then
+if [ ${#} -gt 0 ]; then
-  test_target=test
+  run make ${@}
+else
+  run make jdk-test
+  run make test
+  run make mode=debug test
+  run make process=interpret test
+  run make bootimage=true test
+  run make mode=debug bootimage=true test
+  run make openjdk=$JAVA_HOME test
+  run make tails=true continuations=true heapdump=true test
+  run make codegen-targets=all
 fi
-
-# we shouldn't run jdk-test builds if we're not running the test target
-if [ ${test_target} = test ]; then
- run make ${flags} jdk-test
-fi
-
-run make ${flags} ${test_target}
-run make ${flags} mode=debug ${test_target}
-run make ${flags} process=interpret ${test_target}
-# bootimage and openjdk builds without openjdk-src don't work:
-if [ -z "${openjdk}" ]; then
-  run make ${flags} bootimage=true ${test_target}
-  run make ${flags} mode=debug bootimage=true ${test_target}
-  if [ -z "${android}" ]; then
-    # might as well do an openjdk test while we're here:
-    run make openjdk=$JAVA_HOME ${flags} ${test_target}
-  fi
-fi
-run make ${flags} tails=true continuations=true heapdump=true ${test_target}
-run make ${flags} codegen-targets=all