adapt name of source release and include revision number

2 files changed, 60 insertions, 17 deletions

diff --git a/solenv/bin/getrevision.pl b/solenv/bin/getrevision.pl
new file mode 100644
index 000000000000..46b477563243
--- /dev/null
+++ b/solenv/bin/getrevision.pl
@@ -0,0 +1,38 @@
+#**************************************************************
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+#**************************************************************
+
+#### module lookup
+use File::Basename;
+
+my @lib_dirs;
+BEGIN {
+    if ( !defined($ENV{SOLARENV}) ) {
+        die "No environment found (environment variable SOLARENV is undefined)";
+    }
+    push(@lib_dirs, "$ENV{SOLARENV}/bin/modules");
+}
+use lib (@lib_dirs);
+
+use SvnRevision;
+
+my $scm_root_dir=dirname($ENV{SRC_ROOT});
+
+print SvnRevision::DetectRevisionId("$scm_root_dir");
diff --git a/solenv/bin/srcrelease.xml b/solenv/bin/srcrelease.xml
index ecf8c0200533..2d57082e8e20 100644
--- a/solenv/bin/srcrelease.xml
+++ b/solenv/bin/srcrelease.xml
@@ -21,15 +21,12 @@
  ***********************************************************-->
 <project name="Apache OpenOffice" basedir="." default="pack">
 
+  <property environment="env"/>
+  <property name="getrevision.script" value="${env.SOLARENV}/bin/getrevision.pl"/>
+
   <property name="out.dir" value="."/>
   <property name="aoo.name" value="aoo"/>
-  <property name="aoo.ver" value="3.5.0"/>
-  <property name="release.dir.name" value="${aoo.name}-${aoo.ver}"/>
-  <property name="release.file.name" value="${release.dir.name}-src"/>
-  <property name="release.zip" value="${out.dir}/${release.file.name}.zip"/>
-  <property name="release.tar" value="${out.dir}/${release.file.name}.tar"/>
-  <property name="release.tar.gz" value="${out.dir}/${release.file.name}.tar.gz"/>
-  <property name="release.tar.bz2" value="${out.dir}/${release.file.name}.tar.bz2"/>
+  <property name="aoo.ver" value="4.0.0"/>
 
   <property name="excludes.list" value="configure, moz/zipped/*.zip, **/.svn **/.gitignore, **/.git, warn, set_soenv, solver/**, makefile.mk, config.log, config.parms, config.status, bootstrap, autom4te.cache/**, MacOSXX86Env.*, external/unowinreg/unowinreg.dll" />
   <property name="excludes.executables" value="solenv/bin/macosx-create-bundle, solenv/bin/linkoo, solenv/bin/localize, solenv/bin/createpdbrelocators, solenv/bin/langwrap, solenv/bin/makedepn, solenv/bin/packmodule, solenv/bin/rpm-wrapper, solenv/bin/relocate, solenv/bin/receditor, solenv/bin/subsequenttests, **/*.sh, **/*.bat, **/*.exe, configure.cmd, oowintool, config.sub, config.guess, **/*.pl"/>
@@ -37,7 +34,22 @@
   <property name="excludes.outdirs" value="**/unxmacx*/**, **/unxlng*/**, **/unxsol*/**, **/wntmsci*/**" />
 
 
-  <target name="clean">
+  <target name="getrevision">
+    <exec executable="perl" outputproperty="scm.revision">
+      <arg value="${getrevision.script}" />
+    </exec>
+  </target>
+
+  <target name="declarenames" depends="getrevision">
+    <property name="release.dir.name" value="${aoo.name}-${aoo.ver}"/>
+    <property name="release.file.name" value="${release.dir.name}-r${scm.revision}-src"/>
+    <property name="release.zip" value="${out.dir}/${release.file.name}.zip"/>
+    <property name="release.tar" value="${out.dir}/${release.file.name}.tar"/>
+    <property name="release.tar.gz" value="${out.dir}/${release.file.name}.tar.gz"/>
+    <property name="release.tar.bz2" value="${out.dir}/${release.file.name}.tar.bz2"/>
+  </target>
+
+  <target name="clean" depends="declarenames">
     <echo level="verbose" message="### clean output files:"/>
     <delete file="${release.zip}" verbose="true"/>
     <delete file="${release.tar}" verbose="true"/>
@@ -45,7 +57,7 @@
     <delete file="${release.tar.bz2}" verbose="true"/>
   </target>
 
-  <target name="source.zip">
+  <target name="source.zip" depends="declarenames">
     <echo level="verbose" message="### creating ${release.zip} ..."/>
     <echo level="verbose" message="### basedir=${basedir}"/>
     <echo level="verbose" message="### source.root=${source.root}"/>
@@ -65,7 +77,7 @@
     <echo level="verbose" message="   ... DONE"/>
   </target>
 
-  <target name="source.tar">
+  <target name="source.tar" depends="declarenames">
     <echo level="verbose" message="### creating intermediate ${release.tar} ..."/>
     <tar destfile="${release.tar}" longfile="gnu">
       <tarfileset file="main/NOTICE" fullpath="${release.dir.name}/NOTICE"/>
@@ -93,13 +105,6 @@
     <echo level="verbose" message="   ... DONE"/>
   </target>
 
-  <target name="dummy">
-    <zip destfile="${release.zip}">
-      <zipfileset file="main/NOTICE" fullpath="${release.dir.name}/NOTICE"/>
-      <zipfileset file="main/LICENSE" fullpath="${release.dir.name}/LICENSE"/>
-    </zip>
-  </target>
-
   <target name="pack" depends="clean,source.zip,source.tar.gz,source.tar.bz2">
     <echo level="info" message="### Create source release files for Apache OpenOffice ${aoo.ver} ..."/>
   </target>