incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1214147 - /incubator/ooo/trunk/main/fetch_tarballs.sh
Date Wed, 14 Dec 2011 10:44:05 GMT
Author: af
Date: Wed Dec 14 10:44:05 2011
New Revision: 1214147

URL: http://svn.apache.org/viewvc?rev=1214147&view=rev
Log:
Fixed build breaker: epm archive was not renamed (anymore) after download and could not be
built.

Modified:
    incubator/ooo/trunk/main/fetch_tarballs.sh

Modified: incubator/ooo/trunk/main/fetch_tarballs.sh
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/fetch_tarballs.sh?rev=1214147&r1=1214146&r2=1214147&view=diff
==============================================================================
--- incubator/ooo/trunk/main/fetch_tarballs.sh (original)
+++ incubator/ooo/trunk/main/fetch_tarballs.sh Wed Dec 14 10:44:05 2011
@@ -227,12 +227,20 @@ if [ -n "$DMAKE_URL" -a ! -x "$SOLARENV/
     download $DMAKE_URL
 fi
 
-# Special handling of epm
-if [ -n "$EPM_URL" -a ! -x "$SOLARENV/$OUTPATH/bin/epm$EXEEXT" ]; then
+# Special handling of epm-3.7
+# Basically just a download of the epm archive.  
+# When its name contains "-source" than that part is removed.
+epm_archive_tail=`echo $(basename $EPM_URL) | sed 's/-source//'`
+epm_archive_name=$(find "$TARFILE_LOCATION" -type f -name "*-$epm_archive_tail")
+if [ -n "$EPM_URL" -a ! -x "$SOLARENV/$OUTPATH/bin/epm$EXEEXT" -a -z "$epm_archive_name"
]; then
     download $EPM_URL
+    archive_name=$(find "$TARFILE_LOCATION" -type f -name "*-epm-3.7-source*")
+    if [ -n "$archive_name" ]; then
+        epm_archive_name=`echo $archive_name | sed 's/-source//'`
+        mv "$archive_name" "$epm_archive_name"
+    fi
 fi
 
-
 if [ ! -z "$failed" ]; then
     echo
     echo ERROR: failed on:



Mime
View raw message