Merge pull request #574 from jMonkeyEngine/cleanup_build_scripts_master

Improve build scripts (master)
2016-11-25 22:19:27 -05:00 · 2016-11-25 22:19:27 -05:00 · a784818211
commit a784818211
parent 86f6f040e3 40e1e7f289
13 changed files with 243 additions and 220 deletions
--- a/.gitignore
+++ b/.gitignore
@ -14,6 +14,7 @@
 *.jnilib
 *.dylib
 *.iml
+.gradletasknamecache
 .DS_Store
 /jme3-core/src/main/resources/com/jme3/system/version.properties
 /jme3-*/build/
--- a/.travis.yml
+++ b/.travis.yml
@ -1,20 +1,46 @@
 language: java
 sudo: false

-jdk:
-  - oraclejdk8
+branches:
+  only:
+  - master
+  - v3.1
+
+matrix:
+  include:
+  - os: linux
+    jdk: oraclejdk8
+    env: UPLOAD=true
+  - os: linux
+    jdk: openjdk7

 addons:
-  ssh_known_hosts: updates.jmonkeyengine.org
+  apt:
+    packages:
+    - gcc-multilib
+    - g++-multilib
+
+before_install:
+  - git fetch --unshallow

 before_cache:
  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/

 cache:
  directories:
    - $HOME/.gradle/caches/
    - $HOME/.gradle/wrapper/

+install:
+  - ./gradlew assemble
+
+script:
+  - ./gradlew check
+
+after_success:
+  - '[ -n "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ -n "$UPLOAD" ] && ./gradlew bintrayUpload || :'
+
 notifications:
  slack:
    on_success: change
@ -22,12 +48,6 @@ notifications:
    rooms:
      secure: "PWEk4+VL986c3gAjWp12nqyifvxCjBqKoESG9d7zWh1uiTLadTHhZJRMdsye36FCpz/c/Jt7zCRO/5y7FaubQptnRrkrRfjp5f99MJRzQVXnUAM+y385qVkXKRKd/PLpM7XPm4AvjvxHCyvzX2wamRvul/TekaXKB9Ti5FCN87s="

