diff options
| author | Andras Timar <atimar@suse.com> | 2011-11-18 23:40:08 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2011-11-18 23:47:35 +0100 |
| commit | 949ee7c30806357a5e7fc678c7bbf53f991c71e8 (patch) | |
| tree | 855b44ad5b9c51d8f98291dc79f47f87b8915089 | |
| parent | 59a0064c2a195368379c5816640737e787550207 (diff) | |
add --enable-silent-msi configure switch
On Windows it is now configurable to create an MSI installer
which installs LibreOffice without user interaction.
| -rw-r--r-- | configure.in | 18 | ||||
| -rwxr-xr-x | set_soenv.in | 1 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/windows/property.pm | 13 |
3 files changed, 32 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 99566667b837..b50da2e1af86 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 7a265ebb4015..abf12db3e459 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 b7aa5ca03685..ee33596760cb 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 |