Merge branch 'UpdateLO' into 'master'

Update LibreOffice Viewer

Update LO to 5.1.0.0.alpha1+. 

Now the build system uses grandle. As grandle clean is executed before Build, move the configure commands to Prebuild, or liboSettings.gradle won't be present.

See merge request !1027
This commit is contained in:
Boris Kraut 2015-10-28 07:58:05 +00:00
commit d0fa955274

View file

@ -51,8 +51,54 @@ Build:5.0.0.0.alpha1+/ab465b9,2
./autogen.sh --enable-release-build --with-vendor=F-Droid --with-android-package-name="org.documentfoundation.libreoffice" --enable-fetch-external=no --with-android-ndk=$$NDK$$ --with-android-ndk-toolchain-version=4.9 --with-android-sdk=$$SDK$$ --with-distro=LibreOfficeAndroidX86 --with-build-platform-configure-options="--with-system-jpeg=no --with-system-libxml=no --with-x=no --disable-gconf --disable-python" && \
make versionCode=2
Build:5.1.0.0.alpha1+/5b791ec,4
commit=5b791ec
subdir=android/source
gradle=StrippedUI
srclibs=LOTarballs@4f627e5f
prebuild=pushd ../../ && \
sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
sed -i -e 's/test_freetype=yes/test_freetype=no/g' configure.ac && \
sed -i -e '/debug/d' android/CustomTarget_lo_android.mk && \
sed -i -e 's/rm /true /g' android/source/Makefile && \
sed -i -e 's/\.\/gradlew/true/g' android/source/Makefile && \
echo "Typo" && \
sed -i -e 's/share\/share/share/g' android/source/build.gradle && \
./autogen.sh --enable-release-build --with-vendor=F-Droid --with-android-package-name="org.documentfoundation.libreoffice" --enable-fetch-external=no --with-android-ndk=$$NDK$$ --with-android-ndk-toolchain-version=4.9 --with-android-sdk=$$SDK$$ --with-distro=LibreOfficeAndroid --with-build-platform-configure-options="--with-system-jpeg=no --with-system-libxml=no --with-x=no --disable-gconf --disable-python" && \
popd && \
make liboSettings.gradle versionCode=4
build=pushd ../../ && \
ln -s ../android/source/$$LOTarballs$$ external/tarballs && \
make && \
popd
buildjni=no
Build:5.1.0.0.alpha1+/5b791ec,5
commit=5b791ec
subdir=android/source
gradle=StrippedUI
srclibs=LOTarballs@4f627e5f
prebuild=pushd ../../ && \
sed -i -e 's/\/$(OOO_VENDOR)//g' android/Bootstrap/Makefile.shared && \
sed -i -e 's/test_fontconfig=yes/test_fontconfig=no/g' configure.ac && \
sed -i -e 's/test_freetype=yes/test_freetype=no/g' configure.ac && \
sed -i -e '/debug/d' android/CustomTarget_lo_android.mk && \
sed -i -e 's/rm /true /g' android/source/Makefile && \
sed -i -e 's/\.\/gradlew/true/g' android/source/Makefile && \
echo "Typo" && \
sed -i -e 's/share\/share/share/g' android/source/build.gradle && \
./autogen.sh --enable-release-build --with-vendor=F-Droid --with-android-package-name="org.documentfoundation.libreoffice" --enable-fetch-external=no --with-android-ndk=$$NDK$$ --with-android-ndk-toolchain-version=4.9 --with-android-sdk=$$SDK$$ --with-distro=LibreOfficeAndroidX86 --with-build-platform-configure-options="--with-system-jpeg=no --with-system-libxml=no --with-x=no --disable-gconf --disable-python" && \
popd && \
make liboSettings.gradle versionCode=5
build=pushd ../../ && \
ln -s ../android/source/$$LOTarballs$$ external/tarballs && \
make && \
popd
buildjni=no
Archive Policy:4 versions
Auto Update Mode:None
Update Check Mode:None
Current Version:5.0.0.0.alpha1+/ab465b9
Current Version Code:2
Current Version:5.1.0.0.alpha1+/5b791ec
Current Version Code:5