-install:
-  - ./gradlew assemble
-
-script:
-  - ./gradlew check
-
 before_deploy:
  - ./gradlew createZipDistribution
  - export RELEASE_DIST=$(ls build/distributions/*.zip)
@ -43,9 +63,6 @@ deploy:
    repo: jMonkeyEngine/jmonkeyengine
    tags: true

-before_install:
-  - git fetch --unshallow
-  - "[ $TRAVIS_PULL_REQUEST == 'false' ] && openssl aes-256-cbc -K $encrypted_a1949b55824a_key -iv $encrypted_a1949b55824a_iv -in private/www-updater.key.enc -out private/www-updater.key -d || :"

 # before_install:
  # required libs for android build tools
@ -57,6 +74,4 @@ before_install:
  # 7z x ndk.bin -y > /dev/null
  # export ANDROID_NDK=`pwd`/android-ndk-r10c

-after_success:
-  - '[ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && ./gradlew uploadArchives || :'
-  - '[ -n "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && ./gradlew uploadArchives bintrayUpload || :'
+
--- a/appveyor.yml
+++ b/appveyor.yml
@ -0,0 +1,50 @@
+version: 1.0.{build}.{branch}
+
+branches:
+  only:
+  - master
+
+only_commits:
+  files:
+    - jme3-bullet-native/
+
+skip_tags: true
+
+max_jobs: 1
+
+clone_depth: 1
+
+image: Visual Studio 2013
+
+environment:
+  priv_key:
+    secure: g0Q/3gQcGBr74DyDiaTi48DSKEuNAympaHF0pjWeeQgKlPZEBUNPKbBM+okJn13/IvEo5YiQO19l/0G0B6J0oiEAm9h8x+I31jskKFUD5Og9xZkZB0m0aI7zoBReiZTqojIBw8zZo4xXCkOhFTrzxaeJtqdtcObPFGWk4uUdPlcne3e81NHj6TWax2tx+yqA0i6Jkz+Jd+XvbicskgthjCmcNz07XhS7F6niC8REbSU=
+
+init:
+- ps: >-
+    $fileContent = "-----BEGIN EC PRIVATE KEY-----`n"
+    $fileContent += $env:priv_key.Replace(' ', "`n")
+    $fileContent += "`n-----END EC PRIVATE KEY-----`n"
+    Set-Content c:\users\appveyor\.ssh\id_rsa $fileContent
+
+install:
+  - cmd: del C:\Users\appveyor\.gradle\caches\modules-2\modules-2.lock
+
+build_script:
+  - cmd: gradlew.bat --no-daemon -PbuildNativeProjects=true :jme3-bullet-native:assemble
+
+cache:
+- C:\Users\appveyor\.gradle\caches
+- C:\Users\appveyor\.gradle\wrapper
+- jme3-bullet-native\bullet3.zip
+
+test: off
+deploy: off
+
+on_success:
+- cmd: >-
+    git checkout -q %APPVEYOR_REPO_BRANCH%
+    git add -- jme3-bullet-native/libs/native/windows/
+    git commit -m "[ci skip] bullet: update windows natives"
+    git pull -q --rebase
+    git push git@github.com:jMonkeyEngine/jmonkeyengine.git
--- a/build.gradle
+++ b/build.gradle
@ -29,8 +29,8 @@ task run(dependsOn: ':jme3-examples:run') {

 defaultTasks 'run'

-task libDist(dependsOn: subprojects.build) << {
-//    description 'Builds and copies the engine binaries, sources and javadoc to build/libDist'
+task libDist(dependsOn: subprojects.build, description: 'Builds and copies the engine binaries, sources and javadoc to build/libDist') {
+    doLast {
        File libFolder = mkdir("$buildDir/libDist/lib")
        File sourceFolder = mkdir("$buildDir/libDist/sources")
        File javadocFolder = mkdir("$buildDir/libDist/javadoc")
@ -59,6 +59,7 @@ task libDist(dependsOn: subprojects.build) << {
                }
            }
        }
+    }
 }

 task createZipDistribution(type:Zip,dependsOn:["dist","libDist"], description:"Package the nightly zip distribution"){
@ -115,7 +116,7 @@ task mergedSource(type: Copy){
 }

 task wrapper(type: Wrapper, description: 'Creates and deploys the Gradle wrapper to the current directory.') {
-    gradleVersion = '2.13'
+    gradleVersion = '3.2.1'
 }

 ext {
--- a/common.gradle
+++ b/common.gradle
@ -18,16 +18,11 @@ repositories {
    }
 }

-configurations {
-    deployerJars
-}
-
 dependencies {
    // Adding dependencies here will add the dependencies to each subproject.
    testCompile group: 'junit', name: 'junit', version: '4.12'
    testCompile group: 'org.mockito', name: 'mockito-core', version: '2.0.28-beta'
    testCompile group: 'org.easytesting', name: 'fest-assert-core', version: '2.0M10'
-    deployerJars "org.apache.maven.wagon:wagon-ssh:2.9"
 }

 jar {
@ -116,17 +111,3 @@ artifacts {
    archives writeFullPom.outputs.files[0]
 }

-uploadArchives {
-    repositories.mavenDeployer {
-        configuration = configurations.deployerJars
-        
-        // disable this otherwise it will fill up the server with stale jars
-        uniqueVersion = false
-        
-        repository(url: "scp://updates.jmonkeyengine.org/var/www/updates/maven") {
-             authentication(userName: "www-updater", privateKey: "private/www-updater.key")
-        }
-        
-        pom.project pomConfig
-    }
-}
--- a/gradle.properties
+++ b/gradle.properties
@ -8,7 +8,7 @@ jmeVersionTag = SNAPSHOT
 jmeVersionTagID = 0

 # specify if JavaDoc should be built
-buildJavaDoc = true
+buildJavaDoc = false

 # specify if SDK and Native libraries get built
 buildNativeProjects = false
@ -21,10 +21,7 @@ ndkPath = /opt/android-ndk-r10c
 # Path for downloading native Bullet
 bulletUrl = https://github.com/bulletphysics/bullet3/archive/2.83.7.zip
 bulletFolder = bullet3-2.83.7
-bulletZipFile = bullet.zip
-
-# Path for downloading NetBeans Base
-netbeansUrl = http://download.netbeans.org/netbeans/8.0.2/final/zip/netbeans-8.0.2-201411181905-javase.zip
+bulletZipFile = bullet3.zip

 # POM settings
 POM_NAME=jMonkeyEngine
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
-#Sat Apr 30 16:44:31 EDT 2016
+#Fri Nov 25 13:05:50 EST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip
--- a/jme3-bullet-native-android/build.gradle
+++ b/jme3-bullet-native-android/build.gradle
@ -102,7 +102,8 @@ task copyJmeAndroid(type: Copy, dependsOn:copyJmeCpp) {
    into outputDir
 }

-task generateNativeHeaders(dependsOn: copyJmeAndroid) << {
+task generateNativeHeaders(dependsOn: copyJmeAndroid) {
+    doLast {
        String destDirPath = jniPath
        String classes = " \
                com.jme3.bullet.PhysicsSpace, \
@ -153,6 +154,7 @@ task generateNativeHeaders(dependsOn: copyJmeAndroid) << {
            args '-classpath', projectClassPath
            args classes.split(",").collect { it.trim() }
        }
+    }
 }

 task buildBulletNativeLib(type: Exec, dependsOn: generateNativeHeaders) {
--- a/jme3-bullet-native/build.gradle
+++ b/jme3-bullet-native/build.gradle
@ -163,31 +163,6 @@ model {
            operatingSystem "linux"
        }
    }
-
-    toolChains {
-        gcc(Gcc)
-	clang(Clang)
-        mingw_x86(Gcc) {
-            eachPlatform() {
-                cCompiler.executable "i686-w64-mingw32-gcc"
-                cppCompiler.executable "i686-w64-mingw32-g++"
-                linker.executable "i686-w64-mingw32-g++"
-                assembler.executable "i686-w64-mingw32-g++"
-                staticLibArchiver.executable "i686-w64-mingw32-gcc-ar"
-            }
-            target("Windows32")
-        }
-        mingw_x86_64(Gcc) {
-            eachPlatform() {
-                cCompiler.executable "x86_64-w64-mingw32-gcc"
-                cppCompiler.executable "x86_64-w64-mingw32-g++"
-                linker.executable "x86_64-w64-mingw32-g++"
-                assembler.executable "x86_64-w64-mingw32-g++"
-                staticLibArchiver.executable "x86_64-w64-mingw32-gcc-ar"
-            }
-            target("Windows64")
-        }
-    }
 }

 // Java source sets for IDE access and source jar bundling / mavenization
@ -215,7 +190,7 @@ unzipBullet.dependsOn {
    }
 }

-task unzipBulletIfNeeded << {
+task unzipBulletIfNeeded {
 }

 unzipBulletIfNeeded.dependsOn {
--- a/jme3-examples/build.gradle
+++ b/jme3-examples/build.gradle
@ -63,7 +63,8 @@ jar.doFirst{

 task dist (dependsOn: ['build', ':jme3-jogl:jar', ':jme3-bullet:jar', ':jme3-android:jar', \
                       ':jme3-android-native:jar', ':jme3-bullet-native-android:jar', \
-                       ':jme3-bullet-native:jar']) << {
+                       ':jme3-bullet-native:jar']) {
+    doLast {
        // Copy all dependencies to ../dist/lib, remove versions from jar files
        configurations.compile.resolvedConfiguration.resolvedArtifacts.each { artifact ->
            copy {
@ -128,4 +129,5 @@ task dist (dependsOn: ['build', ':jme3-jogl:jar', ':jme3-bullet:jar', ':jme3-and
            into '../dist/opt/native-bullet'
            rename {project(':jme3-bullet-native-android').name+".jar"}
        }
+    }
 }
--- a/private/www-updater.key.enc
+++ b/private/www-updater.key.enc
--- a/settings.gradle
+++ b/settings.gradle
@ -15,7 +15,9 @@ include 'jme3-desktop'
 include 'jme3-blender'
 include 'jme3-jogl'
 include 'jme3-lwjgl'
-include 'jme3-lwjgl3'
+if (JavaVersion.current().isJava8Compatible()) {
+    include 'jme3-lwjgl3'
+}

 // Other external dependencies
 include 'jme3-jbullet'
--- a/version.gradle
+++ b/version.gradle
@ -45,7 +45,6 @@ buildscript {

 ext {
    jmeRevision     = 0
-    jmeNbmRevision  = 0
    jmeGitHash      = ""
    jmeGitTag       = ""
    jmeShortGitHash = ""
@ -53,7 +52,6 @@ ext {
    jmeBranchName   = "unknown"
    jmeFullVersion  = "${jmeVersion}-UNKNOWN"
    jmePomVersion   = "unknown"
-    jmeNbmUcSuffix  = "unknown"
 }

 def getReleaseInfo(String tag) {
@ -125,44 +123,43 @@ task configureVersionInfo {

        if (jmeGitTag != null) {
            jmeGitTag = jmeGitTag.name
+        } else {
+            if (System.env.APPVEYOR_REPO_TAG == "true") {
+                jmeGitTag = System.env.APPVEYOR_REPO_TAG_NAME
            } else {
                jmeGitTag = System.env.TRAVIS_TAG
            }
+        }

        def releaseInfo = getReleaseInfo(jmeGitTag)
        if (releaseInfo != null) {
            jmeFullVersion = "${releaseInfo.baseVersion}${releaseInfo.releaseSuffix}"
            jmePomVersion = "${releaseInfo.mainVersion}${releaseInfo.releaseSuffix}"
-            jmeNbmRevision = "0"
-            jmeNbmUcSuffix = "stable/${releaseInfo.baseVersion}/plugins"
        } else {
            // SNAPSHOT
            jmeFullVersion = jmeMainVersion
            jmePomVersion  = jmeVersion
            if (System.env.TRAVIS_BRANCH != null) {
                jmeBranchName = System.env.TRAVIS_BRANCH
+            } else if (System.env.APPVEYOR_REPO_BRANCH != null) {
+                jmeBranchName = System.env.APPVEYOR_REPO_BRANCH
            }
            if (System.env.TRAVIS_PULL_REQUEST != null &&
                System.env.TRAVIS_PULL_REQUEST != "false") {
                jmeBranchName += "-pr-" + System.env.TRAVIS_PULL_REQUEST
+            } else if (System.env.APPVEYOR_PULL_REQUEST_NUMBER != null) {
+                jmeBranchName += "-pr-" + System.env.APPVEYOR_PULL_REQUEST_NUMBER
            }
            if (jmeBranchName != "master") {
                jmeFullVersion += "-${jmeBranchName}"
                jmePomVersion  += "-${jmeBranchName}"
-                jmeNbmUcSuffix = "${jmeBranchName}-"
-            } else {
-                jmeNbmUcSuffix = ""
            }
-            jmeNbmUcSuffix += "nightly/" + jmeMainVersion + "/plugins"
            jmeFullVersion += "-${jmeRevision}"
            jmePomVersion  += "-SNAPSHOT"
-            jmeNbmRevision = jmeRevision
        }

        logger.warn("Full Version: ${jmeFullVersion}")
        logger.warn("POM Version: ${jmePomVersion}")
-        logger.warn("NBM Revision: ${jmeNbmRevision}")
-        logger.warn("NBM UC Suffix: ${jmeNbmUcSuffix}")
    } catch (ex) {
        // Failed to get repo info
        logger.warn("Failed to get repository info: " + ex.message + ". " + \