diff options
| -rw-r--r-- | configure.ac | 63 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeMacOSX.conf | 1 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeWin32.conf | 1 | ||||
| -rw-r--r-- | distro-configs/OxygenOfficeWin32.conf | 1 | ||||
| -rw-r--r-- | distro-configs/README | 7 | ||||
| -rw-r--r-- | instsetoo_native/Module_instsetoo_native.mk | 2 |
6 files changed, 28 insertions, 47 deletions
diff --git a/configure.ac b/configure.ac index f3dfc1b1dcbd..0375a34abae8 100644 --- a/configure.ac +++ b/configure.ac @@ -1404,10 +1404,11 @@ AC_ARG_WITH(epm, AC_ARG_WITH(package-format, AS_HELP_STRING([--with-package-format], - [Specify package format(s) for LibreOffice installsets. Default is the - "normal" one of the OS/Distribution. Possible values: aix, bsd, deb, - inst, tardist, osx, pkg, rpm, setld, native, portable, archive, dmg, - installed, msi. Example: --with-package-format="deb dmg"]), + [Specify package format(s) for LibreOffice installation sets. The + implicit --without-package-format leads to no installation sets being + generated. Possible values: aix, archive, bsd, deb, dmg, inst, + installed, msi, native, osx, pkg, portable, rpm, setld, and tardist. + Example: --with-package-format='deb rpm']), ,) AC_ARG_WITH(tls, @@ -4400,7 +4401,7 @@ dnl =================================================================== dnl Test which package format to use dnl =================================================================== AC_MSG_CHECKING([which package format to use]) -if test -n "$with_package_format"; then +if test -n "$with_package_format" -a "$with_package_format" != no; then for i in $with_package_format; do case "$i" in aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable | archive | dmg | installed | msi) @@ -4428,49 +4429,11 @@ msi - Windows .msi esac done PKGFORMAT="$with_package_format" -elif test "$enable_epm" = "yes"; then - # defaults - case "$_os" in - Darwin) - PKGFORMAT=dmg - ;; - SunOS) - PKGFORMAT=pkg - ;; - Linux) - # if building on Debian, default should be deb... - if test -e /etc/debian_version; then - PKGFORMAT=deb - else - PKGFORMAT=rpm - fi - ;; - AIX) - PKGFORMAT=rpm - ;; - OpenBSD|DragonFly) - PKGFORMAT=portable - ;; - *BSD) - PKGFORMAT=bsd - ;; - WINNT) - PKGFORMAT=msi - ;; - # we never should get here since we check the arciecture/os at the beginning, - # but go sure... - *) - AC_MSG_ERROR([unknown system]) - esac + AC_MSG_RESULT([$PKGFORMAT]) else - if test "$WITH_MINGW" = "yes"; then - # when tested, we should default this to 'msi', instead of 'archive' - PKGFORMAT=archive - else - PKGFORMAT=native - fi + PKGFORMAT= + AC_MSG_RESULT([none]) fi -AC_MSG_RESULT([$PKGFORMAT]) AC_SUBST(PKGFORMAT) dnl =================================================================== @@ -7463,6 +7426,14 @@ if test "$enable_epm" = "yes"; then AC_SUBST(DPKG) AC_SUBST(PKGMK) else + for i in $PKGFORMAT; do + case "$i" in + aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable) + AC_MSG_ERROR( + [--with-package-format='$PKGFORMAT' requires --enable-epm]) + ;; + esac + done AC_MSG_RESULT([no]) EPM=NO fi diff --git a/distro-configs/LibreOfficeMacOSX.conf b/distro-configs/LibreOfficeMacOSX.conf index 81b626c106a5..a10bbd9f7df7 100644 --- a/distro-configs/LibreOfficeMacOSX.conf +++ b/distro-configs/LibreOfficeMacOSX.conf @@ -10,3 +10,4 @@ --disable-gtk --with-help --with-myspell-dicts +--with-package-format=dmg diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index 532fc313baa0..b04c5268feae 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -13,3 +13,4 @@ --enable-win-mozab-driver --with-help --with-myspell-dicts +--with-package-format=msi diff --git a/distro-configs/OxygenOfficeWin32.conf b/distro-configs/OxygenOfficeWin32.conf index 98802c2b025e..42b96ae87269 100644 --- a/distro-configs/OxygenOfficeWin32.conf +++ b/distro-configs/OxygenOfficeWin32.conf @@ -29,6 +29,7 @@ --with-jdk-home=/usr/local/jdk1.6.0_23/ --without-junit --with-helppack-integration +--with-package-format=msi --enable-cairo --enable-graphite --enable-dependency-tracking diff --git a/distro-configs/README b/distro-configs/README index 50006fb9a8f4..a374acbb01ca 100644 --- a/distro-configs/README +++ b/distro-configs/README @@ -8,6 +8,13 @@ contrary, the intent is that just running ./autogen.sh without any options at all should produce a buildable configuration for developers with interest in working on the most commonly used parts of the code. +See [[https://wiki.documentfoundation.org/Development/ReleaseBuilds]] for how +TDF builds make use of these switches. (Especially, since --with-package-format +now triggers whether or not installation sets are built, all the relevant *.conf +files specify it, except for LibreOfficeLinux.conf, where the TDF build +instructions pass an explicit --with-package-format="rpm deb" in addition to +--with-distro=LibreOfficeLinux.) + (Possibly the above is a misunderstanding, or maybe there never even has been any clear consensus what situations these files actually are intended for.) diff --git a/instsetoo_native/Module_instsetoo_native.mk b/instsetoo_native/Module_instsetoo_native.mk index dc9e4a5493d9..ea540ebc6a1b 100644 --- a/instsetoo_native/Module_instsetoo_native.mk +++ b/instsetoo_native/Module_instsetoo_native.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Module_Module,instsetoo_native)) -ifneq (,$(filter WNT,$(OS))$(filter-out NO,$(EPM))) +ifneq (,$(PKGFORMAT)$(filter TRUE,$(LIBO_TEST_INSTALL))) $(eval $(call gb_Module_add_targets,instsetoo_native,\ CustomTarget_install \ |