From 644cf9167a79a397b7352f680bccce0bae9f2f62 Mon Sep 17 00:00:00 2001 From: Seth Goings Date: Wed, 23 Jul 2014 16:36:19 -0600 Subject: [PATCH 1/8] Have Makefile pull version from gradle.properties --- build.gradle | 19 +++++++++++++++++++ makefile | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 3d5facd94c..e2c3157e99 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,7 @@ buildscript { apply plugin: 'native-component' apply plugin: 'ivy-publish' apply plugin: 'com.jfrog.artifactory' +apply plugin: 'java' artifactory { contextUrl = "http://oss.jfrog.org" @@ -39,6 +40,24 @@ model { } } +tasks.withType(JavaCompile) { + sourceCompatibility = "1.6" + targetCompatibility = "1.6" + + options.encoding = "UTF-8" +} + +sourceSets { + main { + java { + srcDir 'classpath' + } + resources { + srcDir 'classpath' + } + } +} + publishing { repositories { ivy { diff --git a/makefile b/makefile index 2a763ecb71..6d1b3477c8 100755 --- a/makefile +++ b/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/' \ @@ -1587,6 +1587,7 @@ $(classpath-build)/%.class: $(classpath-src)/%.java $(classpath-dep): $(classpath-sources) $(classpath-jar-dep) @echo "compiling classpath classes" + @echo $(boot-classpath) @mkdir -p $(classpath-build) classes="$(shell $(MAKE) -s --no-print-directory build=$(build) \ $(classpath-classes))"; if [ -n "$${classes}" ]; then \ From f4219caa28329cd43c9acaa43ab80bb2e1c1ce9a Mon Sep 17 00:00:00 2001 From: Seth Goings Date: Wed, 23 Jul 2014 17:26:48 -0600 Subject: [PATCH 2/8] Set up bootclasspath on javacompile targets --- build.gradle | 9 ++++++++- makefile | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index e2c3157e99..989277a0bc 100644 --- a/build.gradle +++ b/build.gradle @@ -28,6 +28,10 @@ artifactory { username = System.env.BINTRAY_USER password = System.env.BINTRAY_API_KEY } + + defaults { + //publications('linux-x86_64') + } } } @@ -44,7 +48,10 @@ tasks.withType(JavaCompile) { sourceCompatibility = "1.6" targetCompatibility = "1.6" - options.encoding = "UTF-8" + options.with { + encoding = "UTF-8" + bootClasspath = sourceSets.main.output.classesDir + } } sourceSets { diff --git a/makefile b/makefile index 6d1b3477c8..77b3fcaf96 100755 --- a/makefile +++ b/makefile @@ -1587,7 +1587,6 @@ $(classpath-build)/%.class: $(classpath-src)/%.java $(classpath-dep): $(classpath-sources) $(classpath-jar-dep) @echo "compiling classpath classes" - @echo $(boot-classpath) @mkdir -p $(classpath-build) classes="$(shell $(MAKE) -s --no-print-directory build=$(build) \ $(classpath-classes))"; if [ -n "$${classes}" ]; then \ From fda597ed2bcf8ea8ba554b18ffe3909f5315a5bf Mon Sep 17 00:00:00 2001 From: Seth Goings Date: Wed, 23 Jul 2014 18:04:19 -0600 Subject: [PATCH 3/8] Add artifactoryPublish into travis ci build --- .travis.yml | 8 ++++++-- build.gradle | 51 +++++++++++++++++++++++++++------------------------ 2 files changed, 33 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 132e7ef2d7..86233e157d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,11 @@ language: cpp env: global: - secure: Pe7OLUvdk3DeTAShyaYsdAXBcnjdNOrtfTPt1mCP5+JKBUw3z0n7BpTgATVRBmkn866pDqxL0N3+jBgjKUpEpqOj23bTB2AeDdIzlYkFGvTd3GQQV1lMFn16I9LOgWJhkfICTJ1rIYiNf8xSkJoeKGB7eGUM0KGsTvelFfsaGVc= -script: ./test/ci.sh + - secure: OWgsHP9ijb7oLpZVJqlovccT+OO3uAWEZxVdT/rNFS1riGoTSwi1ptlHUw/lEZY1Lw1dEaSW6kfc2rqpTgsHOFQpcdJeK8E29TLn1x25kYaGzo6JY2wWi5q4I3IMRRcFEharXlucJUO6yZWqhDXZTD4J8yf+wXt4blSRrAXil50= + - secure: T19BYOl5UB5vTDD3Q2np0iHroPm1elHhCW7AOkUPnjXE+mwMTWQlRm1LxbZ+tv1dykUSlhBwdLP7dNWRzWa1JbAY6Y2SbMmwfdryZTBaELcXWsTcGOP80pKx1ruY30mQfyguVukfIZj8qvRSIMwXCYm+Do+XffC8fmqXSTBRulA= + +install: ./gradlew artifactoryPublish +script: "./test/ci.sh" after_success: - make javadoc -- .utility/push-javadoc-to-gh-pages.sh +- ".utility/push-javadoc-to-gh-pages.sh" diff --git a/build.gradle b/build.gradle index 989277a0bc..f26469e800 100644 --- a/build.gradle +++ b/build.gradle @@ -4,36 +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' - -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 - } - - defaults { - //publications('linux-x86_64') - } - } -} +apply plugin: 'artifactory-publish' model { platforms { @@ -108,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' } \ No newline at end of file From d2a4ec9da4b86a8b6cc251dc23353fedc827b8ce Mon Sep 17 00:00:00 2001 From: Seth Goings Date: Wed, 23 Jul 2014 18:08:25 -0600 Subject: [PATCH 4/8] Improve .travis.ci file to publish after ci script --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 86233e157d..3184e5d94b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,10 @@ env: - secure: OWgsHP9ijb7oLpZVJqlovccT+OO3uAWEZxVdT/rNFS1riGoTSwi1ptlHUw/lEZY1Lw1dEaSW6kfc2rqpTgsHOFQpcdJeK8E29TLn1x25kYaGzo6JY2wWi5q4I3IMRRcFEharXlucJUO6yZWqhDXZTD4J8yf+wXt4blSRrAXil50= - secure: T19BYOl5UB5vTDD3Q2np0iHroPm1elHhCW7AOkUPnjXE+mwMTWQlRm1LxbZ+tv1dykUSlhBwdLP7dNWRzWa1JbAY6Y2SbMmwfdryZTBaELcXWsTcGOP80pKx1ruY30mQfyguVukfIZj8qvRSIMwXCYm+Do+XffC8fmqXSTBRulA= -install: ./gradlew artifactoryPublish script: "./test/ci.sh" + after_success: +- make clean build +- ./gradlew artifactoryPublish - make javadoc - ".utility/push-javadoc-to-gh-pages.sh" From 6600dfd98df941c6e0a5c74488161bf88379bd0f Mon Sep 17 00:00:00 2001 From: Seth Goings Date: Wed, 23 Jul 2014 18:10:07 -0600 Subject: [PATCH 5/8] Make terminal dumb to be able to show better Gradle output --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3184e5d94b..600c7f4d70 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ env: - secure: Pe7OLUvdk3DeTAShyaYsdAXBcnjdNOrtfTPt1mCP5+JKBUw3z0n7BpTgATVRBmkn866pDqxL0N3+jBgjKUpEpqOj23bTB2AeDdIzlYkFGvTd3GQQV1lMFn16I9LOgWJhkfICTJ1rIYiNf8xSkJoeKGB7eGUM0KGsTvelFfsaGVc= - secure: OWgsHP9ijb7oLpZVJqlovccT+OO3uAWEZxVdT/rNFS1riGoTSwi1ptlHUw/lEZY1Lw1dEaSW6kfc2rqpTgsHOFQpcdJeK8E29TLn1x25kYaGzo6JY2wWi5q4I3IMRRcFEharXlucJUO6yZWqhDXZTD4J8yf+wXt4blSRrAXil50= - secure: T19BYOl5UB5vTDD3Q2np0iHroPm1elHhCW7AOkUPnjXE+mwMTWQlRm1LxbZ+tv1dykUSlhBwdLP7dNWRzWa1JbAY6Y2SbMmwfdryZTBaELcXWsTcGOP80pKx1ruY30mQfyguVukfIZj8qvRSIMwXCYm+Do+XffC8fmqXSTBRulA= + - TERM=dumb script: "./test/ci.sh" From b717f86e47954eadd1607d3b578065de697219e1 Mon Sep 17 00:00:00 2001 From: Seth Goings Date: Wed, 23 Jul 2014 18:24:17 -0600 Subject: [PATCH 6/8] Parallelize travis builds --- .travis.yml | 11 ++++++++++- test/ci.sh | 34 ++++++++++++---------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 600c7f4d70..859f0f85f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,17 @@ env: - secure: OWgsHP9ijb7oLpZVJqlovccT+OO3uAWEZxVdT/rNFS1riGoTSwi1ptlHUw/lEZY1Lw1dEaSW6kfc2rqpTgsHOFQpcdJeK8E29TLn1x25kYaGzo6JY2wWi5q4I3IMRRcFEharXlucJUO6yZWqhDXZTD4J8yf+wXt4blSRrAXil50= - secure: T19BYOl5UB5vTDD3Q2np0iHroPm1elHhCW7AOkUPnjXE+mwMTWQlRm1LxbZ+tv1dykUSlhBwdLP7dNWRzWa1JbAY6Y2SbMmwfdryZTBaELcXWsTcGOP80pKx1ruY30mQfyguVukfIZj8qvRSIMwXCYm+Do+XffC8fmqXSTBRulA= - TERM=dumb + - MAKE_ARGS="jdk-test" + - MAKE_ARGS="test" + - MAKE_ARGS="mode=debug test" + - MAKE_ARGS="process=interpret test" + - MAKE_ARGS="bootimage=true test" + - MAKE_ARGS="mode=debug bootimage=true test" + - MAKE_ARGS="openjdk=$JAVA_HOME test" + - MAKE_ARGS="tails=true continuations=true heapdump=true test" + - MAKE_ARGS="codegen-targets=all" -script: "./test/ci.sh" +script: "./test/ci.sh ${MAKE_ARGS}" after_success: - make clean build diff --git a/test/ci.sh b/test/ci.sh index 686879227d..e5f1edcfaf 100755 --- a/test/ci.sh +++ b/test/ci.sh @@ -9,26 +9,16 @@ run() { "${@}" } -if [ -z "${test_target}" ]; then - test_target=test +if [ ${#} -gt 0 ]; then + 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 From ed97d55e4e967533bcb7a2042f32c7a3c4ff66a6 Mon Sep 17 00:00:00 2001 From: Seth Goings Date: Wed, 23 Jul 2014 18:36:02 -0600 Subject: [PATCH 7/8] Adjust travis.yml --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 859f0f85f2..6c213a8bd7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,11 @@ language: cpp env: global: - - secure: Pe7OLUvdk3DeTAShyaYsdAXBcnjdNOrtfTPt1mCP5+JKBUw3z0n7BpTgATVRBmkn866pDqxL0N3+jBgjKUpEpqOj23bTB2AeDdIzlYkFGvTd3GQQV1lMFn16I9LOgWJhkfICTJ1rIYiNf8xSkJoeKGB7eGUM0KGsTvelFfsaGVc= - - secure: OWgsHP9ijb7oLpZVJqlovccT+OO3uAWEZxVdT/rNFS1riGoTSwi1ptlHUw/lEZY1Lw1dEaSW6kfc2rqpTgsHOFQpcdJeK8E29TLn1x25kYaGzo6JY2wWi5q4I3IMRRcFEharXlucJUO6yZWqhDXZTD4J8yf+wXt4blSRrAXil50= - - secure: T19BYOl5UB5vTDD3Q2np0iHroPm1elHhCW7AOkUPnjXE+mwMTWQlRm1LxbZ+tv1dykUSlhBwdLP7dNWRzWa1JbAY6Y2SbMmwfdryZTBaELcXWsTcGOP80pKx1ruY30mQfyguVukfIZj8qvRSIMwXCYm+Do+XffC8fmqXSTBRulA= - - TERM=dumb + - secure: Pe7OLUvdk3DeTAShyaYsdAXBcnjdNOrtfTPt1mCP5+JKBUw3z0n7BpTgATVRBmkn866pDqxL0N3+jBgjKUpEpqOj23bTB2AeDdIzlYkFGvTd3GQQV1lMFn16I9LOgWJhkfICTJ1rIYiNf8xSkJoeKGB7eGUM0KGsTvelFfsaGVc= + - secure: OWgsHP9ijb7oLpZVJqlovccT+OO3uAWEZxVdT/rNFS1riGoTSwi1ptlHUw/lEZY1Lw1dEaSW6kfc2rqpTgsHOFQpcdJeK8E29TLn1x25kYaGzo6JY2wWi5q4I3IMRRcFEharXlucJUO6yZWqhDXZTD4J8yf+wXt4blSRrAXil50= + - secure: T19BYOl5UB5vTDD3Q2np0iHroPm1elHhCW7AOkUPnjXE+mwMTWQlRm1LxbZ+tv1dykUSlhBwdLP7dNWRzWa1JbAY6Y2SbMmwfdryZTBaELcXWsTcGOP80pKx1ruY30mQfyguVukfIZj8qvRSIMwXCYm+Do+XffC8fmqXSTBRulA= + - TERM=dumb + matrix: - MAKE_ARGS="jdk-test" - MAKE_ARGS="test" - MAKE_ARGS="mode=debug test" From fc99355c0d156b946230d3975c7c5f51dddbcabc Mon Sep 17 00:00:00 2001 From: Seth Goings Date: Wed, 23 Jul 2014 18:40:51 -0600 Subject: [PATCH 8/8] simplify .travis.yml for now --- .travis.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c213a8bd7..d30a030bae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,18 +5,8 @@ env: - secure: OWgsHP9ijb7oLpZVJqlovccT+OO3uAWEZxVdT/rNFS1riGoTSwi1ptlHUw/lEZY1Lw1dEaSW6kfc2rqpTgsHOFQpcdJeK8E29TLn1x25kYaGzo6JY2wWi5q4I3IMRRcFEharXlucJUO6yZWqhDXZTD4J8yf+wXt4blSRrAXil50= - secure: T19BYOl5UB5vTDD3Q2np0iHroPm1elHhCW7AOkUPnjXE+mwMTWQlRm1LxbZ+tv1dykUSlhBwdLP7dNWRzWa1JbAY6Y2SbMmwfdryZTBaELcXWsTcGOP80pKx1ruY30mQfyguVukfIZj8qvRSIMwXCYm+Do+XffC8fmqXSTBRulA= - TERM=dumb - matrix: - - MAKE_ARGS="jdk-test" - - MAKE_ARGS="test" - - MAKE_ARGS="mode=debug test" - - MAKE_ARGS="process=interpret test" - - MAKE_ARGS="bootimage=true test" - - MAKE_ARGS="mode=debug bootimage=true test" - - MAKE_ARGS="openjdk=$JAVA_HOME test" - - MAKE_ARGS="tails=true continuations=true heapdump=true test" - - MAKE_ARGS="codegen-targets=all" -script: "./test/ci.sh ${MAKE_ARGS}" +script: "./test/ci.sh" after_success: - make clean build