[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - bootstrap.1 solenv/bin

[Damjan Jovanovic]

 bootstrap.1                                  |   16 ++++++++--------
 solenv/bin/download_external_dependencies.pl |    6 +++++-
 2 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 9650c1489ac9e210b04b728f98ac72b7a7155a89
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Wed Jul 27 17:22:09 2016 +0000

    The AOOJavaDownloader may be necessary for downloading extensions
    
    even if DO_FETCH_TARBALLS is disabled.
    
    Patch by: me

diff --git a/bootstrap.1 b/bootstrap.1
index 045b547..faeb891 100644
--- a/bootstrap.1
+++ b/bootstrap.1
@@ -37,18 +37,18 @@ chmod +x "$SRC_ROOT/solenv/bin/build_client.pl"
 chmod +x "$SRC_ROOT/solenv/bin/zipdep.pl"
 chmod +x "$SRC_ROOT/solenv/bin/gccinstlib.pl"
 
+# build the AOOJavaDownloader
+mkdir -p "$SOLARENV/$INPATH/class"
+"$JAVACOMPILER" "$SOLARENV/javadownloader/AOOJavaDownloader.java" -d "$SOLARENV/$INPATH/class"
+if [ "$?" != "0" ]; then
+    echo "*** Failed to build AOOJavaDownloader, aborting! ***"
+    exit 1
+fi
+
 # fetch or update external tarballs
 if [ "$DO_FETCH_TARBALLS" = "yes" ]; then
 # check perl include locations
     "$PERL" -e 'print "\nInclude locations: @INC\n\n"';
-
-    mkdir -p "$SOLARENV/$INPATH/class"
-    "$JAVACOMPILER" "$SOLARENV/javadownloader/AOOJavaDownloader.java" -d "$SOLARENV/$INPATH/class"
-    if [ "$?" != "0" ]; then
-        echo "*** Failed to build AOOJavaDownloader, aborting! ***"
-        exit 1
-    fi
-
     "$PERL" "$SOLARENV/bin/download_external_dependencies.pl" $SRC_ROOT/external_deps.lst
     if [ "$?" != "0" ]; then
         echo "*** Error downloading external dependencies, please fix the previous problems and try again ***"
commit b50546145d4d5bc6ed44d0539a6a3e62e03e783f
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Wed Jul 27 17:15:45 2016 +0000

    Allow Ctrl+C to interrupt ./bootstrap.
    
    Patch by: me

diff --git a/solenv/bin/download_external_dependencies.pl b/solenv/bin/download_external_dependencies.pl
index ec68036..3990e34 100755
--- a/solenv/bin/download_external_dependencies.pl
+++ b/solenv/bin/download_external_dependencies.pl
@@ -538,10 +538,14 @@ sub DownloadFile ($$$)
     {
         return 1;
     }
-    else
+    elsif ($? == 1)
     {
         return 0;
     }
+    else
+    {
+        exit $?;
+    }
 }