[Libreoffice-commits] .: configure.in set_soenv.in solenv/bin

[Andras Timar]

 configure.in                                     |   18 ++++++++++++++++++
 set_soenv.in                                     |    1 +
 solenv/bin/modules/installer/windows/property.pm |   13 +++++++++++++
 3 files changed, 32 insertions(+)

New commits:
commit 949ee7c30806357a5e7fc678c7bbf53f991c71e8
Author: Andras Timar <atimar at suse.com>
Date:   Fri Nov 18 23:40:08 2011 +0100

    add --enable-silent-msi configure switch
    
    On Windows it is now configurable to create an MSI installer
    which installs LibreOffice without user interaction.

diff --git a/configure.in b/configure.in
index 9956666..b50da2e 100644
--- a/configure.in
+++ b/configure.in
@@ -806,6 +806,11 @@ AC_ARG_ENABLE(release-build,
          See http://wiki.documentfoundation.org/DevBuild]),
 ,)
 
+AC_ARG_ENABLE(silent-msi,
+    AS_HELP_STRING([--enable-silent-msi],
+        [Enable MSI with LIMITUI=1 (silent install).]),
+,)
+
 dnl ===================================================================
 dnl Optional Packages (--with/without-)
 dnl ===================================================================
@@ -8459,6 +8464,19 @@ fi
 AC_SUBST(ENABLE_RELEASE_BUILD)
 
 dnl ===================================================================
+dnl Test whether to create MSI with LIMITUI=1 (silent install)
+dnl ===================================================================
+AC_MSG_CHECKING([whether to create MSI with LIMITUI=1 (silent install)])
+if test "z$enable_silent_msi" = "z" -o "z$enable_silent_msi" = "zno" ; then
+    AC_MSG_RESULT([no])
+    ENABLE_SILENT_MSI="FALSE"
+else
+    AC_MSG_RESULT([yes])
+    ENABLE_SILENT_MSI="TRUE"
+fi
+AC_SUBST(ENABLE_SILENT_MSI)
+
+dnl ===================================================================
 dnl Test whether to enable ActiveX embedding
 dnl ===================================================================
 if test "$_os" = "WINNT"; then
diff --git a/set_soenv.in b/set_soenv.in
index 7a265eb..abf12db 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1869,6 +1869,7 @@ ToFile( "VERBOSE",           "@VERBOSE@",          "e" );
 ToFile( "ENABLE_ZENITY",           "@ENABLE_ZENITY@",          "e" );
 ToFile( "ENABLE_EVOAB2",     "@ENABLE_EVOAB2@",    "e" );
 ToFile( "ENABLE_UGLY",       "@ENABLE_UGLY@",      "e" );
+ToFile( "ENABLE_SILENT_MSI", "@ENABLE_SILENT_MSI@", "e" );
 ToFile( "ENABLE_RELEASE_BUILD", "@ENABLE_RELEASE_BUILD@", "e" );
 ToFile( "GOBJECT_CFLAGS",    "@GOBJECT_CFLAGS@",   "e" );
 ToFile( "GOBJECT_LIBS",      "@GOBJECT_LIBS@",     "e" );
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index b7aa5ca..ee33596 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -480,6 +480,8 @@ sub update_property_table
 
     my $propertyfile = installer::files::read_file($properyfilename);
 
+    my $hasarpnomodify = false;
+
     # Getting the new values
     # Some values (arpcomments, arpcontacts, ...) are inserted from the Property.mlf
 
@@ -504,6 +506,17 @@ sub update_property_table
         ${$propertyfile}[$i] =~ s/\bPRODUCTNAMETEMPLATE\b/$productname/;
         ${$propertyfile}[$i] =~ s/\bPRODUCTVERSIONTEMPLATE\b/$productversion/;
         ${$propertyfile}[$i] =~ s/\bQUICKSTARTERLINKNAMETEMPLATE\b/$quickstarterlinkname/;
+        if ( ${$propertyfile}[$i] =~ m/\bARPNOMODIFY\b/ ) { $hasarpnomodify = true; }
+    }
+
+    # Check if are building silent MSI
+    if ( $ENV{ENABLE_SILENT_MSI} eq "TRUE" )
+    {
+        push(@{$propertyfile}, "LIMITUI" . "\t" . "1" . "\n");
+        if ( !($hasarpnomodify) )
+        {
+            push(@{$propertyfile}, "ARPNOMODIFY" . "\t" . "1" . "\n");
+        }
     }
 
     # Setting variables into propertytable