[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 3 commits - configure.in scp2/inc scp2/source

[René Engelhard]

 configure.in                              |   21 +++++++++++++++++++++
 scp2/inc/macros.inc                       |    6 ++++++
 scp2/source/base/file_base.scp            |    1 -
 scp2/source/impress/file_impress.scp      |    3 +--
 scp2/source/ooo/directory_ooo.scp         |    4 ++++
 scp2/source/templates/module_helppack.sct |    6 +++++-
 6 files changed, 37 insertions(+), 4 deletions(-)

New commits:
commit 3261a8bacab129b5a1d403a9d8aec3e7bb6bd60d
Merge: 2260f31... 306df0d...
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Dec 17 17:19:39 2010 +0100

    Merge branch 'feature/helppack' into libreoffice-3-3

commit 306df0d2c5852b0642d3aa7d5cd2c08b84e9e1f4
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Dec 17 12:28:41 2010 +0100

    Trying to conditionalize scp2 for helppack integration

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 4344662..3fa2f8b 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -116,9 +116,15 @@
         TXT_FILE_BODY; \
         Styles = (ARCHIVE,PATCH)
 
+#ifdef WITH_HELPPACK_INTEGRATION
+#define ARCHIVE_TXT_FILE_BODY_HELPPACK \
+        TXT_FILE_BODY; \
+        Styles = (ARCHIVE,FORCEHELPPACK,LANGUAGEMODULE)
+#else
 #define ARCHIVE_TXT_FILE_BODY_HELPPACK \
         TXT_FILE_BODY; \
         Styles = (ARCHIVE,HELPPACK,LANGUAGEMODULE)
+#endif
 
 #define ARCHIVE_SUBST_FILE_BODY \
         TXT_FILE_BODY; \
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 14b9592..7a9fae3 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -77,7 +77,6 @@ File gid_File_Help_Sdatabase_Zip
     ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdatabase);
     Patchfiles = (); 
-    Styles = (ACRHIVE,HELPPACK);
 End
 
 File gid_File_Share_Registry_Base_Xcd
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index 7793370..cda4495 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -46,8 +46,7 @@ End
 
 File gid_File_Help_Simpress_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE,DONT_OVERWRITE,HELPPACK);
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(simpress);
     Patchfiles = (); 
 End
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 941c70c..0e40367 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -1237,7 +1237,11 @@ End
 Directory gid_Dir_Help_Isolanguage
     ParentID = gid_Dir_Help;
     DIR_ISOLANGUAGE_ALL_LANG;
+#ifdef WITH_HELPPACK_INTEGRATION
+    Styles = (FORCEHELPPACK);
+#else
     Styles = (HELPPACK);
+#endif
 End
 
 #ifdef UNX
diff --git a/scp2/source/templates/module_helppack.sct b/scp2/source/templates/module_helppack.sct
index 32b4a7a..ac8779a 100644
--- a/scp2/source/templates/module_helppack.sct
+++ b/scp2/source/templates/module_helppack.sct
@@ -30,5 +30,9 @@ Module gid_Module_Helppack_Root_<LANGUAGE_>
     Sortkey = "<SORTKEY>";
     Language = "<LANGUAGE>";
     MOD_NAME_DESC(MODULE_HELPPACK_<LANGUAGEBIG_>);
-    Styles =(HELPPACK, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME, LANGUAGEMODULE);
+#ifdef WITH_HELPPACK_INTEGRATION
+    Styles =(FORCEHELPPACK, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME, LANGUAGEMODULE);
+#ifdef WITH_HELPPACK_INTEGRATION
+    Styles =(HELPPACK, HIDDEN_ROOT, USELANGUAGENAME, LANGUAGEMODULE);
+#endif
 End
commit 4ba740a78586fb8107e351f9ff96540fd328f1ff
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Dec 17 12:14:27 2010 +0100

    Add --with-helppack-integration configure option

diff --git a/configure.in b/configure.in
index 3857aff..e431cbf 100644
--- a/configure.in
+++ b/configure.in
@@ -510,6 +510,13 @@ AC_ARG_WITH(extension-integration,
                           Please use this switch to include any extension.],
 ,)
 
+AC_ARG_WITH(helppack-integration,
+[
+  --with-helppack-integration      It will integrate the helppacks to the installer
+                          of the product.
+                          Please use this switch to include any helppack.],
+,)
+
 AC_ARG_WITH(fonts,
 [  --without-fonts         OOo includes some third-party fonts to provide a reliable
                           basis for help content, templates, samples, etc.
@@ -7111,6 +7118,20 @@ fi
 AC_SUBST(WITH_THEMES)
 
 dnl ===================================================================
+dnl Test whether to integrate helppacks into the product's installer
+dnl ===================================================================
+AC_MSG_CHECKING([for helppack integration])
+if test "z$with_helppack_integration" = "z" -o "z$with_helppack_integration" = "zno" ; then
+  WITH_HELPPACK_INTEGRATION=NO
+  AC_MSG_RESULT([no integration])
+else
+  WITH_HELPPACK_INTEGRATION=YES
+  SCPDEFS="$SCPDEFS -DWITH_HELLPACK_INTEGRATION"
+  AC_MSG_RESULT([integration])
+fi
+AC_SUBST(WITH_HELPPACK_INTEGRATION)
+
+dnl ===================================================================
 dnl Test whether to integrate extensions into the product's installer
 dnl ===================================================================
 AC_MSG_CHECKING([for extensions integration])