Merge branch 'master' of https://github.com/jMonkeyEngine/sdk

.travis.yml

@@ -29,27 +29,24 @@ notifications:
       secure: cOYkCWyBNtM4QiqNbGvhCE2lFxHSnmLfRl1wLJzeDBYEDbg1nOXayRwyH1dQzWCvhDhqv2qWHHASgddE14JwnVB7p56DcaQWAJ5yn/OyY9GzaHuz59Xm6LbFbz5JfabHY7LczuBlRtISlyfz4eHD5BOvfCzx7D3GI44kQX99BCFr1mqDjQEUyTPwhLolFPL5+zx7J669ud2Ba0TywtaWsXeOUvORAXAdlQv1RRAmQvUK9DIYyq0Z3fzr/uXEBaPAz50JFXkMs00Z8Dutdiu9jd/SsRnEv0O+ns75outu6WK2UwS1xHhcdW7bkMuTmRpGoec7XbbjSaz6oYsHSp8kyuPhLEzS2ba2QIxDmOkF/erejeAMdDlsIKwRMpizRCh/8gMZR2nNEzdHQ0gbgEk83PFYgQw+amtlOk61l6THopwLtVpDiiE1Elz5ev7KqSr//qWQgoHBFabQOgE5KjfxmLDmuUNWaZyuJi6JTwsxB04NGAa3zpQ6RKQ7dgGBZF7QIQ+f648oxVlLIK+T3VAdK47s94XKTRJ0CqRoA6nI2MCaLbU9zvS8uAWoLOIKw6ec2qexPaVCE+TO0780+x6tBFSYexwH8fwmEl1nPqBldipYCLIRZV7XbJh3bhfPksXuz2B6poJ/wL5gLtWNAXnBoWyI7Vu/PHbFsn+VhLUkYSU=
 
 install:
-  -  ./gradlew buildSdk
+  - ./gradlew buildSdk
   - cd jdks
   - ./download-jdks.sh
   - cd ../
+  - '[ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && ant -Dstorepass="$NBM_SIGN_PASS" hudson-nightly | awk "{printf(\".\"); fflush(stdout)}" || :'
+  - '[ -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && scp -rp -i nbproject/private/www-updater.key build/updates/* [email protected]:/var/www/updates/nightly/3.1/plugins || :'
   
 #script:
 #  - ./gradlew check
 #  - ./gradlew createZipDistribution
 
 before_deploy:
-  #- cd jdks
-#  - ./download-jdks.sh
-  #- mv local/*/compiled/* .
-  #- cd ../
   # In case of STABLE (see hudson-stable target)
+  # the above gradlew already sets the correct ant properties to build
   - ant -Dstorepass="$NBM_SIGN_PASS" -Dpack200.enabled=false set-spec-version suite.nbms build-installers unset-spec-version | awk '{printf("."); fflush(stdout)}'
-  # In case of NIGHTLY (see hudson-nightly target)
-  # - ant set-impl-version suite.nbms build-installers unset-impl-version | awk '{printf("."); fflush(stdout)}'
   
   # Has to be done before deploy (due to the rm command)
-  - scp -rp -i nbproject/private/www-updater.key build/updates/* [email protected]:/var/www/updates/nightly/3.1/plugins
+  - scp -rp -i nbproject/private/www-updater.key build/updates/* [email protected]:/var/www/updates/stable/3.1/plugins
   - rm -rf build/
 
 deploy:

version.gradle

@@ -61,11 +61,12 @@ def getReleaseInfo(String tag) {
         // not a tagged commit
         return null;
     }
-    if (!tag.startsWith("v")) {
+    /*if (!tag.startsWith("v")) {
         // syntax error
         return null;
     }
     tag = tag.substring(1)
+    The SDK has it’s own versioning scheme which doesn’t start with v…*/
 
     String[] parts = tag.split("-", 2);
     String mainVersion;
@@ -79,6 +80,7 @@ def getReleaseInfo(String tag) {
         releaseName = parts[1];
         if (releaseName.size() == 0) {
             // syntax error
+            println "Warning: getReleaseInfo() found an errorneous tag: \"" + tag + "\". Syntax Error: Release Name is of Length 0!";
             return null;
         }
     } else if (parts.length == 1) {
@@ -87,17 +89,25 @@ def getReleaseInfo(String tag) {
         mainVersion = parts[0];
     } else {
         // error
+        println "Warning: getReleaseInfo() found an errorneous tag: \"" + tag + "\". Syntax Error: The Tag didn't contain the expected number of dash-seperated keywords"
         return null;
     }
 
     if (mainVersion.size() == 0) {
         // syntax error
+        println "Warning: getReleaseInfo() found an errorneous tag: \"" + tag + "\". Syntax Error: The Main Version (e.g. 3.1) couldn't be extracted successfully."
         return null;
     }
 
     parts = mainVersion.split("\\.");
+    if (parts.size() == 2) {
+        mainVersion = mainVersion + ".0" // Assume Revision Zero
+        parts = mainVersion.split("\\.");
+    }
+    
     if (parts.size() != 3) {
         // syntax error
+        println "Warning: getReleaseInfo() found an errorneous tag: \"" + tag + "\". Syntax Error: The Tags Main Version didn't consist of two/three parts"
         return null;
     }
 
@@ -133,7 +143,7 @@ task configureVersionInfo {
         if (releaseInfo != null) {
             jmeFullVersion = "${releaseInfo.baseVersion}${releaseInfo.releaseSuffix}"
             jmePomVersion = "${releaseInfo.mainVersion}${releaseInfo.releaseSuffix}"
-            jmeNbmRevision = "0"
+            jmeNbmRevision = jmeRevision
             jmeNbmUcSuffix = "stable/${releaseInfo.baseVersion}/plugins"
         } else {
             // SNAPSHOT