From a87db2c1179d26a34065edf34c50d6f730166541 Mon Sep 17 00:00:00 2001 From: empirephoenix Date: Fri, 24 Feb 2017 16:39:20 +0100 Subject: [PATCH] Revert "Cleanup build scripts (3.1)" --- .gitignore | 1 - .travis.yml | 43 ++++----- build.gradle | 51 +++++----- common.gradle | 19 ++++ gradle.properties | 3 + jme3-bullet-native-android/build.gradle | 102 ++++++++++---------- jme3-bullet-native/build.gradle | 2 +- jme3-examples/build.gradle | 118 ++++++++++++------------ private/www-updater.key.enc | Bin 0 -> 3248 bytes version.gradle | 23 +++-- 10 files changed, 190 insertions(+), 172 deletions(-) create mode 100644 private/www-updater.key.enc diff --git a/.gitignore b/.gitignore index ecb1e1b68..be1334611 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ *.jnilib *.dylib *.iml -.gradletasknamecache .DS_Store /jme3-core/src/main/resources/com/jme3/system/version.properties /jme3-*/build/ diff --git a/.travis.yml b/.travis.yml index 8759b8ba6..bfb4b6343 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,38 +1,17 @@ language: java sudo: false -branches: - only: - - master - - v3.1 - -matrix: - include: - - jdk: oraclejdk8 - os: linux - env: UPLOAD_ALL=true - - jdk: openjdk7 - os: linux - - os: osx - -before_install: - - git fetch --unshallow +addons: + ssh_known_hosts: updates.jmonkeyengine.org before_cache: - - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ - + - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + cache: directories: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ -script: - - ./gradlew check - -after_success: - - '[ -n "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ -n "$UPLOAD_ALL" ] && ./gradlew bintrayUpload || :' - notifications: slack: on_success: change @@ -40,6 +19,12 @@ 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) @@ -55,6 +40,9 @@ 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 @@ -66,4 +54,7 @@ deploy: # 7z x ndk.bin -y > /dev/null # export ANDROID_NDK=`pwd`/android-ndk-r10c - +after_success: + - '[ -n "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && ./gradlew bintrayUpload || :' +# - '[ "$TRAVIS_BRANCH" == "v3.1" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && ./gradlew uploadArchives || :' +# - '[ -n "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && ./gradlew uploadArchives bintrayUpload || :' diff --git a/build.gradle b/build.gradle index 587b056cb..08a27044b 100644 --- a/build.gradle +++ b/build.gradle @@ -29,32 +29,31 @@ 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') { - doLast { - File libFolder = mkdir("$buildDir/libDist/lib") - File sourceFolder = mkdir("$buildDir/libDist/sources") - File javadocFolder = mkdir("$buildDir/libDist/javadoc") - subprojects.each {project -> - if(project.ext.mainClass == ''){ - project.tasks.withType(Jar).each {archiveTask -> - if(archiveTask.classifier == "sources"){ - copy { - from archiveTask.archivePath - into sourceFolder - rename {project.name + '-' + archiveTask.classifier +'.'+ archiveTask.extension} - } - } else if(archiveTask.classifier == "javadoc"){ - copy { - from archiveTask.archivePath - into javadocFolder - rename {project.name + '-' + archiveTask.classifier +'.'+ archiveTask.extension} - } - } else{ - copy { - from archiveTask.archivePath - into libFolder - rename {project.name + '.' + archiveTask.extension} - } +task libDist(dependsOn: subprojects.build) << { +// description 'Builds and copies the engine binaries, sources and javadoc to build/libDist' + File libFolder = mkdir("$buildDir/libDist/lib") + File sourceFolder = mkdir("$buildDir/libDist/sources") + File javadocFolder = mkdir("$buildDir/libDist/javadoc") + subprojects.each {project -> + if(project.ext.mainClass == ''){ + project.tasks.withType(Jar).each {archiveTask -> + if(archiveTask.classifier == "sources"){ + copy { + from archiveTask.archivePath + into sourceFolder + rename {project.name + '-' + archiveTask.classifier +'.'+ archiveTask.extension} + } + } else if(archiveTask.classifier == "javadoc"){ + copy { + from archiveTask.archivePath + into javadocFolder + rename {project.name + '-' + archiveTask.classifier +'.'+ archiveTask.extension} + } + } else{ + copy { + from archiveTask.archivePath + into libFolder + rename {project.name + '.' + archiveTask.extension} } } } diff --git a/common.gradle b/common.gradle index d15f1c582..a34a40ced 100644 --- a/common.gradle +++ b/common.gradle @@ -18,11 +18,16 @@ 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 { @@ -111,3 +116,17 @@ 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 + } +} diff --git a/gradle.properties b/gradle.properties index 2a548c3d9..218a7fabe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,6 +23,9 @@ bulletUrl = https://storage.googleapis.com/google-code-archive-downloads/v2/code bulletFolder = bullet-2.82-r2704 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 + # POM settings POM_NAME=jMonkeyEngine POM_DESCRIPTION=jMonkeyEngine is a 3D game engine for adventurous Java developers diff --git a/jme3-bullet-native-android/build.gradle b/jme3-bullet-native-android/build.gradle index 4d5df83da..958d2b094 100644 --- a/jme3-bullet-native-android/build.gradle +++ b/jme3-bullet-native-android/build.gradle @@ -102,58 +102,56 @@ task copyJmeAndroid(type: Copy, dependsOn:copyJmeCpp) { into outputDir } -task generateNativeHeaders(dependsOn: copyJmeAndroid) { - doLast { - String destDirPath = jniPath - String classes = " \ - com.jme3.bullet.PhysicsSpace, \ - \ - com.jme3.bullet.collision.PhysicsCollisionEvent, \ - com.jme3.bullet.collision.PhysicsCollisionObject,\ - com.jme3.bullet.objects.PhysicsCharacter, \ - com.jme3.bullet.objects.PhysicsGhostObject, \ - com.jme3.bullet.objects.PhysicsRigidBody, \ - com.jme3.bullet.objects.PhysicsVehicle, \ - com.jme3.bullet.objects.VehicleWheel, \ - com.jme3.bullet.objects.infos.RigidBodyMotionState, \ - \ - com.jme3.bullet.collision.shapes.CollisionShape, \ - com.jme3.bullet.collision.shapes.BoxCollisionShape, \ - com.jme3.bullet.collision.shapes.CapsuleCollisionShape, \ - com.jme3.bullet.collision.shapes.CompoundCollisionShape, \ - com.jme3.bullet.collision.shapes.ConeCollisionShape, \ - com.jme3.bullet.collision.shapes.CylinderCollisionShape, \ - com.jme3.bullet.collision.shapes.GImpactCollisionShape, \ - com.jme3.bullet.collision.shapes.HeightfieldCollisionShape, \ - com.jme3.bullet.collision.shapes.HullCollisionShape, \ - com.jme3.bullet.collision.shapes.MeshCollisionShape, \ - com.jme3.bullet.collision.shapes.PlaneCollisionShape, \ - com.jme3.bullet.collision.shapes.SimplexCollisionShape, \ - com.jme3.bullet.collision.shapes.SphereCollisionShape, \ - \ - com.jme3.bullet.joints.PhysicsJoint, \ - com.jme3.bullet.joints.ConeJoint, \ - com.jme3.bullet.joints.HingeJoint, \ - com.jme3.bullet.joints.Point2PointJoint, \ - com.jme3.bullet.joints.SixDofJoint, \ - com.jme3.bullet.joints.SixDofSpringJoint, \ - com.jme3.bullet.joints.SliderJoint, \ - com.jme3.bullet.joints.motors.RotationalLimitMotor, \ - com.jme3.bullet.joints.motors.TranslationalLimitMotor, \ - \ - com.jme3.bullet.util.NativeMeshUtil, \ - com.jme3.bullet.util.DebugShapeFactory" - - String projectClassPath = configurations.runtime.asFileTree.matching { - exclude ".gradle" - }.asPath - - exec { - executable org.gradle.internal.jvm.Jvm.current().getExecutable('javah') - args '-d', destDirPath - args '-classpath', projectClassPath - args classes.split(",").collect { it.trim() } - } +task generateNativeHeaders(dependsOn: copyJmeAndroid) << { + String destDirPath = jniPath + String classes = " \ + com.jme3.bullet.PhysicsSpace, \ + \ + com.jme3.bullet.collision.PhysicsCollisionEvent, \ + com.jme3.bullet.collision.PhysicsCollisionObject,\ + com.jme3.bullet.objects.PhysicsCharacter, \ + com.jme3.bullet.objects.PhysicsGhostObject, \ + com.jme3.bullet.objects.PhysicsRigidBody, \ + com.jme3.bullet.objects.PhysicsVehicle, \ + com.jme3.bullet.objects.VehicleWheel, \ + com.jme3.bullet.objects.infos.RigidBodyMotionState, \ + \ + com.jme3.bullet.collision.shapes.CollisionShape, \ + com.jme3.bullet.collision.shapes.BoxCollisionShape, \ + com.jme3.bullet.collision.shapes.CapsuleCollisionShape, \ + com.jme3.bullet.collision.shapes.CompoundCollisionShape, \ + com.jme3.bullet.collision.shapes.ConeCollisionShape, \ + com.jme3.bullet.collision.shapes.CylinderCollisionShape, \ + com.jme3.bullet.collision.shapes.GImpactCollisionShape, \ + com.jme3.bullet.collision.shapes.HeightfieldCollisionShape, \ + com.jme3.bullet.collision.shapes.HullCollisionShape, \ + com.jme3.bullet.collision.shapes.MeshCollisionShape, \ + com.jme3.bullet.collision.shapes.PlaneCollisionShape, \ + com.jme3.bullet.collision.shapes.SimplexCollisionShape, \ + com.jme3.bullet.collision.shapes.SphereCollisionShape, \ + \ + com.jme3.bullet.joints.PhysicsJoint, \ + com.jme3.bullet.joints.ConeJoint, \ + com.jme3.bullet.joints.HingeJoint, \ + com.jme3.bullet.joints.Point2PointJoint, \ + com.jme3.bullet.joints.SixDofJoint, \ + com.jme3.bullet.joints.SixDofSpringJoint, \ + com.jme3.bullet.joints.SliderJoint, \ + com.jme3.bullet.joints.motors.RotationalLimitMotor, \ + com.jme3.bullet.joints.motors.TranslationalLimitMotor, \ + \ + com.jme3.bullet.util.NativeMeshUtil, \ + com.jme3.bullet.util.DebugShapeFactory" + + String projectClassPath = configurations.runtime.asFileTree.matching { + exclude ".gradle" + }.asPath + + exec { + executable org.gradle.internal.jvm.Jvm.current().getExecutable('javah') + args '-d', destDirPath + args '-classpath', projectClassPath + args classes.split(",").collect { it.trim() } } } diff --git a/jme3-bullet-native/build.gradle b/jme3-bullet-native/build.gradle index 97b2afc49..f1875647c 100644 --- a/jme3-bullet-native/build.gradle +++ b/jme3-bullet-native/build.gradle @@ -208,7 +208,7 @@ unzipBullet.dependsOn { } } -task unzipBulletIfNeeded { +task unzipBulletIfNeeded << { } unzipBulletIfNeeded.dependsOn { diff --git a/jme3-examples/build.gradle b/jme3-examples/build.gradle index 7936e33db..be2e106a6 100644 --- a/jme3-examples/build.gradle +++ b/jme3-examples/build.gradle @@ -62,71 +62,69 @@ 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']) { - doLast { - // Copy all dependencies to ../dist/lib, remove versions from jar files - configurations.compile.resolvedConfiguration.resolvedArtifacts.each { artifact -> - copy { - from artifact.file - into '../dist/lib' - if(artifact.classifier != null){ - rename { "${artifact.name}-${artifact.classifier}.${artifact.extension}" } - } else{ - rename { "${artifact.name}.${artifact.extension}" } - } - } - } + ':jme3-bullet-native:jar']) << { + // Copy all dependencies to ../dist/lib, remove versions from jar files + configurations.compile.resolvedConfiguration.resolvedArtifacts.each { artifact -> copy { - from jar.archivePath - into '../dist' - rename { "jMonkeyEngine3.jar" } - } - // Copy JOGL packages, remove version - def config = project(':jme3-jogl').configurations.runtime.copyRecursive({ !(it instanceof ProjectDependency); }) - config.resolvedConfiguration.resolvedArtifacts.each {artifact -> - copy{ - from artifact.file - into '../dist/opt/jogl/lib' - if(artifact.classifier != null){ - rename { "${artifact.name}-${artifact.classifier}.${artifact.extension}" } - } else{ - rename { "${artifact.name}.${artifact.extension}" } - } + from artifact.file + into '../dist/lib' + if(artifact.classifier != null){ + rename { "${artifact.name}-${artifact.classifier}.${artifact.extension}" } + } else{ + rename { "${artifact.name}.${artifact.extension}" } } } - copy { - from project(':jme3-jogl').jar.archivePath - into '../dist/opt/jogl' - rename {project(':jme3-jogl').name+".jar"} + } + copy { + from jar.archivePath + into '../dist' + rename { "jMonkeyEngine3.jar" } + } + // Copy JOGL packages, remove version + def config = project(':jme3-jogl').configurations.runtime.copyRecursive({ !(it instanceof ProjectDependency); }) + config.resolvedConfiguration.resolvedArtifacts.each {artifact -> + copy{ + from artifact.file + into '../dist/opt/jogl/lib' + if(artifact.classifier != null){ + rename { "${artifact.name}-${artifact.classifier}.${artifact.extension}" } + } else{ + rename { "${artifact.name}.${artifact.extension}" } + } } + } + copy { + from project(':jme3-jogl').jar.archivePath + into '../dist/opt/jogl' + rename {project(':jme3-jogl').name+".jar"} + } - // Copy bullet packages, remove version - copy { - from project(':jme3-bullet').jar.archivePath - into '../dist/opt/native-bullet' - rename {project(':jme3-bullet').name+".jar"} - } - copy { - from project(':jme3-bullet-native').jar.archivePath - into '../dist/opt/native-bullet' - rename {project(':jme3-bullet-native').name+".jar"} - } + // Copy bullet packages, remove version + copy { + from project(':jme3-bullet').jar.archivePath + into '../dist/opt/native-bullet' + rename {project(':jme3-bullet').name+".jar"} + } + copy { + from project(':jme3-bullet-native').jar.archivePath + into '../dist/opt/native-bullet' + rename {project(':jme3-bullet-native').name+".jar"} + } - // Copy android packages, remove version - copy { - from project(':jme3-android').jar.archivePath - into '../dist/opt/android' - rename {project(':jme3-android').name+".jar"} - } - copy { - from project(':jme3-android-native').jar.archivePath - into '../dist/opt/android' - rename {project(':jme3-android-native').name+".jar"} - } - copy { - from project(':jme3-bullet-native-android').jar.archivePath - into '../dist/opt/native-bullet' - rename {project(':jme3-bullet-native-android').name+".jar"} - } + // Copy android packages, remove version + copy { + from project(':jme3-android').jar.archivePath + into '../dist/opt/android' + rename {project(':jme3-android').name+".jar"} + } + copy { + from project(':jme3-android-native').jar.archivePath + into '../dist/opt/android' + rename {project(':jme3-android-native').name+".jar"} + } + copy { + from project(':jme3-bullet-native-android').jar.archivePath + into '../dist/opt/native-bullet' + rename {project(':jme3-bullet-native-android').name+".jar"} } } diff --git a/private/www-updater.key.enc b/private/www-updater.key.enc new file mode 100644 index 0000000000000000000000000000000000000000..b6a2260680a544fea258a868171f52b5a0a36928 GIT binary patch literal 3248 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 literal 0 HcmV?d00001 diff --git a/version.gradle b/version.gradle index fd6970f8b..cd5b6b454 100644 --- a/version.gradle +++ b/version.gradle @@ -1,7 +1,7 @@ /* Version Info Examples ===================== - + Nightly Build Snapshot * git tag: * Full Version: 3.1-5124 @@ -22,14 +22,14 @@ * POM Version: 3.1.0-alpha1 * NBM Revision: 0 * NBM UC Suffix: stable/3.1/plugins - + Final Release * git tag: v3.1.0 * Full Version: 3.1 * POM Version: 3.1.0 * NBM Revision: 0 * NBM UC Suffix: stable/3.1/plugins - */ + */ import java.text.SimpleDateFormat import org.ajoberstar.grgit.* @@ -45,6 +45,7 @@ buildscript { ext { jmeRevision = 0 + jmeNbmRevision = 0 jmeGitHash = "" jmeGitTag = "" jmeShortGitHash = "" @@ -52,6 +53,7 @@ ext { jmeBranchName = "unknown" jmeFullVersion = "${jmeVersion}-UNKNOWN" jmePomVersion = "unknown" + jmeNbmUcSuffix = "unknown" } def getReleaseInfo(String tag) { @@ -120,7 +122,7 @@ task configureVersionInfo { jmeShortGitHash = head.abbreviatedId jmeBranchName = grgit.branch.current.name jmeGitTag = grgit.tag.list().find { it.commit == head } - + if (jmeGitTag != null) { jmeGitTag = jmeGitTag.name } else { @@ -131,6 +133,8 @@ task configureVersionInfo { if (releaseInfo != null) { jmeFullVersion = "${releaseInfo.baseVersion}${releaseInfo.releaseSuffix}" jmePomVersion = "${releaseInfo.mainVersion}${releaseInfo.releaseSuffix}" + jmeNbmRevision = "0" + jmeNbmUcSuffix = "stable/${releaseInfo.baseVersion}/plugins" } else { // SNAPSHOT jmeFullVersion = jmeMainVersion @@ -138,20 +142,27 @@ task configureVersionInfo { if (System.env.TRAVIS_BRANCH != null) { jmeBranchName = System.env.TRAVIS_BRANCH } - if (System.env.TRAVIS_PULL_REQUEST != null && + if (System.env.TRAVIS_PULL_REQUEST != null && System.env.TRAVIS_PULL_REQUEST != "false") { jmeBranchName += "-pr-" + System.env.TRAVIS_PULL_REQUEST } if (jmeBranchName != "v3.1") { 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 + ". " + \