[Libreoffice-commits] .: 2 commits - configure.in scp2/source solenv/bin

[Andras Timar]

 configure.in                                     |    1 +
 scp2/source/base/folderitem_base.scp             |    2 ++
 scp2/source/calc/folderitem_calc.scp             |    2 ++
 scp2/source/draw/folderitem_draw.scp             |    2 ++
 scp2/source/impress/folderitem_impress.scp       |    2 ++
 scp2/source/math/folderitem_math.scp             |    2 ++
 scp2/source/writer/folderitem_writer.scp         |    2 ++
 solenv/bin/modules/installer/windows/property.pm |    4 ++--
 8 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit 37676d162c29331c9f6235cf51406db8aaf8dfba
Author: Andras Timar <atimar at suse.com>
Date:   Mon Nov 21 10:05:00 2011 +0100

    only one launcher icon for silent MSI

diff --git a/configure.in b/configure.in
index 49d3b8e..eebcc78 100644
--- a/configure.in
+++ b/configure.in
@@ -8468,6 +8468,7 @@ if test "z$enable_silent_msi" = "z" -o "z$enable_silent_msi" = "zno" ; then
 else
     AC_MSG_RESULT([yes])
     ENABLE_SILENT_MSI="TRUE"
+    SCPDEFS="$SCPDEFS -DENABLE_SILENT_MSI"
 fi
 AC_SUBST(ENABLE_SILENT_MSI)
 
diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp
index 671bd93..c21c2a8 100644
--- a/scp2/source/base/folderitem_base.scp
+++ b/scp2/source/base/folderitem_base.scp
@@ -27,6 +27,7 @@
 
 #include "macros.inc"
 
+#ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Sbase
     Name = "%PRODUCTNAME Base";
     ModuleID = gid_Module_Prg_Base_Bin;
@@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Sbase
     Styles = (NOWEB, NON_ADVERTISED);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE);
 End
+#endif
diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp
index 782d135..f77258a 100644
--- a/scp2/source/calc/folderitem_calc.scp
+++ b/scp2/source/calc/folderitem_calc.scp
@@ -27,6 +27,7 @@
 
 #include "macros.inc"
 
+#ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Scalc
     Name = "%PRODUCTNAME Calc";
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Scalc
     Styles = (NOWEB, NON_ADVERTISED);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC);
 End
+#endif
diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp
index a07f710..1fe1de2 100644
--- a/scp2/source/draw/folderitem_draw.scp
+++ b/scp2/source/draw/folderitem_draw.scp
@@ -27,6 +27,7 @@
 
 #include "macros.inc"
 
+#ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Sdraw
     Name = "%PRODUCTNAME Draw";
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Sdraw
     Styles = (NOWEB, NON_ADVERTISED);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW);
 End
+#endif
diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp
index 98954f1..31c56ad 100644
--- a/scp2/source/impress/folderitem_impress.scp
+++ b/scp2/source/impress/folderitem_impress.scp
@@ -27,6 +27,7 @@
 
 #include "macros.inc"
 
+#ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Simpress
     Name = "%PRODUCTNAME Impress";
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Simpress
     Styles = (NOWEB, NON_ADVERTISED);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS);
 End
+#endif
diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp
index 609de29..3ad3b07 100644
--- a/scp2/source/math/folderitem_math.scp
+++ b/scp2/source/math/folderitem_math.scp
@@ -27,6 +27,7 @@
 
 #include "macros.inc"
 
+#ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Smath
     Name = "%PRODUCTNAME Math";
     ModuleID = gid_Module_Prg_Math_Bin;
@@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Smath
     Styles = (NOWEB, NON_ADVERTISED);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH);
 End
+#endif
diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp
index 1fe448d..946ae65 100644
--- a/scp2/source/writer/folderitem_writer.scp
+++ b/scp2/source/writer/folderitem_writer.scp
@@ -27,6 +27,7 @@
 
 #include "macros.inc"
 
+#ifndef ENABLE_SILENT_MSI
 FolderItem gid_Folderitem_Swriter
     Name = "%PRODUCTNAME Writer";
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -39,3 +40,4 @@ FolderItem gid_Folderitem_Swriter
     Styles = (NOWEB, NON_ADVERTISED);
     ALL_LANG(Tooltip, STR_FI_TOOLTIP_WRITER);
 End
+#endif
commit 5fc21e87b9bcc55a542c4e675f4b78cc578026d1
Author: Andras Timar <atimar at suse.com>
Date:   Mon Nov 21 09:58:55 2011 +0100

    in perl there are no barewords for true/false

diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index ee33596..1e6e921 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -480,7 +480,7 @@ sub update_property_table
 
     my $propertyfile = installer::files::read_file($properyfilename);
 
-    my $hasarpnomodify = false;
+    my $hasarpnomodify = 0;
 
     # Getting the new values
     # Some values (arpcomments, arpcontacts, ...) are inserted from the Property.mlf
@@ -506,7 +506,7 @@ 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; }
+        if ( ${$propertyfile}[$i] =~ m/\bARPNOMODIFY\b/ ) { $hasarpnomodify = 1; }
     }
 
     # Check if are building silent MSI