Author: jim
Date: Mon Jan 11 13:56:07 2021
New Revision: 1885364
URL: http://svn.apache.org/viewvc?rev=1885364&view=rev
Log:
Force removal of possible stale GIT version
Modified:
openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngi6/build_aoo32bit_on_centos7.sh
openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngi6/build_aoo32bit_on_fed19.sh
openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngix6/build_aoo64bit_on_centos7.sh
openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngix6/build_aoo64bit_on_ubuntu14.sh
openoffice/devtools/build-scripts/4.2.0-Dev3/unxmacos/build_aoo64bit_on_macos.sh
Modified:
openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngi6/build_aoo32bit_on_centos7.sh
URL:
http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngi6/build_aoo32bit_on_centos7.sh?rev=1885364&r1=1885363&r2=1885364&view=diff
==============================================================================
---
openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngi6/build_aoo32bit_on_centos7.sh
(original)
+++
openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngi6/build_aoo32bit_on_centos7.sh
Mon Jan 11 13:56:07 2021
@@ -83,6 +83,8 @@ if [ "$AOO_SKIP_CONFIG" != "yes" ]; then
| tee config.out ) || exit 1
fi
+\rm solenv/inc/reporevision.lst
+
source ./LinuxX86Env.Set.sh || exit 1
./bootstrap || exit 1
cd instsetoo_native
Modified:
openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngi6/build_aoo32bit_on_fed19.sh
URL:
http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngi6/build_aoo32bit_on_fed19.sh?rev=1885364&r1=1885363&r2=1885364&view=diff
==============================================================================
---
openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngi6/build_aoo32bit_on_fed19.sh
(original)
+++
openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngi6/build_aoo32bit_on_fed19.sh
Mon Jan 11 13:56:07 2021
@@ -85,6 +85,7 @@ fi
source ./LinuxX86Env.Set.sh || exit 1
./bootstrap || exit 1
+\rm solenv/inc/reporevision.lst
cd instsetoo_native
time perl "$SOLARENV/bin/build.pl" --all -- -P7 || exit 1
cd util
Modified:
openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngix6/build_aoo64bit_on_centos7.sh
URL:
http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngix6/build_aoo64bit_on_centos7.sh?rev=1885364&r1=1885363&r2=1885364&view=diff
==============================================================================
---
openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngix6/build_aoo64bit_on_centos7.sh
(original)
+++
openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngix6/build_aoo64bit_on_centos7.sh
Mon Jan 11 13:56:07 2021
@@ -19,17 +19,17 @@ AOO_BUILD_DEV=
AOO_BUILD_SRC=
while true; do
- case "$1" in
- "--verbose" ) AOO_VERBOSE_BUILD="--enable-verbose"; shift ;;
- "--skip-config" ) AOO_SKIP_CONFIG="yes"; shift ;;
- "--just-config" ) AOO_JUST_CONFIG="yes"; shift ;;
- "--build-src" ) AOO_BUILD_SRC="yes"; shift ;;
- "--dev" ) AOO_BUILD_TYPE="Apache OpenOffice Test Development Build";
AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_DEV="yes";
AOO_BUILD_BETA=""; shift ;;
- "--beta" ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build";
AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes";
AOO_BUILD_DEV=""; shift ;;
- "--" ) shift; break ;;
- "" ) break ;;
- * ) echo "unknown option: $1"; shift ;;
- esac
+ case "$1" in
+ "--verbose" ) AOO_VERBOSE_BUILD="--enable-verbose"; shift ;;
+ "--skip-config" ) AOO_SKIP_CONFIG="yes"; shift ;;
+ "--just-config" ) AOO_JUST_CONFIG="yes"; shift ;;
+ "--build-src" ) AOO_BUILD_SRC="yes"; shift ;;
+ "--dev" ) AOO_BUILD_TYPE="Apache OpenOffice Test Development
Build"; AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_DEV="yes";
AOO_BUILD_BETA=""; shift ;;
+ "--beta" ) AOO_BUILD_TYPE="Apache OpenOffice Beta Build";
AOO_BUILD_VERSION=" [${AOO_BUILD_TYPE}]"; AOO_BUILD_BETA="yes";
AOO_BUILD_DEV=""; shift ;;
+ "--" ) shift; break ;;
+ "" ) break ;;
+ * ) echo "unknown option: $1"; shift ;;
+ esac
done
if [ ! -d ../main -o ! -d sal ] ; then
@@ -39,7 +39,7 @@ fi
if [ ! -e external/unowinreg/unowinreg.dll ] ; then
echo "Downloading unowinreg.dll..."
- wget -O external/unowinreg/unowinreg.dll
http://www.openoffice.org/tools/unowinreg_prebuild/680/unowinreg.dll
+ wget -O external/unowinreg/unowinreg.dll
http://www.openoffice.org/tools/unowinreg_prebuild/680/unowinreg.dll
fi
LANGS="ast bg ca ca-XR ca-XV cs da de el en-GB en-US es et eu fi fr gd gl he
hi hu hy it ja kab km ko lt nb nl om pl pt pt-BR ru sk sl sr sv ta th tr uk vi
zh-CN zh-TW"
@@ -80,15 +80,16 @@ fi
source ./LinuxX86-64Env.Set.sh || exit 1
./bootstrap || exit 1
+\rm solenv/inc/reporevision.lst
cd instsetoo_native
time perl "$SOLARENV/bin/build.pl" --all -- -P7 || exit 1
cd util
if [ "$AOO_BUILD_BETA" = "yes" ]; then
- dmake -P7 openofficebeta || exit 1
+ dmake -P7 openofficebeta || exit 1
dmake -P7 sdkoobeta_en-US || exit 1
dmake -P7 ooobetalanguagepack || exit 1
elif [ "$AOO_BUILD_DEV" = "yes" ]; then
- dmake -P7 openofficedev || exit 1
+ dmake -P7 openofficedev || exit 1
dmake -P7 sdkoodev_en-US || exit 1
dmake -P7 ooodevlanguagepack || exit 1
else
Modified:
openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngix6/build_aoo64bit_on_ubuntu14.sh
URL:
http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngix6/build_aoo64bit_on_ubuntu14.sh?rev=1885364&r1=1885363&r2=1885364&view=diff
==============================================================================
---
openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngix6/build_aoo64bit_on_ubuntu14.sh
(original)
+++
openoffice/devtools/build-scripts/4.2.0-Dev3/unxlngix6/build_aoo64bit_on_ubuntu14.sh
Mon Jan 11 13:56:07 2021
@@ -80,6 +80,7 @@ fi
source ./LinuxX86-64Env.Set.sh || exit 1
./bootstrap || exit 1
+\rm solenv/inc/reporevision.lst
cd instsetoo_native
time perl "$SOLARENV/bin/build.pl" --all -- -P7 || exit 1
cd util
Modified:
openoffice/devtools/build-scripts/4.2.0-Dev3/unxmacos/build_aoo64bit_on_macos.sh
URL:
http://svn.apache.org/viewvc/openoffice/devtools/build-scripts/4.2.0-Dev3/unxmacos/build_aoo64bit_on_macos.sh?rev=1885364&r1=1885363&r2=1885364&view=diff
==============================================================================
---
openoffice/devtools/build-scripts/4.2.0-Dev3/unxmacos/build_aoo64bit_on_macos.sh
(original)
+++
openoffice/devtools/build-scripts/4.2.0-Dev3/unxmacos/build_aoo64bit_on_macos.sh
Mon Jan 11 13:56:07 2021
@@ -174,6 +174,7 @@ if [ "$AOO_JUST_CONFIG" = "yes" ]; then
fi
./bootstrap || exit 1
source ./MacOSXX64Env.Set.sh || exit 1
+\rm solenv/inc/reporevision.lst
cd instsetoo_native
time perl "$SOLARENV/bin/build.pl" --all -- -P9 || exit 1
