diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2012-03-16 12:22:31 -0400 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-03-16 12:22:31 -0400 |
| commit | 5877a9264d8a9eef4f8a8a149b227474710a8eb0 (patch) | |
| tree | 4c9c053af794690b83cee4afe6b33708324d872d /build.xml | |
| parent | 1ca609715206679b41e72c012fa62641f4695175 (diff) | |
| download | scala-5877a9264d8a9eef4f8a8a149b227474710a8eb0.tar.gz scala-5877a9264d8a9eef4f8a8a149b227474710a8eb0.tar.bz2 scala-5877a9264d8a9eef4f8a8a149b227474710a8eb0.zip | |
Fixing merge conflicts for trunk.
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 19 |
1 files changed, 3 insertions, 16 deletions
@@ -290,13 +290,6 @@ INITIALISATION <!-- some default in case something went wrong getting the revision --> <property name="git.describe" value="-unknown-"/> - <!-- Generating version string --> - <exec osfamily="unix" executable="tools/get-scala-revision" outputproperty="version.number" failifexecutionfails="false" /> - <exec osfamily="windows" executable="tools/get-scala-revision.bat" outputproperty="version.number" failifexecutionfails="false" /> - <!-- some default in case something went wrong getting the revision --> - <property name="version.number" value="-unknown-"/> - <property name="init.avail" value="yes"/> - <!-- We use the git describe to determine the OSGi modifier for our build. --> <property name="maven.version.number" @@ -307,15 +300,9 @@ INITIALISATION <property name="osgi.version.number" value="${version.major}.${version.minor}.${version.patch}.v${git.commit.date}${version.suffix}-${git.commit.sha}"/> - - - <!-- 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=" build number: ${version.number}" /> + <!-- some default in case something went wrong getting the revision --> + <property name="version.number" value="-unknown-"/> + <property name="init.avail" value="yes"/> <!-- Local libs (developer use.) --> <mkdir dir="${lib-extra.dir}"/> |