[Libreoffice-commits] core.git: configure.ac solenv/bin

[Tor Lillqvist]

 configure.ac                              |    6 ++----
 solenv/bin/modules/installer/control.pm   |    1 -
 solenv/bin/modules/installer/parameter.pm |    2 --
 3 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit 68b845c81826464676a8a67d6002881d9c6a1d99
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Aug 27 18:55:14 2014 +0300

    I think --with-package-format=native/portable can go away
    
    Or does somebody know what they mean and even use either?
    
    Change-Id: If935d5d6b53d1f95ec22b19b6b97f4ecfe4d9c06

diff --git a/configure.ac b/configure.ac
index ffa33d3..bceb70f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1525,7 +1525,7 @@ AC_ARG_WITH(package-format,
         [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,
-         installed, msi, native, pkg, portable, and rpm.
+         installed, msi, pkg, and rpm.
          Example: --with-package-format='deb rpm']),
 ,)
 
@@ -4608,7 +4608,7 @@ AC_MSG_CHECKING([which package format to use])
 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 | pkg | rpm | native | portable | archive | dmg | installed | msi)
+        aix | bsd | deb | pkg | rpm | archive | dmg | installed | msi)
             ;;
         *)
             AC_MSG_ERROR([unsupported format $i. Supported by EPM are:
@@ -4617,8 +4617,6 @@ bsd - FreeBSD, NetBSD, or OpenBSD software distribution
 deb - Debian software distribution
 pkg - Solaris software distribution
 rpm - RedHat software distribution
-native - "Native" software distribution for the platform
-portable - Portable software distribution
 
 LibreOffice additionally supports:
 archive - .tar.gz or .zip
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 660863a..3b77433 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -477,7 +477,6 @@ sub set_addsystemintegration
 
     if ( $installer::globals::languagepack ) { $installer::globals::addsystemintegration = 0; }
     if ( $installer::globals::helppack ) { $installer::globals::addsystemintegration = 0; }
-    if (( $installer::globals::packageformat eq "native" ) || ( $installer::globals::packageformat eq "portable" )) { $installer::globals::addsystemintegration = 0; }
 
     my $infoline = "Value of \$installer::globals::addsystemintegration: $installer::globals::addsystemintegration\n";
     push( @installer::globals::globallogfileinfo, $infoline);
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 5feef84..7a7487d 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -334,8 +334,6 @@ sub setglobalvariables
 
     # Defaulting to native package format for epm
 
-    if ( ! $installer::globals::packageformat ) { $installer::globals::packageformat = "native"; }
-
     # no languages defined as parameter
     if ($installer::globals::languagelist eq "") { $installer::globals::languages_defined_in_productlist = 1; }