Author: damjan
Date: Wed Jul 27 17:22:09 2016
New Revision: 1754318
URL: http://svn.apache.org/viewvc?rev=1754318&view=rev
Log:
The AOOJavaDownloader may be necessary for downloading extensions
even if DO_FETCH_TARBALLS is disabled.
Patch by: me
Modified:
openoffice/trunk/main/bootstrap.1
Modified: openoffice/trunk/main/bootstrap.1
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bootstrap.1?rev=1754318&r1=1754317&r2=1754318&view=diff
==============================================================================
--- openoffice/trunk/main/bootstrap.1 (original)
+++ openoffice/trunk/main/bootstrap.1 Wed Jul 27 17:22:09 2016
@@ -37,18 +37,18 @@ chmod +x "$SRC_ROOT/solenv/bin/build_cli
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 ***"
