Browse Source

Initial step towards Engine Version 3.2

MeFisto94 8 years ago
parent
commit
089a21a700
3 changed files with 7 additions and 5 deletions
  1. 2 2
      build.gradle
  2. 2 2
      build_engine.sh
  3. 3 1
      readme.md

+ 2 - 2
build.gradle

@@ -29,10 +29,10 @@ if (System.getenv('TRAVIS') != null) {
     /*if (System.env.TRAVIS_TAG != "") {
         ext.jmeEngineVersion = "3.1.0-" + System.env.TRAVIS_TAG + "-SNAPSHOT"
     } else {*/
-        ext.jmeEngineVersion = "3.1.0-stable" // Use Beta 2 instead of 3.1.0-master-SNAPSHOT
+        ext.jmeEngineVersion = "3.2.0-SNAPSHOT" // Use Beta 2 instead of 3.1.0-master-SNAPSHOT
     //}
 } else {
-    ext.jmeEngineVersion = "3.1.0-stable" // In case you build of the HEAD of 3.1, you need to change that to 3.1.0-SNAPSHOT again
+    ext.jmeEngineVersion = "3.2.0-SNAPSHOT" // In case you build of the HEAD of 3.1, you need to change that to 3.1.0-SNAPSHOT again
 }
 
 configurations {

+ 2 - 2
build_engine.sh

@@ -3,7 +3,7 @@
 # Also if you want to revert to releases and bintray builds, you need to uninstall them from your local maven repo...
 echo "Downloading the Engine, this may take some time"
 # To have the latest Commit on 3.1 use "-b v3.1". If you want a certain tag, use "-b v3.1.0-beta2"
-git clone -b v3.1.0-stable --single-branch --depth 1 http://github.com/jMonkeyEngine/jMonkeyEngine/ engine # single-branch requires git > 1.7.10, if you see an error, just leave it out.
+git clone -b master --single-branch --depth 10 http://github.com/jMonkeyEngine/jMonkeyEngine/ engine # single-branch requires git > 1.7.10, if you see an error, just leave it out.
 cd engine
 # git checkout tags/v3.1.0-beta2 # To use this, leave out depth and change -b to a branch.
 
@@ -11,6 +11,6 @@ cd engine
 #patch -s -N -p 1 < ../patches/FixHWSkinningSerialization.diff
 
 echo "Building the Engine and installing them to your local maven repo...."
-./gradlew install # Depends on jarJavadoc, jarSourcecode, assemble, dist etc.
+./gradlew -PbuildJavaDoc=true install # Depends on jarJavadoc, jarSourcecode, assemble, dist etc.
 
 cd ../

+ 3 - 1
readme.md

@@ -14,6 +14,8 @@ and many more!
 It is important to know that the SDK is not coupled with the engine itself, so if you have issues which are unrelated to the IDE, report them [here](https://github.com/jMonkeyEngine/jmonkeyengine).
 This however also means, that the SDK can have a different pace than the engine (at the time of writing, the SDK is on 3.1.0-stable whereas the engine team is already working on 3.2) but you can nonetheless work on a different engine version than the one which is bundled.
 
+__!!! Note: You are currently watching the master branch which is the active development for JMonkeyEngine 3.2. For the current release candidate, see the v3.1 branch! !!!__
+
 ## Getting Started / Downloading the SDK
 Just have a look at our [releases](https://github.com/jMonkeyEngine/sdk/releases) section.
 There you can download the version you desire. The SDK will generally follow the convention that it's version number is lined up with the matching engine version
@@ -30,7 +32,7 @@ __Note:__ The Tag `stable` is refering to 3.0-stable, which is an ancient versio
 Building the SDK is an easy process basically, but it depends on what kind of distribution you want to build.
 You also have to know that the build process changes from time to time, so have a look at the `.travis.yml` file, or related, you will see how we build our releases then.  
 
-__Note:__ Currently, the SDK has to build the engine on it's own, because not all needed dependencies are in mavenCentral/jCenter. Thus you have to call `build_engine.sh` first on a Linux System, Inside your Windows-Git-Shell or you can manually checkout the [jMonkeyEngine](https://github.com/jMonkeyEngine/jmonkeyengine) repository and then invoke `gradlew.bat install`. This will add _all_ jMonkeyEngine Libraries into your local maven "server".
+__Note:__ Currently, the SDK has to build the engine on it's own, because not all needed dependencies are in mavenCentral/jCenter. Thus you have to call `build_engine.sh` first on a Linux System, Inside your Windows-Git-Shell or you can manually checkout the [jMonkeyEngine](https://github.com/jMonkeyEngine/jmonkeyengine) repository and then invoke `gradlew.bat -PbuildJavaDoc=true install`. This will add _all_ jMonkeyEngine Libraries into your local maven "server".
 
 Technically the gradle task `buildSdk` is the main task which builds the sdk (Invoking `./gradlew buildSdk` or `gradlew.bat buildSdk` on Windows).