[Libreoffice-commits] .: 87 commits - configure.in instsetoo_native/inc_broffice instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/res instsetoo_native/util scp2/source set_soenv.in solenv/bin solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Mon Dec 20 04:19:37 PST 2010
configure.in | 57 ++++++--
instsetoo_native/inc_broffice/windows/msi_templates/Binary/Banner.bmp |binary
instsetoo_native/inc_broffice/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/inc_openoffice/windows/msi_languages/Property.ulf | 6
instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/res/nologoinstall.bmp |binary
instsetoo_native/util/makefile.mk | 4
instsetoo_native/util/openoffice.lst | 16 +-
scp2/source/ooo/ooo_brand.scp | 2
set_soenv.in | 1
solenv/bin/make_installer.pl | 10 +
solenv/bin/modules/installer/download.pm | 22 +++
solenv/bin/modules/installer/epmfile.pm | 69 ++++++++--
solenv/bin/modules/installer/followme.pm | 2
solenv/bin/modules/installer/globals.pm | 4
solenv/bin/modules/installer/helppack.pm | 51 +++----
solenv/bin/modules/installer/languagepack.pm | 2
solenv/bin/modules/installer/scriptitems.pm | 27 +++
solenv/bin/modules/installer/simplepackage.pm | 12 +
solenv/bin/modules/installer/windows/createfolder.pm | 7 -
solenv/bin/modules/installer/windows/directory.pm | 3
solenv/bin/modules/installer/windows/feature.pm | 4
solenv/bin/modules/installer/windows/mergemodule.pm | 2
solenv/bin/modules/installer/windows/msp.pm | 6
solenv/bin/modules/installer/windows/property.pm | 11 +
solenv/bin/modules/installer/windows/registry.pm | 1
solenv/bin/modules/installer/windows/update.pm | 1
solenv/bin/modules/installer/windows/upgrade.pm | 2
solenv/bin/modules/installer/worker.pm | 5
solenv/bin/modules/installer/ziplist.pm | 1
solenv/inc/minor.mk | 6
solenv/inc/productversion.mk | 2
33 files changed, 247 insertions(+), 89 deletions(-)
New commits:
commit c4236bd744170559a518e46e65d395d1ea19068d
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Dec 20 11:26:39 2010 +0100
Forgotten pieces when resolving the libreoffice-3.3.0.2 conflicts.
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 88ce7de..53f563a 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -330,5 +330,3 @@ End
#endif
#endif
-
-#endif
diff --git a/solenv/bin/modules/installer/helppack.pm b/solenv/bin/modules/installer/helppack.pm
index 887e833..21d2f04 100644
--- a/solenv/bin/modules/installer/helppack.pm
+++ b/solenv/bin/modules/installer/helppack.pm
@@ -50,49 +50,15 @@ sub select_help_items
{
my $oneitem = ${$itemsref}[$i];
-<<<<<<< HEAD
- my $ismultilingual = $oneitem->{'ismultilingual'};
-
- if (!($ismultilingual))
-=======
my $styles = "";
if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
if (( $styles =~ /\bHELPPACK\b/ ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
->>>>>>> libreoffice-3.3.0.2
{
# Files with style "HELPPACK" and "FORCEHELPPACK" also have to be included into the help pack.
# Files with style "HELPPACK" are only included into help packs.
# Files with style "FORCEHELPPACK" are included into help packs and non help packs. They are
# forced, because otherwise they not not be included into helppacks.
-<<<<<<< HEAD
-
- my $styles = "";
- if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-
- if (( $styles =~ /\bHELPPACK\b/ ) || ( $styles =~ /\bFORCEHELPPACK\b/ )) { push(@itemsarray, $oneitem); }
-
- next; # single language files are not included into help pack
- }
-
- if (0) {
- my $specificlanguage = "";
- if ( $oneitem->{'specificlanguage'} ) { $specificlanguage = $oneitem->{'specificlanguage'}; }
-
- for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ ) # iterating over all languages
- {
- my $onelanguage = ${$languagesarrayref}[$j];
- my $locallang = $onelanguage;
- $locallang =~ s/-/_/;
-
- if ( $specificlanguage eq $onelanguage )
- {
- push(@itemsarray, $oneitem);
- }
- }
- }
- }
-=======
my $ismultilingual = $oneitem->{'ismultilingual'};
@@ -119,7 +85,6 @@ sub select_help_items
}
}
}
->>>>>>> libreoffice-3.3.0.2
return \@itemsarray;
}
@@ -526,11 +491,7 @@ sub build_installer_for_helppack
# find and read english license file
my $licenselanguage = "en-US"; # always english !
-<<<<<<< HEAD
- my $licensefilename = "LICENSE_" . $licenselanguage;
-=======
my $licensefilename = "LICENSE"; # _" . $licenselanguage;
->>>>>>> libreoffice-3.3.0.2
my $licenseincludepatharrayref = installer::worker::get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);
commit 7751d4c130035261a4e97c4c7576be6168f339a0
Merge: f9e28af... b4bcd41...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Dec 20 01:11:02 2010 +0100
Merge commit 'libreoffice-3.3.0.2'
Conflicts:
configure.in
scp2/source/extensions/directory_extensions.scp
scp2/source/extensions/module_extensions.scp
scp2/source/ooo/file_ooo.scp
set_soenv.in
solenv/bin/modules/installer/download.pm
solenv/bin/modules/installer/helppack.pm
solenv/bin/modules/installer/windows/createfolder.pm
solenv/bin/modules/installer/worker.pm
solenv/bin/ooinstall
diff --cc configure.in
index b752c93,266f7e3..ee572fb
mode 100755,100644..100755
--- a/configure.in
+++ b/configure.in
@@@ -486,66 -460,54 +486,72 @@@ dnl ===================================
dnl Optional Packages (--with/without-)
dnl ===================================================================
AC_ARG_WITH(gnu-patch,
-[ --with-gnu-patch Specify location of GNU patch on Solaris or FreeBSD
-],,)
+ AS_HELP_STRING([--with-gnu-patch],
+ [Specify location of GNU patch on Solaris or FreeBSD.]),
+,)
AC_ARG_WITH(gnu-cp,
-[ --with-gnu-cp Specify location of GNU cp on Solaris or FreeBSD
-],,)
+ AS_HELP_STRING([--with-gnu-cp],
+ [Specify location of GNU cp on Solaris or FreeBSD.]),
+,)
AC_ARG_WITH(system-graphite,
-[ --with-system-graphite use graphite library already installed on system
-],,)
+ AS_HELP_STRING([--with-system-graphite],
+ [Use graphite library already installed on system.]),
+,)
AC_ARG_WITH(external-tar,
-[ --with-external-tar=<TARFILE PATH> Specify path to tarfiles manually ],
-[ TARFILE_LOCATION="$withval"
-])
+ AS_HELP_STRING([--with-external-tar=<TARFILE PATH>],
+ [Specify path to tarfiles manually.]),
+ TARFILE_LOCATION=$withval ,
+)
+
+AC_ARG_WITH(linked-git,
+ AS_HELP_STRING([--with-linked-git=<OTHER_CLONE_DIR>],
+ [Specify another checkout's clonedir to re-use. This makes use of
+ git-new-workdir, and saves a lot of diskspace when having multiple
+ trees side-by-side.]),
+ GIT_LINK_SRC=$withval ,
+)
AC_ARG_WITH(openldap,
-[ --with-openldap Enables the use of the OpenLDAP LDAP SDK instead
- of the Netscape/Mozilla one
-],,)
+ AS_HELP_STRING([--with-openldap],
+ [Enables the use of the OpenLDAP LDAP SDK instead of the Netscape/Mozilla one.]),
+,)
AC_ARG_WITH(vba-package-format,
-[ --with-vba-package-format specify package format for vba compatibility api.
- Specifying "builtin" means the api component and
- associated type library are part of the installation set.
- Specifying "extn" creates an uno extension that is
- part of the installation set ( located in the program
- directory ) that MUST be optionly registered using
- either the unopkg executeable or the extension manager
- gui.
-
+ AS_HELP_STRING([--with-vba-package-format],
+ [Specify package format for vba compatibility api. Specifying "builtin"
+ means the api component and associated type library are part of the
+ installation set. Specifying "extn" creates an uno extension that is
+ part of the installation set (located in the program directory) that
+ MUST be optionly registered using either the unopkg executeable or the
+ extension manager gui.])
+ [
Note: "builtin" is the default, "extn" can cause
problems.
- Usage: --with-vba-package-format="builtin" or
- --with-vba-package-format="extn"
-],,)
+
+ Usage: --with-vba-package-format="builtin" or
+ --with-vba-package-format="extn"
+ ],
+,)
+
+AC_ARG_WITH(theme,
+ AS_HELP_STRING([--with-theme="theme1 theme2..."],
+ [Choose which themes to include. By default those themes with an '*' are included.
+ Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, classic, industrial.]),
+,)
+ AC_ARG_WITH(theme,
+ AS_HELP_STRING([--with-theme="theme1 theme2..."],
+ [Choose which themes to include. By default those themes with an '*' are included.
+ Possible choices: *default, *crystal, *hicontrast, *oxygen, *tango, classic, industrial.]),
+ ,)
+
AC_ARG_WITH(extension-integration,
-[
- --with-extension-integration It will integrate the builded extensions
- to the installer of the product.
- Please use this switch to include any extension.],
+ AS_HELP_STRING([--with-extension-integration],
+ [It will integrate the builded extensions to the installer of the product.
+ Please use this switch to include any extension.]),
,)
AC_ARG_WITH(helppack-integration,
diff --cc scp2/source/extensions/file_extensions.scp
index 53f563a,c61a924..88ce7de
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@@ -304,29 -304,6 +304,31 @@@ File gid_File_Optional_Extensions_Sun_T
UnixRights = 444;
End
+/* script providers */
+
+File gid_File_Oxt_Script_Provider_For_Beanshell
+ TXT_FILE_BODY;
+ Styles = (PACKED, ARCHIVE);
+ Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell;
+ Name = "script-provider-for-beanshell.oxt";
+End
+
+File gid_File_Oxt_Script_Provider_For_Javascript
+ TXT_FILE_BODY;
+ Styles = (PACKED, ARCHIVE);
+ Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript;
+ Name = "script-provider-for-javascript.oxt";
+End
+
+File gid_File_Oxt_Script_Provider_For_Python
+ TXT_FILE_BODY;
+ Styles = (PACKED, ARCHIVE);
+ Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Python;
+ Name = "script-provider-for-python.oxt";
+End
+
+#endif
+
#endif
+
+ #endif
diff --cc solenv/bin/modules/installer/helppack.pm
index e12e2da,21d2f04..887e833
--- a/solenv/bin/modules/installer/helppack.pm
+++ b/solenv/bin/modules/installer/helppack.pm
@@@ -50,40 -50,41 +50,76 @@@ sub select_help_item
{
my $oneitem = ${$itemsref}[$i];
++<<<<<<< HEAD
+ my $ismultilingual = $oneitem->{'ismultilingual'};
+
+ if (!($ismultilingual))
++=======
+ my $styles = "";
+ if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
+
+ if (( $styles =~ /\bHELPPACK\b/ ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
++>>>>>>> libreoffice-3.3.0.2
{
# Files with style "HELPPACK" and "FORCEHELPPACK" also have to be included into the help pack.
# Files with style "HELPPACK" are only included into help packs.
# Files with style "FORCEHELPPACK" are included into help packs and non help packs. They are
# forced, because otherwise they not not be included into helppacks.
++<<<<<<< HEAD
+
+ my $styles = "";
+ if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
+
+ if (( $styles =~ /\bHELPPACK\b/ ) || ( $styles =~ /\bFORCEHELPPACK\b/ )) { push(@itemsarray, $oneitem); }
+
+ next; # single language files are not included into help pack
+ }
+
+ if (0) {
+ my $specificlanguage = "";
+ if ( $oneitem->{'specificlanguage'} ) { $specificlanguage = $oneitem->{'specificlanguage'}; }
+
+ for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ ) # iterating over all languages
+ {
+ my $onelanguage = ${$languagesarrayref}[$j];
+ my $locallang = $onelanguage;
+ $locallang =~ s/-/_/;
+
+ if ( $specificlanguage eq $onelanguage )
+ {
+ push(@itemsarray, $oneitem);
+ }
+ }
+ }
+ }
++=======
+
+ my $ismultilingual = $oneitem->{'ismultilingual'};
+
+ if ($ismultilingual)
+ {
+ my $specificlanguage = "";
+ if ( $oneitem->{'specificlanguage'} ) { $specificlanguage = $oneitem->{'specificlanguage'}; }
+
+ for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ ) # iterating over all languages
+ {
+ my $onelanguage = ${$languagesarrayref}[$j];
+ my $locallang = $onelanguage;
+ $locallang =~ s/-/_/;
+
+ if ( $specificlanguage eq $onelanguage )
+ {
+ push(@itemsarray, $oneitem);
+ }
+ }
+ }
+ else
+ {
+ push(@itemsarray, $oneitem);
+ }
+ }
+ }
++>>>>>>> libreoffice-3.3.0.2
return \@itemsarray;
}
@@@ -490,7 -491,7 +526,11 @@@ sub build_installer_for_helppac
# find and read english license file
my $licenselanguage = "en-US"; # always english !
++<<<<<<< HEAD
+ my $licensefilename = "LICENSE_" . $licenselanguage;
++=======
+ my $licensefilename = "LICENSE"; # _" . $licenselanguage;
++>>>>>>> libreoffice-3.3.0.2
my $licenseincludepatharrayref = installer::worker::get_language_specific_include_pathes($includepatharrayref, $licenselanguage);
my $licenseref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, $licenseincludepatharrayref, 0);
diff --cc solenv/bin/modules/installer/windows/directory.pm
index 5dbad84,7a5b79a..ec56df2
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@@ -309,9 -311,18 +310,9 @@@ sub add_root_directorie
{
my ($directorytableref, $allvariableshashref) = @_;
-# my $sourcediraddon = "";
-# if (($installer::globals::addchildprojects) ||
-# ($installer::globals::patch) ||
-# ($installer::globals::languagepack) ||
-# ($allvariableshashref->{'CHANGETARGETDIR'}))
-# {
-# $sourcediraddon = "\:\.";
-# }
-
my $oneline = "";
- if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
+ if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
{
my $productname = $allvariableshashref->{'PRODUCTNAME'};
my $productversion = $allvariableshashref->{'PRODUCTVERSION'};
diff --cc solenv/bin/modules/installer/windows/property.pm
index 015ac0d,3c04a03..a1619cc
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@@ -180,9 -181,15 +181,14 @@@ sub get_productname_for_property_table(
if ( $installer::globals::languagepack )
{
- # my $langstring = get_language_string(); # Example (English, Deutsch)
- my $langstring = get_english_language_string(); # New: (English, German)
+ my $langstring = get_english_language_string(); # Example: (English, German)
$productname = $name . " " . $version . " Language Pack" . " " . $langstring;
}
+ elsif ( $installer::globals::helppack )
+ {
+ my $langstring = get_english_language_string(); # New: (English, German)
+ $productname = $name . " " . $version . " Help Pack" . " " . $langstring;
+ }
if ( $installer::globals::patch )
{
commit b4bcd413f91091ddba30d63473a287a5e7424aa3
Author: Petr Mladek <pmladek at suse.cz>
Date: Sat Dec 18 20:35:15 2010 +0100
Version 3.3.0.2, tag libreoffice-3.3.0.2 (3.3-rc2)
commit dea282e313ea919c1d1e08b90e860357f9d280ea
Author: Petr Mladek <pmladek at suse.cz>
Date: Sat Dec 18 15:20:18 2010 +0100
bump SHORT_PRODUCTEXTENSION to rc2 and widnows build version to 4
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index c3fecd1..dccd310 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -57,7 +57,7 @@ LibreOffice
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -126,7 +126,7 @@ LibreOffice_wJRE
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3
@@ -191,7 +191,7 @@ LibreOffice_Dev
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION
@@ -269,7 +269,7 @@ URE
PRODUCTEXTENSION
BRANDPACKAGEVERSION 3
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
LICENSENAME LGPL
SERVICESPROJEKT 1
SETSTATICPATH 1
@@ -310,7 +310,7 @@ LibreOffice_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3
@@ -355,7 +355,7 @@ LibreOffice_Dev_SDK
PRODUCTVERSION 3.3
PRODUCTEXTENSION
LONG_PRODUCTEXTENSION
- SHORT_PRODUCTEXTENSION rc1
+ SHORT_PRODUCTEXTENSION rc2
BASISROOTNAME LibO-dev
UNIXBASISROOTNAME lo-dev
POSTVERSIONEXTENSION SDK
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index c688f69..88bd80c 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
RSCVERSION=330
-RSCREVISION=330m18(Build:3)
-BUILD=3
+RSCREVISION=330m18(Build:4)
+BUILD=4
LAST_MINOR=m18
SOURCEVERSION=OOO330
commit 87f772f7e881b3f8c9f8bbc0f4f948b6195579bc
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Sat Dec 18 00:41:26 2010 +0100
don't try to be smart, just hardcode one of the help files
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 8f4e0c5..1f9a299 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -419,7 +419,7 @@ BEGIN
$cab_file_per_component = 0;
$cabfilecompressionlevel = 7;
$number_of_cabfiles = 1; # only for $fix_number_of_cab_files = 1
- $include_cab_in_msi = 1;
+ $include_cab_in_msi = 0;
$use_packages_for_cabs = 0;
$msidatabasename = "";
$prepare_winpatch = 0;
diff --git a/solenv/bin/modules/installer/windows/createfolder.pm b/solenv/bin/modules/installer/windows/createfolder.pm
index f8d7600..ac2d517 100644
--- a/solenv/bin/modules/installer/windows/createfolder.pm
+++ b/solenv/bin/modules/installer/windows/createfolder.pm
@@ -75,57 +75,6 @@ sub get_languagepack_file
}
##############################################################
-# Searching the correct file for help pack directories.
-##############################################################
-
-sub get_helppack_file
-{
- my ($filesref, $onedir) = @_;
-
- my $language = $onedir->{'specificlanguage'};
- my $foundfile = 0;
- my $onefile = "";
-
- for ( my $i = 0; $i <= $#{$filesref}; $i++ )
- {
- last if ($foundfile);
-
- $onefile = ${$filesref}[$i];
-
- my $styles = "";
- if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
-
- # we need a file with the HELPPACK flag
- if (( $styles =~ /\bHELPPACK\b/ ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
- {
- # chect that the language is correct
- if ($onefile->{'ismultilingual'};)
- {
- my $specificlanguage = "";
- if ( $onefile->{'specificlanguage'} ) { $specificlanguage = $onefile->{'specificlanguage'}; }
-
- for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ ) # iterating over all languages
- {
- my $onelanguage = ${$languagesarrayref}[$j];
- my $locallang = $onelanguage;
- $locallang =~ s/-/_/;
-
- if ( $specificlanguage eq $onelanguage )
- {
- $foundfile = 1;
- last;
- }
- }
- }
- }
- }
-
- if ( ! $foundfile ) { installer::exiter::exit_program("ERROR: No file with correct language found (language pack build)!", "get_languagepack_file"); }
-
- return $onefile;
-}
-
-##############################################################
# Returning component for createfolder table.
##############################################################
@@ -147,7 +96,7 @@ sub get_createfolder_component
my $onefile = "";
if ( $installer::globals::languagepack ) { $onefile = get_languagepack_file($filesref, $onedir); }
- elsif ( $installer::globals::helppack ) { $onefile = get_helppack_file($filesref, $onedir); }
+ elsif ( $installer::globals::helppack ) { $onefile = installer::existence::get_specified_file($filesref, 'gid_File_Help_Common_Zip'); }
else { $onefile = installer::existence::get_specified_file($filesref, $globalfilegid); }
return $onefile->{'componentname'};
commit 5f169d3640b37e548e44f33b4318f46370f25cdf
Author: Petr Mladek <pmladek at novell.com>
Date: Fri Dec 17 23:29:37 2010 +0100
implement searching for helppack file
diff --git a/solenv/bin/modules/installer/windows/createfolder.pm b/solenv/bin/modules/installer/windows/createfolder.pm
index 261131d..f8d7600 100644
--- a/solenv/bin/modules/installer/windows/createfolder.pm
+++ b/solenv/bin/modules/installer/windows/createfolder.pm
@@ -75,6 +75,57 @@ sub get_languagepack_file
}
##############################################################
+# Searching the correct file for help pack directories.
+##############################################################
+
+sub get_helppack_file
+{
+ my ($filesref, $onedir) = @_;
+
+ my $language = $onedir->{'specificlanguage'};
+ my $foundfile = 0;
+ my $onefile = "";
+
+ for ( my $i = 0; $i <= $#{$filesref}; $i++ )
+ {
+ last if ($foundfile);
+
+ $onefile = ${$filesref}[$i];
+
+ my $styles = "";
+ if ( $onefile->{'Styles'} ) { $styles = $onefile->{'Styles'}; }
+
+ # we need a file with the HELPPACK flag
+ if (( $styles =~ /\bHELPPACK\b/ ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
+ {
+ # chect that the language is correct
+ if ($onefile->{'ismultilingual'};)
+ {
+ my $specificlanguage = "";
+ if ( $onefile->{'specificlanguage'} ) { $specificlanguage = $onefile->{'specificlanguage'}; }
+
+ for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ ) # iterating over all languages
+ {
+ my $onelanguage = ${$languagesarrayref}[$j];
+ my $locallang = $onelanguage;
+ $locallang =~ s/-/_/;
+
+ if ( $specificlanguage eq $onelanguage )
+ {
+ $foundfile = 1;
+ last;
+ }
+ }
+ }
+ }
+ }
+
+ if ( ! $foundfile ) { installer::exiter::exit_program("ERROR: No file with correct language found (language pack build)!", "get_languagepack_file"); }
+
+ return $onefile;
+}
+
+##############################################################
# Returning component for createfolder table.
##############################################################
@@ -96,7 +147,7 @@ sub get_createfolder_component
my $onefile = "";
if ( $installer::globals::languagepack ) { $onefile = get_languagepack_file($filesref, $onedir); }
- elsif ( $installer::globals::helppack ) { $onefile = installer::existence::get_specified_file($filesref, 'gid_File_Help_Help_Zip'); }
+ elsif ( $installer::globals::helppack ) { $onefile = get_helppack_file($filesref, $onedir); }
else { $onefile = installer::existence::get_specified_file($filesref, $globalfilegid); }
return $onefile->{'componentname'};
commit e03a4dcfcb69742beee316a48ce4cdd6df47ea93
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Dec 17 23:09:16 2010 +0100
Integrate help by default
diff --git a/configure.in b/configure.in
index 37514b5..266f7e3 100644
--- a/configure.in
+++ b/configure.in
@@ -512,9 +512,9 @@ AC_ARG_WITH(extension-integration,
AC_ARG_WITH(helppack-integration,
[
- --with-helppack-integration It will integrate the helppacks to the installer
+ --without-helppack-integration It will not integrate the helppacks to the installer
of the product.
- Please use this switch to include any helppack.],
+ Please use this switch to use the online help or separate help packages.],
,)
AC_ARG_WITH(fonts,
@@ -7127,7 +7127,7 @@ 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
+if test "z$with_helppack_integration" = "zno" ; then
WITH_HELPPACK_INTEGRATION=NO
AC_MSG_RESULT([no integration])
else
commit 158b9d54c591d7692e0637e5dc28d6f3dcdd48d0
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Dec 17 23:02:35 2010 +0100
create rpm/deb/win/mac help pack automatically when enabled
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index b196a8f..31630d5 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -85,9 +85,9 @@ ALLTAR : $(LOCALPYFILES)
.ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
.IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack
+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack ooohelppack
.ELSE
-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack sdkoo_en-US ure_en-US
+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack ooohelppack sdkoo_en-US ure_en-US
.ENDIF
.ELSE # "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
ALLTAR : updatepack
commit 21df2e7fd74c403cd610f38111e06810c7b970d3
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Dec 17 22:44:19 2010 +0100
make some useful options permanent in the globals.pm
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 6241128..8f4e0c5 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -417,9 +417,9 @@ BEGIN
$one_cab_file = 0;
$fix_number_of_cab_files = 1;
$cab_file_per_component = 0;
- $cabfilecompressionlevel = 2;
+ $cabfilecompressionlevel = 7;
$number_of_cabfiles = 1; # only for $fix_number_of_cab_files = 1
- $include_cab_in_msi = 0;
+ $include_cab_in_msi = 1;
$use_packages_for_cabs = 0;
$msidatabasename = "";
$prepare_winpatch = 0;
commit e57c579430c07f31b0c02230c14b325b91cee1fc
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Dec 17 22:25:39 2010 +0100
fix a typo
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index d644e97..05bc77a 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -664,7 +664,7 @@ sub get_install_type
}
elsif ( $installer::globals::helppack )
{
- $type = "langpack";
+ $type = "helppack";
if ( $installer::globals::isrpmbuild )
{
commit 62e1be8d60c4e44aec7a7f92f6e249873171f223
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Dec 17 20:27:35 2010 +0000
another 4x faster - down to ~2 seconds now for me.
diff --git a/solenv/bin/modules/pre2par/language.pm b/solenv/bin/modules/pre2par/language.pm
index bc02064..56162a8 100644
--- a/solenv/bin/modules/pre2par/language.pm
+++ b/solenv/bin/modules/pre2par/language.pm
@@ -27,6 +27,7 @@
package pre2par::language;
+use strict;
use pre2par::existence;
##############################################################
@@ -71,39 +72,6 @@ sub get_language_string_from_language_block
return $newstring;
}
-##############################################################
-# Returning the complete block in all languages
-# for a specified string
-##############################################################
-
-sub get_language_block_from_language_file
-{
- my ($searchstring, $langfile) = @_;
-
- my @language_block = ();
-
- for ( my $i = 0; $i <= $#{$langfile}; $i++ )
- {
- if ( ${$langfile}[$i] =~ /^\s*\[\s*$searchstring\s*\]\s*$/ )
- {
- my $counter = $i;
-
- push(@language_block, ${$langfile}[$counter]);
- $counter++;
-
- while (( $counter <= $#{$langfile} ) && (!( ${$langfile}[$counter] =~ /^\s*\[/ )))
- {
- push(@language_block, ${$langfile}[$counter]);
- $counter++;
- }
-
- last;
- }
- }
-
- return \@language_block;
-}
-
############################################
# collecting all replace variables
# in a language file
@@ -119,7 +87,20 @@ sub get_all_replace_variables
{
if ( ${$langfile}[$i] =~ /^\s*\[\s*(.*?)\s*\]\s*$/ )
{
- $allvars{$1} = 1;
+ my $variable = $1;
+# print "lang block '$variable'\n";
+ my @lang_block = ();
+ my $counter;
+
+ # Store the complete block in all languages for a specified variable
+ for ( $counter = $i + 1; $counter <= $#{$langfile}; $counter++ ) {
+ my $line = ${$langfile}[$counter];
+ last if ($line =~ /^s*\[/); # next decl.
+ push @lang_block, $line;
+ }
+# print "$variable = '@lang_block'\n";
+ $allvars{$variable} = \@lang_block;
+ $i = $counter - 1;
}
}
@@ -151,9 +132,8 @@ sub localize
# print "line '$oneline' split to '$language' '$variable'\n";
if (defined $replace_hash->{$variable}) {
- my $languageblock = get_language_block_from_language_file($variable, $langfile);
- my $newstring = get_language_string_from_language_block($languageblock, $language);
-
+ my $languageblock = $replace_hash->{$variable};
+ my $newstring = get_language_string_from_language_block($replace_hash->{$variable}, $language);
if ( $newstring eq "" ) { $newstring = "\"" . $variable . "\""; }
$oneline =~ s/$variable/$newstring/g;
commit 319866daf1d2eb51947db03e04bea388b181745c
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Dec 17 20:04:29 2010 +0000
make pre2par 5x faster, and simpler too
diff --git a/solenv/bin/modules/pre2par/language.pm b/solenv/bin/modules/pre2par/language.pm
index 62d96f9..bc02064 100644
--- a/solenv/bin/modules/pre2par/language.pm
+++ b/solenv/bin/modules/pre2par/language.pm
@@ -105,29 +105,25 @@ sub get_language_block_from_language_file
}
############################################
-# collecting all replace strings
+# collecting all replace variables
# in a language file
############################################
-sub get_all_replace_strings
+sub get_all_replace_variables
{
my ($langfile) = @_;
- my @allstrings = ();
-
+ my %allvars = ();
+
for ( my $i = 0; $i <= $#{$langfile}; $i++ )
- {
+ {
if ( ${$langfile}[$i] =~ /^\s*\[\s*(.*?)\s*\]\s*$/ )
{
- my $replacestring = $1;
- if (! pre2par::existence::exists_in_array($replacestring, \@allstrings))
- {
- push(@allstrings, $replacestring);
- }
+ $allvars{$1} = 1;
}
}
-
- return \@allstrings;
+
+ return \%allvars;
}
############################################
@@ -139,34 +135,33 @@ sub localize
{
my ($parfile, $langfile) = @_;
- my $allreplacestrings = get_all_replace_strings($langfile);
-
+ my $replace_hash = get_all_replace_variables($langfile);
+
+ # parse lines of the form Name (st) = STR_NAME_MODULE_HELPPACK_OC;
+ # for variable substitution
+ my $langlinere = qr/^\s*\w+\s*\(([\w-]+)\)\s*\=\s*([\w-]+)\s*;/;
for ( my $i = 0; $i <= $#{$parfile}; $i++ )
{
my $oneline = ${$parfile}[$i];
- for ( my $j = 0; $j <= $#{$allreplacestrings}; $j++ )
- {
- if ( $oneline =~ /\b${$allreplacestrings}[$j]\b/ ) # Not for basic scripts
- {
- my $oldstring = ${$allreplacestrings}[$j];
-
- if ( $oneline =~ /^\s*\w+\s*\(([\w-]+)\)\s*\=/ )
- {
- my $language = $1; # can be "01" or "en" or "en-US" or ...
-
- my $languageblock = get_language_block_from_language_file($oldstring, $langfile);
+ if ( $oneline =~ $langlinere) {
+ my $language = $1; # can be "01" or "en" or "en-US" or ...
+ my $variable = $2;
+
+# print "line '$oneline' split to '$language' '$variable'\n";
+
+ if (defined $replace_hash->{$variable}) {
+ my $languageblock = get_language_block_from_language_file($variable, $langfile);
my $newstring = get_language_string_from_language_block($languageblock, $language);
- if ( $newstring eq "" ) { $newstring = "\"" . $oldstring . "\""; }
-
- $oneline =~ s/$oldstring/$newstring/g;
-
+ if ( $newstring eq "" ) { $newstring = "\"" . $variable . "\""; }
+
+ $oneline =~ s/$variable/$newstring/g;
+
${$parfile}[$i] = $oneline;
}
- }
}
- }
+ }
}
1;
commit 10dc69bcfa0e782812834b2b79f4978a7d6b5a42
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Dec 17 21:56:56 2010 +0100
helpxsl stuff belongs to the main package and not help packs
these are the 3 files shared between all help localizations
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index f4dd7e6..b8624ac 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -406,7 +406,7 @@ End
File gid_File_Help_Help_Zip
Dir = gid_Dir_Help;
- ARCHIVE_TXT_FILE_BODY_HELPPACK;
+ ARCHIVE_TXT_FILE_BODY;
Name = "helpxsl.zip";
End
commit c5f0be40431ca33aed4e89eadbfcea095730efcd
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date: Fri Dec 17 21:07:53 2010 +0100
more langpacks installer hacks ported for helppacks
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index a4b57e5..dae71a6 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -491,6 +491,7 @@ if (( ! $allvariableshashref->{'XPDINSTALLER'} ) || ( ! $installer::globals::isx
}
if ( $installer::globals::languagepack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
+if ( $installer::globals::helppack ) { installer::scriptitems::use_langpack_copy_scpaction($scpactionsinproductarrayref); }
if ( $installer::globals::patch ) { installer::scriptitems::use_patch_copy_scpaction($scpactionsinproductarrayref); }
if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productscpactions1b.log", $scpactionsinproductarrayref); }
@@ -830,7 +831,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles10c.log", $filesinproductlanguageresolvedarrayref); }
}
-
if ( ! $allvariableshashref->{'NO_README_IN_ROOTDIR'} )
{
$filesinproductlanguageresolvedarrayref = installer::scriptitems::add_License_Files_into_Installdir($filesinproductlanguageresolvedarrayref, $dirsinproductlanguageresolvedarrayref, $languagesarrayref);
@@ -1857,6 +1857,9 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
# Creating installation set for Unix language packs, that are not part of multi lingual installation sets
if ( ( $installer::globals::languagepack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::languagepack::build_installer_for_languagepack($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
+ # Creating installation set for Unix help packs, that are not part of multi lingual installation sets
+ if ( ( $installer::globals::helppack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::helppack::build_installer_for_helppack($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
+
# Finalizing patch installation sets
if (( $installer::globals::patch ) && ( $installer::globals::issolarispkgbuild )) { installer::epmfile::finalize_patch($installer::globals::epmoutpath, $allvariableshashref); }
if (( $installer::globals::patch ) && ( $installer::globals::isrpmbuild )) { installer::epmfile::finalize_linux_patch($installer::globals::epmoutpath, $allvariableshashref, $includepatharrayref); }
@@ -1895,6 +1898,9 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
# Creating installation set for Unix language packs, that are not part of multi lingual installation sets
if ( ( $installer::globals::languagepack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::languagepack::build_installer_for_languagepack($newepmdir, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
+ # Creating installation set for Unix help packs, that are not part of multi lingual installation sets
+ if ( ( $installer::globals::helppack ) && ( ! $installer::globals::debian ) && ( ! $installer::globals::makedownload ) ) { installer::helppack::build_installer_for_helpepack($newepmdir, $allvariableshashref, $includepatharrayref, $languagesarrayref, $languagestringref); }
+
chdir($currentdir); # changing back into start directory
}
@@ -2087,7 +2093,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
installer::windows::upgrade::create_upgrade_table($newidtdir, $allvariableshashref);
- if ( ! $installer::globals::languagepack ) # the following tables not for language packs
+ if (( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack )) # the following tables not for language packs or help packs
{
installer::windows::removefile::create_removefile_table($folderitemsinproductlanguageresolvedarrayref, $newidtdir);
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 073516e..d644e97 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -420,6 +420,7 @@ sub get_installation_type
my $type = "";
if ( $installer::globals::languagepack ) { $type = "langpack"; }
+ elsif ( $installer::globals::helppack ) { $type = "helppack"; }
else { $type = "install"; }
return $type;
@@ -650,6 +651,25 @@ sub get_install_type
{
$type = $type . "-rpm";
}
+
+ if ( $installer::globals::isdebbuild )
+ {
+ $type = $type . "-deb";
+ }
+
+ if ( $installer::globals::packageformat eq "archive" )
+ {
+ $type = $type . "-arc";
+ }
+ }
+ elsif ( $installer::globals::helppack )
+ {
+ $type = "langpack";
+
+ if ( $installer::globals::isrpmbuild )
+ {
+ $type = $type . "-rpm";
+ }
if ( $installer::globals::isdebbuild )
{
@@ -1025,7 +1045,7 @@ sub put_windows_productpath_into_template
if (length($locallangs) > $installer::globals::max_lang_length) { $locallangs = "multi lingual"; }
- if ( ! $installer::globals::languagepack ) { $productpath = $productpath . " (" . sprintf('%x', time()) . ")"; }
+ if ( ! $installer::globals::languagepack || ! $installer::globals::helppack ) { $productpath = $productpath . " (" . sprintf('%x', time()) . ")"; }
replace_one_variable($templatefile, "PRODUCTPATHPLACEHOLDER", $productpath);
}
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 946d225..17ae44a 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -402,7 +402,8 @@ sub create_epm_header
$readmefilenameen = "README_en-US";
}
- if (( $installer::globals::languagepack ) # in language packs the files LICENSE and README are removed, because they are not language specific
+ if (( $installer::globals::languagepack ) # in language packs and help packs the files LICENSE and README are removed, because they are not language specific
+ || ( $installer::globals::helppack )
|| ( $variableshashref->{'NO_README_IN_ROOTDIR'} ))
{
if ( $installer::globals::iswindowsbuild )
diff --git a/solenv/bin/modules/installer/followme.pm b/solenv/bin/modules/installer/followme.pm
index 19a0d6e..c3f9214 100644
--- a/solenv/bin/modules/installer/followme.pm
+++ b/solenv/bin/modules/installer/followme.pm
@@ -87,6 +87,7 @@ sub save_followme_info
push(@filecontent, "globals:product: $installer::globals::product\n");
push(@filecontent, "globals:patch: $installer::globals::patch\n");
push(@filecontent, "globals:languagepack: $installer::globals::languagepack\n");
+ push(@filecontent, "globals:helppack: $installer::globals::helppack\n");
push(@filecontent, "globals:installertypedir: $installer::globals::installertypedir\n");
push(@filecontent, "globals:max_lang_length: $installer::globals::max_lang_length\n");
push(@filecontent, "globals:compiler: $installer::globals::compiler\n");
@@ -189,6 +190,7 @@ sub read_followme_info
if ( $name eq "product" ) { $installer::globals::product = $value; }
if ( $name eq "patch" ) { $installer::globals::patch = $value; }
if ( $name eq "languagepack" ) { $installer::globals::languagepack = $value; }
+ if ( $name eq "helppack" ) { $installer::globals::helppack = $value; }
if ( $name eq "installertypedir" ) { $installer::globals::installertypedir = $value; }
if ( $name eq "max_lang_length" ) { $installer::globals::max_lang_length = $value; }
if ( $name eq "compiler" ) { $installer::globals::compiler = $value; }
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index eed57a1..254813c 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1226,6 +1226,7 @@ sub get_Source_Directory_For_Files_From_Includepathlist
if (( $styles =~ /\bSTARREGISTRY\b/ ) || ( $styles =~ /\bFILE_CAN_MISS\b/ )) { $file_can_miss = 1; }
if (( $installer::globals::languagepack ) && ( ! $onefile->{'ismultilingual'} ) && ( ! ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))) { $file_can_miss = 1; }
+ if (( $installer::globals::helppack ) && ( ! $onefile->{'ismultilingual'} ) && ( ! ( $styles =~ /\bFORCEHELPPACK\b/ ))) { $file_can_miss = 1; }
my $sourcepathref = "";
@@ -1367,7 +1368,7 @@ sub remove_Files_Without_Sourcedirectory
next; # removing this file from list, if sourcepath is empty
}
- else # special case for language packs
+ elsif ( $installer::globals::languagepack ) # special case for language packs
{
if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
{
@@ -1389,6 +1390,28 @@ sub remove_Files_Without_Sourcedirectory
next; # removing this file from list, if sourcepath is empty
}
}
+ else # special case for help packs
+ {
+ if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
+ {
+ $infoline = "ERROR: Removing file $filename from file list.\n";
+ push( @installer::globals::logfileinfo, $infoline);
+
+ push(@missingfiles, "ERROR: File not found: $filename\n");
+ $error_occured = 1;
+
+ next; # removing this file from list, if sourcepath is empty
+ }
+ else
+ {
+ $infoline = "INFO: Removing file $filename from file list. It is not language dependent.\n";
+ push( @installer::globals::logfileinfo, $infoline);
+ $infoline = "INFO: It is not language dependent and can be ignored in help packs.\n";
+ push( @installer::globals::logfileinfo, $infoline);
+
+ next; # removing this file from list, if sourcepath is empty
+ }
+ }
}
}
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index fe89bd0..af7921f 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -111,6 +111,13 @@ sub register_extensions
push( @installer::globals::logfileinfo, $infoline);
}
+ if (( $installer::globals::helppack ) && ( ! -f $unopkgfile ))
+ {
+ $unopkgexists = 0;
+ $infoline = "Help packs do not contain unopkg!\n";
+ push( @installer::globals::logfileinfo, $infoline);
+ }
+
if ( ! -f $unopkgfile )
{
$unopkgexists = 0;
@@ -424,10 +431,11 @@ sub create_package
my $localtempdir = $tempdir;
- if (( $installer::globals::languagepack ) || ( $installer::globals::patch ))
+ if (( $installer::globals::languagepack ) || ( $installer::globals::helppack ) || ( $installer::globals::patch ))
{
$localtempdir = "$tempdir/$packagename";
if ( $installer::globals::languagepack ) { $volume_name = "$volume_name Language Pack"; }
+ if ( $installer::globals::helppack ) { $volume_name = "$volume_name Help Pack"; }
if ( $installer::globals::patch ) { $volume_name = "$volume_name Patch"; }
# Create tar ball named tarball.tar.bz2
@@ -472,6 +480,7 @@ sub create_package
my $scriptrealfilename = "osx_install.applescript";
my $scriptfilename = "";
if ( $installer::globals::languagepack ) { $scriptfilename = "osx_install_languagepack.applescript"; }
+ if ( $installer::globals::helppack ) { $scriptfilename = "osx_install_helppack.applescript"; }
if ( $installer::globals::patch ) { $scriptfilename = "osx_install_patch.applescript"; }
my $scripthelpersolverfilename = "mac_install.script";
my $scripthelperrealfilename = $volume_name;
@@ -616,6 +625,7 @@ sub create_simple_package
{
$downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "downloadname");
if ( $installer::globals::languagepack ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "langpackdownloadname"); }
+ if ( $installer::globals::helppack ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "helppackdownloadname"); }
if ( $installer::globals::patch ) { $downloadname = installer::ziplist::getinfofromziplist($allsettingsarrayref, "patchdownloadname"); }
$packagename = installer::download::resolve_variables_in_downloadname($allvariables, $$downloadname, \$locallanguage);
}
diff --git a/solenv/bin/modules/installer/windows/createfolder.pm b/solenv/bin/modules/installer/windows/createfolder.pm
index 001ad24..261131d 100644
--- a/solenv/bin/modules/installer/windows/createfolder.pm
+++ b/solenv/bin/modules/installer/windows/createfolder.pm
@@ -122,8 +122,8 @@ sub create_createfolder_table
{
my $onedir = ${$dirref}[$i];
- # language packs get only language dependent directories
- if (( $installer::globals::languagepack ) && ( $onedir->{'specificlanguage'} eq "" )) { next };
+ # language packs and help packs get only language dependent directories
+ if (( $installer::globals::languagepack ) || ( $installer::globals::languagepack ) && ( $onedir->{'specificlanguage'} eq "" )) { next };
my $styles = "";
@@ -151,4 +151,4 @@ sub create_createfolder_table
}
-1;
\ No newline at end of file
+1;
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index c835b1e..7a5b79a 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -160,6 +160,7 @@ sub check_sourcedir_addon
if (($installer::globals::addchildprojects) ||
($installer::globals::patch) ||
($installer::globals::languagepack) ||
+ ($installer::globals::helppack) ||
($allvariableshashref->{'CHANGETARGETDIR'}))
{
my $sourcediraddon = "\:\.";
@@ -321,7 +322,7 @@ sub add_root_directories
my $oneline = "";
- if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
+ if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} ))
{
my $productname = $allvariableshashref->{'PRODUCTNAME'};
my $productversion = $allvariableshashref->{'PRODUCTVERSION'};
diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index c688474..94987aa 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -120,8 +120,8 @@ sub get_feature_display
# Special handling for c05office. No program module visible.
if (( $onefeature->{'gid'} eq "gid_Module_Prg" ) && ( $installer::globals::product =~ /c05office/i )) { $display = "0"; }
- # making all feature invisible in Language packs!
- if ( $installer::globals::languagepack ) { $display = "0"; }
+ # making all feature invisible in Language packs and in Help packs!
+ if ( $installer::globals::languagepack || $installer::globals::helppack ) { $display = "0"; }
return $display
}
diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm b/solenv/bin/modules/installer/windows/mergemodule.pm
index 4194164..fb1a3bb 100755
--- a/solenv/bin/modules/installer/windows/mergemodule.pm
+++ b/solenv/bin/modules/installer/windows/mergemodule.pm
@@ -51,7 +51,7 @@ sub merge_mergemodules_into_msi_database
my ($mergemodules, $filesref, $msifilename, $languagestringref, $language, $languagefile, $allvariables, $includepatharrayref, $allupdatesequences, $allupdatelastsequences, $allupdatediskids) = @_;
my $domerge = 0;
- if (( $#{$mergemodules} > -1 ) && ( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack )) { $domerge = 1; }
+ if (( $#{$mergemodules} > -1 ) && ( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack )) { $domerge = 1; }
if ( $domerge )
{
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index e4e5494..89d3012 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -706,7 +706,7 @@ sub change_patchmetadata_table
my $descriptionvalue = "";
my $base = $allvariables->{'PRODUCTNAME'} . " " . $allvariables->{'PRODUCTVERSION'};
- if ( $installer::globals::languagepack ) { $base = $targetproductnamevalue; }
+ if ( $installer::globals::languagepack || $installer::globals::helppack ) { $base = $targetproductnamevalue; }
my $windowspatchlevel = 0;
if ( $allvariables->{'WINDOWSPATCHLEVEL'} ) { $windowspatchlevel = $allvariables->{'WINDOWSPATCHLEVEL'}; }
@@ -985,6 +985,7 @@ sub correct_patch
my $localproduct = $installer::globals::product;
if ( $installer::globals::languagepack ) { $localproduct = $localproduct . "LanguagePack"; }
+ elsif ( $installer::globals::helppack ) { $localproduct = $localproduct . "HelpPack"; }
if ( $product eq $localproduct ) { $product_is_good = 1; }
@@ -1211,6 +1212,7 @@ sub create_msp_patch
my $pcpfilename = $allvariables->{'PCPFILENAME'};
if ( $installer::globals::languagepack ) { $pcpfilename =~ s/.pcp\s*$/languagepack.pcp/; }
+ elsif ( $installer::globals::helppack ) { $pcpfilename =~ s/.pcp\s*$/helppack.pcp/; }
# Searching the pcp file in the include pathes
my $fullpcpfilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$pcpfilename, $includepatharrayref, 1);
@@ -1259,7 +1261,7 @@ sub create_msp_patch
installer::systemactions::copy_complete_directory($oldinstallationsetpath, $mspdir);
# Copying additional patches into the installation set, if required
- if (( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ) && ( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ne "" ) && ( ! $installer::globals::languagepack ))
+ if (( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ) && ( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ne "" ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ))
{
my $filename = $allvariables->{'ADDITIONALREQUIREDPATCHES'};
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 034d82f..3c04a03 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -54,6 +54,7 @@ sub get_arpcomments_for_property_table
}
if ( $installer::globals::languagepack ) { $comment = $comment . " " . "Language Pack"; }
+ elsif ( $installer::globals::helppack ) { $comment = $comment . " " . "Help Pack"; }
if ( $installer::globals::patch )
{
@@ -184,6 +185,11 @@ sub get_productname_for_property_table($$)
my $langstring = get_english_language_string(); # New: (English, German)
$productname = $name . " " . $version . " Language Pack" . " " . $langstring;
}
+ elsif ( $installer::globals::helppack )
+ {
+ my $langstring = get_english_language_string(); # New: (English, German)
+ $productname = $name . " " . $version . " Help Pack" . " " . $langstring;
+ }
if ( $installer::globals::patch )
{
@@ -365,6 +371,11 @@ sub set_important_properties
my $onepropertyline = "ISLANGUAGEPACK" . "\t" . "1" . "\n";
push(@{$propertyfile}, $onepropertyline);
}
+ elsif ( $installer::globals::helppack )
+ {
+ my $onepropertyline = "ISHELPPACK" . "\t" . "1" . "\n";
+ push(@{$propertyfile}, $onepropertyline);
+ }
my $languagesline = "PRODUCTALLLANGUAGES" . "\t" . $$languagestringref . "\n";
push(@{$propertyfile}, $languagesline);
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index 7909975..ba121bd 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -93,6 +93,7 @@ sub get_registry_component_name
$componentname = $componentname . $addon;
if (( $styles =~ /\bLANGUAGEPACK\b/ ) && ( $installer::globals::languagepack )) { $componentname = $componentname . "_lang"; }
+ elsif (( $styles =~ /\bHELPPACK\b/ ) && ( $installer::globals::helppack )) { $componentname = $componentname . "_help"; }
if ( $styles =~ /\bALWAYS_REQUIRED\b/ ) { $componentname = $componentname . "_forced"; }
if ( $isrootmodule ) { $installer::globals::registryrootcomponent = $componentname; }
diff --git a/solenv/bin/modules/installer/windows/update.pm b/solenv/bin/modules/installer/windows/update.pm
index da94171..31e35ac 100644
--- a/solenv/bin/modules/installer/windows/update.pm
+++ b/solenv/bin/modules/installer/windows/update.pm
@@ -215,6 +215,7 @@ sub correct_database
my $localproduct = $installer::globals::product;
if ( $installer::globals::languagepack ) { $localproduct = $localproduct . "LanguagePack"; }
+ elsif ( $installer::globals::helppack ) { $localproduct = $localproduct . "HelpPack"; }
if ( $product eq $localproduct ) { $product_is_good = 1; }
@@ -597,4 +598,4 @@ sub create_database_hashes
}
-1;
\ No newline at end of file
+1;
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm b/solenv/bin/modules/installer/windows/upgrade.pm
index a678896..6904166 100644
--- a/solenv/bin/modules/installer/windows/upgrade.pm
+++ b/solenv/bin/modules/installer/windows/upgrade.pm
@@ -94,7 +94,7 @@ sub create_upgrade_table
# also searching for the beta
- if (( $allvariableshashref->{'BETAUPGRADECODE'} ) && ( ! $installer::globals::languagepack ))
+ if (( $allvariableshashref->{'BETAUPGRADECODE'} ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ))
{
$newline = $allvariableshashref->{'BETAUPGRADECODE'} . "\t" . "1.0" . "\t" . "\t" . "\t" . "1" . "\t" . "\t" . "BETAPRODUCTS" . "\n";
push(@upgradetable, $newline);
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index f4c5398..8496c03 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -827,7 +827,7 @@ sub install_simple ($$$$$$)
{
my $filelist;
my $fname = $installer::globals::destdir . "/$packagename";
- if ($installer::globals::languagepack) { $fname .= ".$languagestring"; }
+ if ($installer::globals::languagepack || $installer::globals::helppack) { $fname .= ".$languagestring"; }
open ($filelist, ">$fname") || die "Can't open $fname: $!";
print $filelist @lines;
close ($filelist);
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index 40f5557..0f76519 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -793,6 +793,7 @@ sub add_variables_to_allvariableshashref
if ( $installer::globals::patch ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::patchaddon; }
elsif ( $installer::globals::languagepack ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::languagepackaddon; }
+ elsif ( $installer::globals::helppack ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::helppackpackaddon; }
else { $variableshashref->{'PRODUCTADDON'} = ""; }
my $localbuild = $installer::globals::build;
commit 75f9558a0c00b1ecc5119e899314c26bf4f3e966
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Dec 17 20:38:17 2010 +0100
find README/LICECENSE file for epm and help packs
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 1260b74..946d225 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -460,6 +460,23 @@ sub create_epm_header
}
}
+ # the readme file need not be packaged more times in the help content
+ # it needs to be installed in parallel with the main package anyway
+ # try to find the README file between all available files (not only between the packaged)
+ if (!($foundreadmefile) && $installer::globals::helppack)
+ {
+ my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$readmefilenameen, "" , 0);
+ if($$fileref ne "" )
+ {
+ $infoline = "Fallback to readme file: \"$$fileref\"!\n";
+ push(@installer::globals::logfileinfo, $infoline);
+
+ $foundreadmefile = 1;
+ $line = "%readme" . " " . $$fileref . "\n";
+ push(@epmheader, $line);
+ }
+ }
+
# searching for and license file
if ( $license_in_package_defined )
@@ -515,11 +532,12 @@ sub create_epm_header
last;
}
}
- if (!($foundlicensefile) && $installer::globals::languagepack)
+
+ # the license file need not be packaged more times in the langpacks
+ # they need to be installed in parallel with the main package anyway
+ # try to find the LICENSE file between all available files (not only between the packaged)
+ if (!($foundlicensefile) && ($installer::globals::languagepack || $installer::globals::helppack))
{
- # the license file need not be packaged more times in the langpacks
- # they need to be installed in parallel with the main package anyway
- # try to find the LICENSE file between all available files (not only between the packaged)
my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, "" , 0);
if($$fileref ne "" )
{
commit 515f5254bffe8a0580f3d92941977766f4e6da4c
Author: Rene Engelhard <rene at debian.org>
Date: Fri Dec 17 20:04:07 2010 +0100
actually add WITH_HELPPACK_INTEGRATION to set_soenv.in
diff --git a/set_soenv.in b/set_soenv.in
index 9c3f271..6e51c4f 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1690,6 +1690,7 @@ ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
ToFile( "ENABLE_UNIX_QUICKSTARTER", "@ENABLE_UNIX_QUICKSTARTER@", "e" );
ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
ToFile( "WITH_THEMES", "@WITH_THEMES@", "e");
+ToFile( "WITH_HELPPACK_INTEGRATION", "@WITH_HELPPACK_INTEGRATION@", "e");
ToFile( "WITH_EXTENSION_INTEGRATION", "@WITH_EXTENSION_INTEGRATION@", "e");
ToFile( "OOO_JUNIT_JAR", "@OOO_JUNIT_JAR@", "e" );
ToFile( "SAC_JAR", "@SAC_JAR@", "e" );
commit d148479bd52a6a9e196c41189c0f17092f556634
Author: Rene Engelhard <rene at debian.org>
Date: Fri Dec 17 20:03:34 2010 +0100
s/HELLPACK/HELPPACK/
diff --git a/configure.in b/configure.in
index 59524a7..37514b5 100644
--- a/configure.in
+++ b/configure.in
@@ -7132,7 +7132,7 @@ if test "z$with_helppack_integration" = "z" -o "z$with_helppack_integration" = "
AC_MSG_RESULT([no integration])
else
WITH_HELPPACK_INTEGRATION=YES
- SCPDEFS="$SCPDEFS -DWITH_HELLPACK_INTEGRATION"
+ SCPDEFS="$SCPDEFS -DWITH_HELPPACK_INTEGRATION"
AC_MSG_RESULT([integration])
fi
AC_SUBST(WITH_HELPPACK_INTEGRATION)
commit 20e7e141083eef83b81af3cdd77145cea3627e84
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Dec 17 19:39:04 2010 +0100
fix some help install flags
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index b8624ac..f4dd7e6 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -406,7 +406,7 @@ End
File gid_File_Help_Help_Zip
Dir = gid_Dir_Help;
- ARCHIVE_TXT_FILE_BODY;
+ ARCHIVE_TXT_FILE_BODY_HELPPACK;
Name = "helpxsl.zip";
End
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
index b3ac387..74a9dc3 100644
--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@@ -35,7 +35,7 @@ Directory gid_Dir_Brand_Root
#else
HostName = ".";
#endif
- Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION);
+ Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION,CREATE);
End
#endif
commit 82a9306f889f0e735bdb873e583edda856b9c7a9
Author: Petr Mladek <pmladek at suse.cz>
Date: Fri Dec 17 19:24:55 2010 +0100
do not ingnore language specific help files
diff --git a/solenv/bin/modules/installer/helppack.pm b/solenv/bin/modules/installer/helppack.pm
index 17fcdad..21d2f04 100644
--- a/solenv/bin/modules/installer/helppack.pm
+++ b/solenv/bin/modules/installer/helppack.pm
@@ -50,40 +50,41 @@ sub select_help_items
{
my $oneitem = ${$itemsref}[$i];
- my $ismultilingual = $oneitem->{'ismultilingual'};
-
- if (!($ismultilingual))
+ my $styles = "";
+ if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
+
+ if (( $styles =~ /\bHELPPACK\b/ ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
{
# Files with style "HELPPACK" and "FORCEHELPPACK" also have to be included into the help pack.
# Files with style "HELPPACK" are only included into help packs.
# Files with style "FORCEHELPPACK" are included into help packs and non help packs. They are
# forced, because otherwise they not not be included into helppacks.
-
- my $styles = "";
- if ( $oneitem->{'Styles'} ) { $styles = $oneitem->{'Styles'}; }
-
- if (( $styles =~ /\bHELPPACK\b/ ) || ( $styles =~ /\bFORCEHELPPACK\b/ )) { push(@itemsarray, $oneitem); }
-
- next; # single language files are not included into help pack
- }
- if (0) {
- my $specificlanguage = "";
- if ( $oneitem->{'specificlanguage'} ) { $specificlanguage = $oneitem->{'specificlanguage'}; }
-
- for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ ) # iterating over all languages
- {
- my $onelanguage = ${$languagesarrayref}[$j];
- my $locallang = $onelanguage;
- $locallang =~ s/-/_/;
-
- if ( $specificlanguage eq $onelanguage )
+ my $ismultilingual = $oneitem->{'ismultilingual'};
+
+ if ($ismultilingual)
{
- push(@itemsarray, $oneitem);
+ my $specificlanguage = "";
+ if ( $oneitem->{'specificlanguage'} ) { $specificlanguage = $oneitem->{'specificlanguage'}; }
+
+ for ( my $j = 0; $j <= $#{$languagesarrayref}; $j++ ) # iterating over all languages
+ {
+ my $onelanguage = ${$languagesarrayref}[$j];
+ my $locallang = $onelanguage;
+ $locallang =~ s/-/_/;
+
+ if ( $specificlanguage eq $onelanguage )
+ {
+ push(@itemsarray, $oneitem);
+ }
+ }
+ }
+ else
+ {
+ push(@itemsarray, $oneitem);
}
}
}
- }
return \@itemsarray;
}
commit ce7c6182e383552ec6d1d4c1d53fd54ace8e06a9
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Dec 17 17:14:56 2010 +0000
missing special case for helppacks
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index a9a1518..eed57a1 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1357,7 +1357,7 @@ sub remove_Files_Without_Sourcedirectory
{
my $filename = $onefile->{'Name'};
- if ( ! $installer::globals::languagepack )
+ if ( ! $installer::globals::languagepack && !$installer::globals::helppack)
{
$infoline = "ERROR: Removing file $filename from file list.\n";
push( @installer::globals::logfileinfo, $infoline);
commit adeccd1a844d52beba67a40a8fc44cb9d490856f
Merge: 3261a8b... 2155898...
Author: Rene Engelhard <rene at debian.org>
Date: Fri Dec 17 17:57:22 2010 +0100
Merge branch 'feature/helppack' into libreoffice-3-3
commit 215589865eb4847f560d6400be298a828b23d1cb
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Dec 17 16:40:08 2010 +0000
fix #if for #else to avoid explosion
diff --git a/scp2/source/templates/module_helppack.sct b/scp2/source/templates/module_helppack.sct
index ac8779a..3b80cd8 100644
--- a/scp2/source/templates/module_helppack.sct
+++ b/scp2/source/templates/module_helppack.sct
@@ -32,7 +32,7 @@ Module gid_Module_Helppack_Root_<LANGUAGE_>
MOD_NAME_DESC(MODULE_HELPPACK_<LANGUAGEBIG_>);
#ifdef WITH_HELPPACK_INTEGRATION
Styles =(FORCEHELPPACK, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME, LANGUAGEMODULE);
-#ifdef WITH_HELPPACK_INTEGRATION
+#else
Styles =(HELPPACK, HIDDEN_ROOT, USELANGUAGENAME, LANGUAGEMODULE);
#endif
End
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 2260f31cc20d0a14111fa9b145744a86e92002b0
Author: Rene Engelhard <rene at debian.org>
Date: Fri Dec 17 13:17:06 2010 +0100
actually check for glxext.h and check whether it works
Signed-off-by: Robert Nagy <robert at openbsd.org>
diff --git a/configure.in b/configure.in
index 3857aff..a97f094 100644
--- a/configure.in
+++ b/configure.in
@@ -5452,6 +5452,12 @@ if test "$with_system_mesa_headers" = "no"; then
else
AC_MSG_RESULT([external])
SYSTEM_MESA_HEADERS=YES
+ AC_LANG_PUSH(C)
+ AC_CHECK_HEADER(GL/glxext.h, [],
+ [ AC_MSG_ERROR(mesa headers not found.)], [#include <GL/glx.h>])
+ AC_MSG_CHECKING([whether GL/glxext.h defines PFNGLXBINDTEXIMAGEEXTPROC])
+ AC_EGREP_HEADER(PFNGLXBINDTEXIMAGEEXTPROC, GL/glxext.h, [AC_MSG_RESULT([yes])], AC_MSG_ERROR(no))
+ AC_LANG_POP(C)
fi
AC_SUBST(SYSTEM_MESA_HEADERS)
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])
commit aadf5b93cbcc9e47ceaedb6a77aeb36ff3e81d74
Author: Rene Engelhard <rene at debian.org>
Date: Fri Dec 17 10:53:45 2010 +0100
check if KDE is >= 4.2
Signed-off-by: David Tardon <dtardon at redhat.com>
diff --git a/configure.in b/configure.in
index 23b664b..3857aff 100644
--- a/configure.in
+++ b/configure.in
@@ -6992,6 +6992,21 @@ the root of your Qt installation by exporting QT4DIR before running "configure".
KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkdeui -lkdecore -lQtCore -lQtGui"
+ AC_LANG_PUSH([C++])
+ save_CXXFLAGS=$CXXFLAGS
+ CXXFLAGS="$CXXFLAGS $KDE4_CFLAGS"
+ AC_MSG_CHECKING([whether KDE is >= 4.2])
+ AC_TRY_RUN([
+#include <kdeversion.h>
+
+int main(int argc, char **argv) {
+ if (KDE_VERSION_MAJOR == 4 && KDE_VERSION_MINOR >= 2) return 0;
+ else return 1;
+}
+ ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([KDE version too old])])
+ CXXFLAGS=$save_CXXFLAGS
+ AC_LANG_POP([C++])
+
# Glib is needed for properly handling Qt event loop with Qt's Glib integration enabled
PKG_CHECK_MODULES(KDE_GLIB,[glib-2.0 >= 2.4],
[KDE_HAVE_GLIB=1],
commit 0da17b57fd99c9baa6ab4d7fb621bf2c57671b53
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Fri Dec 17 10:46:27 2010 +0100
don't show the helppacks in installer unless asked for it
diff --git a/scp2/source/ooo/module_helppack.scp b/scp2/source/ooo/module_helppack.scp
index 9cc9b44..3614cb9 100644
--- a/scp2/source/ooo/module_helppack.scp
+++ b/scp2/source/ooo/module_helppack.scp
@@ -32,7 +32,11 @@ Module gid_Module_Helppack_Helproot
XPDParentID = "root";
Sortkey = "300";
MOD_NAME_DESC(MODULE_ROOT_HELPPACK);
+#ifdef WITH_HELPPACK_INTEGRATION
Styles = (SHOW_MULTILINGUAL_ONLY);
+#else
+ Styles = (HIDDEN_ROOT);
+#endif
End
#include "allhelpmodules.inc"
commit 515ffd90e555af26e81a861058dced8a7643c045
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Dec 16 15:47:23 2010 +0100
Some more helppack related improvements
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 34b75e3..e4cf708 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -119,9 +119,7 @@ Module gid_Module_Langpack_Brand_Template
Description = "gid_Module_Langpack_Brand_Template";
Styles = (TEMPLATEMODULE);
InstallOrder = "1050";
- Dirs = (gid_Brand_Dir_Help,
- gid_Brand_Dir_Help_Isolanguage,
- gid_Brand_Dir_Program,
+ Dirs = (gid_Brand_Dir_Program,
gid_Brand_Dir_Program_Shell,
gid_Brand_Dir_Program_Resource,
gid_Brand_Dir_Readme);
diff --git a/scp2/source/ooo/module_help_template.scp b/scp2/source/ooo/module_help_template.scp
index 34a102e..4022d59 100644
--- a/scp2/source/ooo/module_help_template.scp
+++ b/scp2/source/ooo/module_help_template.scp
@@ -39,6 +39,8 @@ Module gid_Module_Helppack_Help_Template
gid_File_Help_Simpress_Zip,
gid_File_Help_Smath_Zip,
gid_File_Help_Swriter_Zip);
+ Dirs = (gid_Brand_Dir_Help,
+ gid_Brand_Dir_Help_Isolanguage);
End
#include "allhelpmodules_root.inc"
commit 84b06bd8645177a70247e8be952bdf19ff6cd4c2
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Dec 16 14:41:26 2010 +0100
include the helppack stuff in setup_osl files
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 740065c..392ce6b 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -55,6 +55,8 @@ SCP1FILES = installation_ooo.par \
module_hidden_ooo.par \
module_langpack.par \
module_lang_template.par \
+ module_helppack.par \
+ module_help_template.par \
profile_ooo.par \
profileitem_ooo.par \
module_writer.par \
@@ -239,6 +241,8 @@ SCP2FILES = installation_ooo.par \
module_hidden_ooo.par \
module_langpack.par \
module_lang_template.par \
+ module_helppack.par \
+ module_help_template.par \
module_java.par \
profile_ooo.par \
profileitem_ooo.par \
commit fb9c4741faeb5e1a2cd7d540e141609878225779
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Dec 16 13:53:35 2010 +0100
Adding LANGUAGEMODULE flag to helppack files
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index a66be3a..4344662 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -118,7 +118,7 @@
#define ARCHIVE_TXT_FILE_BODY_HELPPACK \
TXT_FILE_BODY; \
- Styles = (ARCHIVE,HELPPACK)
+ Styles = (ARCHIVE,HELPPACK,LANGUAGEMODULE)
#define ARCHIVE_SUBST_FILE_BODY \
TXT_FILE_BODY; \
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index dc4d76f..1a245a6 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -54,15 +54,6 @@ Module gid_Module_Prg_Base_Bin
);
End
-// Module gid_Module_Prg_Base_Help
-// MOD_NAME_DESC ( MODULE_PRG_BASE_HELP );
-// ParentID = gid_Module_Prg_Base;
-// Sortkey = "200";
-// Minimal = NO;
-// Default = YES;
-// Files = (gid_File_Help_Sdatabase_Zip);
-// End
-
Module gid_Module_Brand_Prg_Base
PackageInfo = "packinfo_brand.txt";
Name = "gid_Module_Brand_Prg_Base";
@@ -81,8 +72,7 @@ Module gid_Module_Langpack_Base_Template
Name = "gid_Module_Langpack_Base_Template";
Description = "gid_Module_Langpack_Base_Template";
Styles = (TEMPLATEMODULE);
- Files = (gid_File_Help_Sdatabase_Zip,
- gid_File_Res_Abp,
+ Files = (gid_File_Res_Abp,
gid_File_Res_Adabasui,
gid_File_Res_Cnr,
gid_File_Res_Dbp,
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 0c26c3a..0e5e790 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -47,14 +47,6 @@ Module gid_Module_Prg_Calc_Bin
gid_File_Tmp_Userinstall_Calc_Inf);
End
-// Module gid_Module_Prg_Calc_Help
-// MOD_NAME_DESC ( MODULE_PRG_CALC_HELP );
-// ParentID = gid_Module_Prg_Calc;
-// Sortkey = "200";
-// Default = YES;
-// Files = (gid_File_Help_Scalc_Zip);
-// End
-
Module gid_Module_Prg_Calc_Addins
MOD_NAME_DESC ( MODULE_OPTIONAL_ADDINS );
Styles = (HIDDEN_ROOT);
@@ -82,8 +74,7 @@ Module gid_Module_Langpack_Calc_Template
Name = "gid_Module_Langpack_Calc_Template";
Description = "gid_Module_Langpack_Calc_Template";
Styles = (TEMPLATEMODULE);
- Files = (gid_File_Help_Scalc_Zip,
- gid_File_Res_Analysis,
+ Files = (gid_File_Res_Analysis,
gid_File_Res_Date,
gid_File_Res_Sc,
gid_File_Res_Solver);
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
index 3226e08..b5bec12 100644
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
@@ -47,14 +47,6 @@ Module gid_Module_Prg_Draw_Bin
gid_File_Tmp_Userinstall_Draw_Inf);
End
-// Module gid_Module_Prg_Draw_Help
-// MOD_NAME_DESC ( MODULE_PRG_DRAW_HELP );
-// ParentID = gid_Module_Prg_Draw;
-// Sortkey = "200";
-// Default = YES;
-// Files = (gid_File_Help_Sdraw_Zip);
-// End
-
Module gid_Module_Brand_Prg_Draw
PackageInfo = "packinfo_brand.txt";
Name = "gid_Module_Brand_Prg_Draw";
@@ -73,7 +65,7 @@ Module gid_Module_Langpack_Draw_Template
Name = "gid_Module_Langpack_Draw_Template";
Description = "gid_Module_Langpack_Draw_Template";
Styles = (TEMPLATEMODULE);
- Files = (gid_File_Help_Sdraw_Zip);
+ Files = ();
End
#include "alllangmodules_draw.inc"
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index 1682b88..8e9a738 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -48,14 +48,6 @@ Module gid_Module_Prg_Impress_Bin
gid_File_Tmp_Userinstall_Impress_Inf);
End
-// Module gid_Module_Prg_Impress_Help
-// MOD_NAME_DESC ( MODULE_PRG_IMPRESS_HELP );
-// ParentID = gid_Module_Prg_Impress;
-// Sortkey = "200";
-// Default = YES;
-// Files = (gid_File_Help_Simpress_Zip);
-// End
-
Module gid_Module_Brand_Prg_Impress
PackageInfo = "packinfo_brand.txt";
Name = "gid_Module_Brand_Prg_Impress";
@@ -74,7 +66,7 @@ Module gid_Module_Langpack_Impress_Template
Name = "gid_Module_Langpack_Impress_Template";
Description = "gid_Module_Langpack_Impress_Template";
Styles = (TEMPLATEMODULE);
- Files = (gid_File_Help_Simpress_Zip);
+ Files = ();
End
Module gid_Module_Prg_Impress_MSO_Reg
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index e9c084b..960c320 100644
--- a/scp2/source/math/module_math.scp
+++ b/scp2/source/math/module_math.scp
@@ -47,14 +47,6 @@ Module gid_Module_Prg_Math_Bin
gid_File_Tmp_Userinstall_Math_Inf);
End
-// Module gid_Module_Prg_Math_Help
-// MOD_NAME_DESC ( MODULE_PRG_MATH_HELP );
-// ParentID = gid_Module_Prg_Math;
-// Sortkey = "200";
-// Default = YES;
-// Files = (gid_File_Help_Smath_Zip);
-// End
-
Module gid_Module_Brand_Prg_Math
PackageInfo = "packinfo_brand.txt";
Name = "gid_Module_Brand_Prg_Math";
@@ -73,8 +65,7 @@ Module gid_Module_Langpack_Math_Template
Name = "gid_Module_Langpack_Math_Template";
Description = "gid_Module_Langpack_Math_Template";
Styles = (TEMPLATEMODULE);
- Files = (gid_File_Help_Smath_Zip,
- gid_File_Res_Sm);
+ Files = (gid_File_Res_Sm);
End
#include "alllangmodules_math.inc"
diff --git a/scp2/source/ooo/module_help_template.scp b/scp2/source/ooo/module_help_template.scp
index 15f8834..34a102e 100644
--- a/scp2/source/ooo/module_help_template.scp
+++ b/scp2/source/ooo/module_help_template.scp
@@ -32,7 +32,13 @@ Module gid_Module_Helppack_Help_Template
Styles = (TEMPLATEMODULE);
Files = (gid_File_Help_Common_Zip,
gid_File_Help_Sbasic_Zip,
- gid_File_Help_Schart_Zip);
+ gid_File_Help_Scalc_Zip,
+ gid_File_Help_Schart_Zip,
+ gid_File_Help_Sdatabase_Zip,
+ gid_File_Help_Sdraw_Zip,
+ gid_File_Help_Simpress_Zip,
+ gid_File_Help_Smath_Zip,
+ gid_File_Help_Swriter_Zip);
End
#include "allhelpmodules_root.inc"
diff --git a/scp2/source/templates/module_helppack.sct b/scp2/source/templates/module_helppack.sct
index d0501ba..32b4a7a 100644
--- a/scp2/source/templates/module_helppack.sct
+++ b/scp2/source/templates/module_helppack.sct
@@ -30,5 +30,5 @@ Module gid_Module_Helppack_Root_<LANGUAGE_>
Sortkey = "<SORTKEY>";
Language = "<LANGUAGE>";
MOD_NAME_DESC(MODULE_HELPPACK_<LANGUAGEBIG_>);
- Styles =(HELPPACK, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+ Styles =(HELPPACK, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME, LANGUAGEMODULE);
End
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index f6fdb65..3071059 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -62,15 +62,6 @@ Module gid_Module_Prg_Wrt_Bin
gid_File_Tmp_Userinstall_Wrt_Inf);
End
-// Module gid_Module_Prg_Wrt_Help
-// MOD_NAME_DESC ( MODULE_PRG_WRT_HELP );
-// ParentID = gid_Module_Prg_Wrt;
-// Sortkey = "200";
-// Default = YES;
-// Minimal = YES;
-// Files = (gid_File_Help_Swriter_Zip);
-// End
-
Module gid_Module_Brand_Prg_Wrt
PackageInfo = "packinfo_brand.txt";
Name = "gid_Module_Brand_Prg_Wrt";
@@ -89,8 +80,7 @@ Module gid_Module_Langpack_Writer_Template
Name = "gid_Module_Langpack_Writer_Template";
Description = "gid_Module_Langpack_Writer_Template";
Styles = (TEMPLATEMODULE);
- Files = (gid_File_Help_Swriter_Zip,
- gid_File_Res_T602Filter);
+ Files = (gid_File_Res_T602Filter);
End
Module gid_Module_Prg_Wrt_MSO_Reg
commit 4302bc49e610c6b20e1cba743e07b7ebba7ea027
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Dec 16 12:44:15 2010 +0100
Helppack description in a separate packinfo file
diff --git a/scp2/source/templates/module_helppack_root.sct b/scp2/source/templates/module_helppack_root.sct
index 92acccb..2ddf414 100644
--- a/scp2/source/templates/module_helppack_root.sct
+++ b/scp2/source/templates/module_helppack_root.sct
@@ -32,6 +32,6 @@ Module gid_Module_Helppack_Help_<LANGUAGE_>
Assigns = gid_Module_Helppack_Help_Template;
Name = "gid_Module_Helppack_Help_<LANGUAGE_>";
Description = "gid_Module_Helppack_Help_<LANGUAGE_>";
- PackageInfo = "packinfo_office_lang.txt";
+ PackageInfo = "packinfo_office_help.txt";
Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
End
commit 533671541b17edada500ccfc2208741a3ca18f9e
Author: Petr Mladek <pmladek at suse.cz>
Date: Thu Dec 16 12:37:56 2010 +0100
find LICENSE/README files for epm packaging
Signed of by Fridrich Strba
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 16e9deb..1260b74 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -322,7 +322,7 @@ sub create_epm_header
my @epmheader = ();
- my ($licensefilename, $readmefilename);
+ my ($licensefilename, $readmefilename, $readmefilenameen);
my $foundlicensefile = 0;
my $foundreadmefile = 0;
@@ -393,11 +393,13 @@ sub create_epm_header
{
$licensefilename = "license.txt";
$readmefilename = "readme.txt";
+ $readmefilenameen = "readme_en-US.txt";
}
else
{
$licensefilename = "LICENSE";
- $readmefilename = "README";
+ $readmefilename = "README";
+ $readmefilenameen = "README_en-US";
}
if (( $installer::globals::languagepack ) # in language packs the files LICENSE and README are removed, because they are not language specific
@@ -437,18 +439,24 @@ sub create_epm_header
$license_in_package_defined = 1;
}
}
- # searching for and readme file
-
- for ( my $i = 0; $i <= $#{$filesinproduct}; $i++ )
+
+ # searching for and readme file;
+ # URE uses special README; others use README_en-US
+ # it does not matter which one is passed for epm if both are packaged
+ foreach my $possiblereadmefilename ($readmefilenameen, $readmefilename)
{
- my $onefile = ${$filesinproduct}[$i];
- my $filename = $onefile->{'Name'};
- if ( $filename eq $readmefilename )
+ last if ($foundreadmefile);
+ for ( my $i = 0; $i <= $#{$filesinproduct}; $i++ )
{
- $foundreadmefile = 1;
- $line = "%readme" . " " . $onefile->{'sourcepath'} . "\n";
- push(@epmheader, $line);
- last;
+ my $onefile = ${$filesinproduct}[$i];
+ my $filename = $onefile->{'Name'};
+ if ( $filename eq $possiblereadmefilename )
+ {
+ $foundreadmefile = 1;
+ $line = "%readme" . " " . $onefile->{'sourcepath'} . "\n";
+ push(@epmheader, $line);
+ last;
+ }
}
}
@@ -507,6 +515,22 @@ sub create_epm_header
last;
}
}
+ if (!($foundlicensefile) && $installer::globals::languagepack)
+ {
+ # the license file need not be packaged more times in the langpacks
+ # they need to be installed in parallel with the main package anyway
+ # try to find the LICENSE file between all available files (not only between the packaged)
+ my $fileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$licensefilename, "" , 0);
+ if($$fileref ne "" )
+ {
+ $infoline = "Fallback to license file: \"$$fileref\"!\n";
+ push(@installer::globals::logfileinfo, $infoline);
+
+ $foundlicensefile = 1;
+ $line = "%license" . " " . $$fileref . "\n";
+ push(@epmheader, $line);
+ }
+ }
}
if (!($foundlicensefile))
commit 87743493081b57dd3f536925d69bf917735212aa
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Dec 16 12:02:26 2010 +0100
remove gid_module_Langpack_Help* stuff
diff --git a/scp2/source/templates/module_langpack_root.sct b/scp2/source/templates/module_langpack_root.sct
index 0eb5a53..2db4529 100755
--- a/scp2/source/templates/module_langpack_root.sct
+++ b/scp2/source/templates/module_langpack_root.sct
@@ -48,17 +48,6 @@ Module gid_Module_Langpack_Resource_<LANGUAGE_>
Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
End
-Module gid_Module_Langpack_Help_<LANGUAGE_>
- ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
- Sortkey = "200";
- Language = "<LANGUAGE>";
- Assigns = gid_Module_Langpack_Help_Template;
- Name = "gid_Module_Langpack_Help_<LANGUAGE_>";
- Description = "gid_Module_Langpack_Help_<LANGUAGE_>";
- PackageInfo = "packinfo_office_lang.txt";
- Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
-
Module gid_Module_Langpack_Fonts_<LANGUAGE_>
ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
Sortkey = "300";
commit d3bad01fba069957a439363ed87cd7ad93a61321
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Thu Dec 16 11:40:20 2010 +0100
Descriptions for helppacks
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 9deeb11..60c561c 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -316,6 +316,7 @@ ULFFILES= \
folderitem_ooo.ulf \
module_ooo.ulf \
module_langpack.ulf \
+ module_helppack.ulf \
module_java.ulf \
registryitem_ooo.ulf \
module_systemint.ulf
diff --git a/scp2/source/ooo/module_helppack.ulf b/scp2/source/ooo/module_helppack.ulf
new file mode 100644
index 0000000..600a699
--- /dev/null
+++ b/scp2/source/ooo/module_helppack.ulf
@@ -0,0 +1,842 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+[STR_NAME_MODULE_ROOT_HELPPACK]
+en-US = "Additional help packs"
+
+[STR_DESC_MODULE_ROOT_HELPPACK]
+en-US = "Additional help packs"
+
+[STR_NAME_MODULE_HELPPACK_EN_US]
+en-US = "English"
+
+[STR_DESC_MODULE_HELPPACK_EN_US]
+en-US = "Installs English help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_DE]
+en-US = "German"
+
+[STR_DESC_MODULE_HELPPACK_DE]
+en-US = "Installs German help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_FR]
+en-US = "French"
+
+[STR_DESC_MODULE_HELPPACK_FR]
+en-US = "Installs French help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_IT]
+en-US = "Italian"
+
+[STR_DESC_MODULE_HELPPACK_IT]
+en-US = "Installs Italian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ES]
+en-US = "Spanish"
+
+[STR_DESC_MODULE_HELPPACK_ES]
+en-US = "Installs Spanish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SV]
+en-US = "Swedish"
+
+[STR_DESC_MODULE_HELPPACK_SV]
+en-US = "Installs Swedish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PT]
+en-US = "Portuguese"
+
+[STR_DESC_MODULE_HELPPACK_PT]
+en-US = "Installs Portuguese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PT_BR]
+en-US = "Portuguese (Brazil)"
+
+[STR_DESC_MODULE_HELPPACK_PT_BR]
+en-US = "Installs Portuguese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_JA]
+en-US = "Japanese"
+
+[STR_DESC_MODULE_HELPPACK_JA]
+en-US = "Installs Japanese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_HELPPACK_KO]
+en-US = "Installs Korean help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ZH_CN]
+en-US = "Chinese (simplified)"
+
+[STR_DESC_MODULE_HELPPACK_ZH_CN]
+en-US = "Installs Chinese (simplified) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ZH_TW]
+en-US = "Chinese (traditional)"
+
+[STR_DESC_MODULE_HELPPACK_ZH_TW]
+en-US = "Installs Chinese (traditional) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NL]
+en-US = "Dutch"
+
+[STR_DESC_MODULE_HELPPACK_NL]
+en-US = "Installs Dutch help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HU]
+en-US = "Hungarian"
+
+[STR_DESC_MODULE_HELPPACK_HU]
+en-US = "Installs Hungarian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PL]
+en-US = "Polish"
+
+[STR_DESC_MODULE_HELPPACK_PL]
+en-US = "Installs Polish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_RU]
+en-US = "Russian"
+
+[STR_DESC_MODULE_HELPPACK_RU]
+en-US = "Installs Russian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_HELPPACK_TR]
+en-US = "Installs Turkish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_EL]
+en-US = "Greek"
+
+[STR_DESC_MODULE_HELPPACK_EL]
+en-US = "Installs Greek help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TH]
+en-US = "Thai"
+
+[STR_DESC_MODULE_HELPPACK_TH]
+en-US = "Installs Thai help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_CS]
+en-US = "Czech"
+
+[STR_DESC_MODULE_HELPPACK_CS]
+en-US = "Installs Czech help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SK]
+en-US = "Slovak"
+
+[STR_DESC_MODULE_HELPPACK_SK]
+en-US = "Installs Slovak help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HR]
+en-US = "Croatian"
+
+[STR_DESC_MODULE_HELPPACK_HR]
+en-US = "Installs Croatian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ET]
+en-US = "Estonian"
+
+[STR_DESC_MODULE_HELPPACK_ET]
+en-US = "Installs Estonian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_VI]
+en-US = "Vietnamese"
+
+[STR_DESC_MODULE_HELPPACK_VI]
+en-US = "Installs Vietnamese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BG]
+en-US = "Bulgarian"
+
+[STR_DESC_MODULE_HELPPACK_BG]
+en-US = "Installs Bulgarian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KM]
+en-US = "Khmer"
+
+[STR_DESC_MODULE_HELPPACK_KM]
+en-US = "Installs Khmer help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PA_IN]
+en-US = "Punjabi"
+
+[STR_DESC_MODULE_HELPPACK_PA_IN]
+en-US = "Installs Punjabi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_GU_IN]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_HELPPACK_GU_IN]
+en-US = "Installs Gujarati help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TA]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_HELPPACK_TA]
+en-US = "Installs Tamil help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TA_IN]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_HELPPACK_TA_IN]
+en-US = "Installs Tamil help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HI]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_HELPPACK_HI]
+en-US = "Installs Hindi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HI_IN]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_HELPPACK_HI_IN]
+en-US = "Installs Hindi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ST]
+en-US = "Southern Sotho (Sutu)"
+
+[STR_DESC_MODULE_HELPPACK_ST]
+en-US = "Installs Southern Sotho (Sutu) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TN]
+en-US = "Tswana"
+
+[STR_DESC_MODULE_HELPPACK_TN]
+en-US = "Installs Tswana help in %PRODUCTNAME %PRODUCTVERSION"
+
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list