summaryrefslogtreecommitdiff
path: root/distro-configs
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-11-29 15:47:51 +0200
committerTor Lillqvist <tml@iki.fi>2012-11-29 18:02:57 +0200
commit5c159626c6b3ace5becf03aad5ed9a1851065c15 (patch)
treee771149151c933ce8eb58a431825db472bc34c0b /distro-configs
parent70626249cd247d9acdad417b8eaf252bae22c059 (diff)
Always use Java target version 1.5
It has been way too common for people to accidentally have a javac from JDK 7 create class files that are of the newest version, which older JREs and Android's dex then don't understand. As many of the distro-configs files specified --with-java-target-version=1.5 anyway, let's just hardcode that for now. Change-Id: I0853820dc56a062f053b5c2c30097bf1ff3798c1
Diffstat (limited to 'distro-configs')
-rw-r--r--distro-configs/LibreOfficeAndroid.conf1
-rw-r--r--distro-configs/LibreOfficeAndroidX86.conf1
-rw-r--r--distro-configs/LibreOfficeLinux.conf1
-rw-r--r--distro-configs/LibreOfficeMacOSX.conf1
-rw-r--r--distro-configs/LibreOfficeOpenBSD.conf1
-rw-r--r--distro-configs/LibreOfficeWin32.conf1
-rw-r--r--distro-configs/LibreOfficeWin64.conf1
7 files changed, 0 insertions, 7 deletions
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index 14b31dfd1af4..0758a8ac4328 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -23,4 +23,3 @@
--without-helppack-integration
--without-myspell-dicts
--with-build-platform-configure-options=--disable-liblangtag
---with-java-target-version=1.5
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index 43f1c0be5262..a453fa34f016 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -23,4 +23,3 @@
--without-helppack-integration
--without-myspell-dicts
--with-build-platform-configure-options=--disable-liblangtag
---with-java-target-version=1.5
diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf
index 0ffc31c96e1e..244bffd3f957 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -15,7 +15,6 @@
--without-junit
--without-helppack-integration
--with-linker-hash-style=both
---with-java-target-version=1.5
--with-fonts
--with-external-thes-dir=/usr/share/mythes
--with-external-hyph-dir=/usr/share/hyphen
diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf
index 686f5fe424ae..2ca107018a07 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -1,6 +1,5 @@
--with-vendor=The Document Foundation
--enable-epm
---with-java-target-version=1.5
--enable-scripting-beanshell
--enable-scripting-javascript
--enable-ext-presenter-minimizer
diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf
index 52ba333fd8c4..a56c09735d56 100644
--- a/distro-configs/LibreOfficeOpenBSD.conf
+++ b/distro-configs/LibreOfficeOpenBSD.conf
@@ -21,7 +21,6 @@
--enable-extension-integration
--with-fonts
--with-java
---with-java-target-version=1.5
--with-jdk-home=/usr/local/jdk-1.5.0
--with-myspell-dicts
--with-system-boost
diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf
index 7c92efe53288..b4529a6cc63d 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -5,7 +5,6 @@
--without-helppack-integration
--without-agfa-monotype-fonts
--enable-extension-integration
---with-java-target-version=1.5
--disable-gtk
--enable-scripting-beanshell
--enable-scripting-javascript
diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf
index 8db7f58f246c..35ca06140c1d 100644
--- a/distro-configs/LibreOfficeWin64.conf
+++ b/distro-configs/LibreOfficeWin64.conf
@@ -1,6 +1,5 @@
--with-vendor=The Document Foundation
--without-agfa-monotype-fonts
---with-java-target-version=1.5
--enable-cl-x64
--disable-gtk
--enable-scripting-beanshell