diff options
-rw-r--r-- | build.number | 7 | ||||
-rw-r--r-- | build.xml | 41 | ||||
-rwxr-xr-x | tools/get-scala-revision | 4 | ||||
-rw-r--r-- | tools/get-scala-revision.bat | 5 |
4 files changed, 53 insertions, 4 deletions
diff --git a/build.number b/build.number new file mode 100644 index 0000000000..4c8b62076d --- /dev/null +++ b/build.number @@ -0,0 +1,7 @@ +#Tue Sep 11 19:21:09 CEST 2007 +version.major=2 +version.minor=9 +version.patch=2 + +# Note: To build a release run ant with -Dbuild.release=true +# To build an RC, run ant with -Dmaven.version.suffix=-RCN @@ -236,7 +236,19 @@ INITIALISATION </touch> </target> - <target name="init" depends="init.jars"> + <!-- 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.jars, 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.) @@ -263,6 +275,18 @@ INITIALISATION <property name="version.number" value="-unknown-"/> <property name="init.avail" value="yes"/> + + <!-- Generating version number --> + <property file="${basedir}/build.number"/> + <!-- We use the git describe to determine the OSGi modifier for our build. --> + <property + name="version.number" + 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}"/> + <!-- And print-out what we are building --> <echo message=" build time: ${time.human}" /> <echo message=" java version: ${java.vm.name} ${java.version}" /> @@ -270,7 +294,7 @@ INITIALISATION <echo message=" javac args: ${javac.args}" /> <echo message=" scalac args: ${scalac.args}" /> <echo message=" build number: ${version.number}" /> - + <!-- Local libs (developer use.) --> <mkdir dir="${lib-extra.dir}"/> @@ -293,7 +317,20 @@ INITIALISATION <path refid="lib.extra"/> </path> +<<<<<<< HEAD <!-- Define tasks that can be run with Starr --> +======= + <!-- And print-out what we are building --> + <echo message=" build time: ${time.human}" /> + <echo message=" java version: ${java.vm.name} ${java.version}" /> + <echo message=" java args: ${env.ANT_OPTS} ${jvm.opts}" /> + <echo message=" javac args: ${javac.args}" /> + <echo message=" scalac args: ${scalac.args}" /> + <echo message=" maven version: ${maven.version.number}"/> + <echo message=" OSGi version: ${version.number}" /> + + <!-- Define tasks that can be run with Starr --> +>>>>>>> 6ec24f1611... Fixes to build numbering system for 2.9.x release <path id="starr.classpath"> <pathelement location="${lib.starr.jar}"/> <pathelement location="${comp.starr.jar}"/> 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 48c7cbd94f..b5b30eb3a8 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 --abbrev=10 --always --tags ) +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 |