diff options
author | Josh Suereth <joshua.suereth@gmail.com> | 2012-03-14 01:04:45 -0400 |
---|---|---|
committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-03-14 01:04:45 -0400 |
commit | 6ec24f161105b1cb54fd1048c5757255a5530098 (patch) | |
tree | 0983490bf4ec7f28027b6a99d3f29093c65a1672 | |
parent | b8b51b70bf34889e55263ee1f99f0c9d7aca1ea4 (diff) | |
download | scala-6ec24f161105b1cb54fd1048c5757255a5530098.tar.gz scala-6ec24f161105b1cb54fd1048c5757255a5530098.tar.bz2 scala-6ec24f161105b1cb54fd1048c5757255a5530098.zip |
Fixes to build numbering system for 2.9.x release
-rw-r--r-- | build.number | 6 | ||||
-rw-r--r-- | build.xml | 26 | ||||
-rwxr-xr-x | tools/get-scala-revision | 4 | ||||
-rw-r--r-- | tools/get-scala-revision.bat | 5 |
4 files changed, 32 insertions, 9 deletions
diff --git a/build.number b/build.number index f074e06d9a..4c8b62076d 100644 --- a/build.number +++ b/build.number @@ -1,5 +1,7 @@ #Tue Sep 11 19:21:09 CEST 2007 +version.major=2 version.minor=9 version.patch=2 -version.suffix=alpha -version.major=2 + +# Note: To build a release run ant with -Dbuild.release=true +# To build an RC, run ant with -Dmaven.version.suffix=-RCN @@ -211,7 +211,19 @@ INITIALISATION <exec osfamily="windows" vmlauncher="false" executable="pull-binary-libs.sh" failifexecutionfails="true" /> </target> - <target name="init" depends="init.starr"> + <!-- Determines OSGi string + maven extension. --> + <target name="init.build.snapshot" unless="build.release"> + <property name="version.suffix" value="DEV"/> + <property name="maven.version.suffix" value="-SNAPSHOT"/> + </target> + <target name="init.build.release" if="build.release"> + <property name="version.suffix" value="FINAL"/> + <property name="maven.version.suffix" value=""/> + </target> + + <target name="init.build.suffix.done" depends="init.build.snapshot, init.build.release"/> + + <target name="init" depends="init.starr, init.build.suffix.done"> <!-- scalac.args.optimise is selectively overridden in certain antcall tasks. --> <property name="scalac.args.optimise" value=""/> <!-- scalac.args.quickonly are added to quick.* targets but not others (particularly, locker.) @@ -240,11 +252,14 @@ INITIALISATION <!-- Generating version number --> <property file="${basedir}/build.number"/> - <!-- As of git move, we set the internal version number based on how far from tags we are, which includes a version tag. we keep - major/minor etc. for the maven deploy. --> + <!-- We use the git describe to determine the OSGi modifier for our build. --> <property name="version.number" - value="${git.describe}"/> + value="${version.major}.${version.minor}.${version.patch}.${version.suffix}-${git.describe}"/> + <!-- TODO - Use "DEV" vs. "FINAL" to determine if we're in release mode. --> + <property + name="maven.version.number" + value="${version.major}.${version.minor}.${version.patch}${maven.version.suffix}"/> <!-- Local libs (developer use.) --> <mkdir dir="${lib-extra.dir}"/> @@ -274,7 +289,8 @@ INITIALISATION <echo message=" java args: ${env.ANT_OPTS} ${jvm.opts}" /> <echo message=" javac args: ${javac.args}" /> <echo message=" scalac args: ${scalac.args}" /> - <echo message=" build number: ${version.number}" /> + <echo message=" maven version: ${maven.version.number}"/> + <echo message=" OSGi version: ${version.number}" /> <!-- Define tasks that can be run with Starr --> <path id="starr.classpath"> diff --git a/tools/get-scala-revision b/tools/get-scala-revision index 4d97ec58ad..14c84d0ad4 100755 --- a/tools/get-scala-revision +++ b/tools/get-scala-revision @@ -40,5 +40,5 @@ hash=$(echo $suffix | cut -d - -f 2) # remove any alphabetic characters before the version number tag=$(echo $tag | sed "s/\([a-z_A-Z]*\)\(.*\)/\2/") -# 2.10.0-M1-0098-g6f1c486d0b-2012-02-01 -printf "%s-%04d-%s-%s\n" "$tag" "$counter" "$hash" $(date "+%Y-%m-%d") +# 20120324-123-b0d78f7b9c +printf "%s-%04d-%s\n" $(date "+%Y%m%d") "$counter" "$hash" diff --git a/tools/get-scala-revision.bat b/tools/get-scala-revision.bat index f4dc24b71f..9618e99c32 100644 --- a/tools/get-scala-revision.bat +++ b/tools/get-scala-revision.bat @@ -14,9 +14,14 @@ if "%*"=="" ( ) cd %_DIR% +rem TODO - Look up bat scripting example and fix the darn string. if exist .git\NUL ( git describe HEAD --abbrev=7 --match dev ) +rem Implement something like the following +rem for /f "tokens=1,2,3 delims=- " %%a in ("%gitdescribe%") do set version=%%a&set commits=%%b&set sha=%%c +rem echo %date?%-%commits%-%sha% + :end @endlocal |