diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-12-17 12:28:41 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-12-17 12:28:41 +0100 |
| commit | 2e8af315b256e10d0564759b7a03cac8a53c1cfe (patch) | |
| tree | 0473dd0fd90bf07edae68911dc68081822be35db /scp2 | |
| parent | 6dd626c58f2ac752dd995d1b3da53e6bad75d2da (diff) | |
Trying to conditionalize scp2 for helppack integration
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/inc/macros.inc | 6 | ||||
| -rw-r--r-- | scp2/source/base/file_base.scp | 1 | ||||
| -rw-r--r-- | scp2/source/impress/file_impress.scp | 3 | ||||
| -rw-r--r-- | scp2/source/ooo/directory_ooo.scp | 4 | ||||
| -rw-r--r-- | scp2/source/templates/module_helppack.sct | 6 |
5 files changed, 16 insertions, 4 deletions
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 4344662f4287..3fa2f8bda690 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 14b95922f304..7a9fae3997ca 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 7793370cb233..cda4495428ee 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 941c70cdfa14..0e4036784242 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 32b4a7a15a3f..ac8779a5e8cc 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 |