2010-10-09 07:39:30 +00:00
|
|
|
Index: bin/modules/installer/scriptitems.pm
|
|
|
|
|
===================================================================
|
|
|
|
|
RCS file: /cvs/tools/solenv/bin/modules/installer/scriptitems.pm,v
|
|
|
|
|
retrieving revision 1.17
|
|
|
|
|
diff -u -p -r1.17 scriptitems.pm
|
|
|
|
|
--- openoffice.org.orig/solenv/bin/modules/installer/scriptitems.pm 24 Feb 2005 16:21:15 -0000 1.17
|
|
|
|
|
+++ openoffice.org/solenv/bin/modules/installer/scriptitems.pm 18 Mar 2005 22:39:42 -0000
|
2011-04-12 11:48:59 +00:00
|
|
|
@@ -1356,11 +1356,10 @@
|
2012-11-26 09:52:19 +00:00
|
|
|
|
2011-04-12 11:48:59 +00:00
|
|
|
if ( ! $installer::globals::languagepack && !$installer::globals::helppack)
|
|
|
|
|
{
|
|
|
|
|
- $infoline = "ERROR: Removing file $filename from file list.\n";
|
|
|
|
|
+ $infoline = "WARNING: Removing file $filename from file list.\n";
|
|
|
|
|
push( @installer::globals::logfileinfo, $infoline);
|
|
|
|
|
|
2012-11-26 09:52:19 +00:00
|
|
|
- push(@missingfiles, "ERROR: File not found: $filename\n");
|
2011-04-12 11:48:59 +00:00
|
|
|
- $error_occurred = 1;
|
2012-11-26 09:52:19 +00:00
|
|
|
+ push(@missingfiles, "WARNING: File not found: $filename\n");
|
2011-04-12 11:48:59 +00:00
|
|
|
|
2012-11-26 09:52:19 +00:00
|
|
|
next; # removing this file from list, if sourcepath is empty
|
2011-04-12 11:48:59 +00:00
|
|
|
}
|
|
|
|
|
@@ -1368,11 +1367,10 @@
|
|
|
|
|
{
|
|
|
|
|
if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
|
2010-12-21 16:24:04 +00:00
|
|
|
{
|
|
|
|
|
- $infoline = "ERROR: Removing file $filename from file list.\n";
|
|
|
|
|
+ $infoline = "WARNING: Removing file $filename from file list.\n";
|
|
|
|
|
push( @installer::globals::logfileinfo, $infoline);
|
2010-10-09 07:39:30 +00:00
|
|
|
|
2012-11-26 09:52:19 +00:00
|
|
|
- push(@missingfiles, "ERROR: File not found: $filename\n");
|
2011-04-12 11:48:59 +00:00
|
|
|
- $error_occurred = 1;
|
2012-11-26 09:52:19 +00:00
|
|
|
+ push(@missingfiles, "WARNING: File not found: $filename\n");
|
2010-10-09 07:39:30 +00:00
|
|
|
|
2012-11-26 09:52:19 +00:00
|
|
|
next; # removing this file from list, if sourcepath is empty
|
2010-12-21 16:24:04 +00:00
|
|
|
}
|
2011-04-12 11:48:59 +00:00
|
|
|
@@ -1390,11 +1388,10 @@
|
|
|
|
|
{
|
|
|
|
|
if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCEHELPPACK\b/ ))
|
2010-12-21 16:24:04 +00:00
|
|
|
{
|
2011-04-12 11:48:59 +00:00
|
|
|
- $infoline = "ERROR: Removing file $filename from file list.\n";
|
|
|
|
|
+ $infoline = "WARNING: Removing file $filename from file list.\n";
|
|
|
|
|
push( @installer::globals::logfileinfo, $infoline);
|
2010-10-09 07:39:30 +00:00
|
|
|
|
2012-11-26 09:52:19 +00:00
|
|
|
- push(@missingfiles, "ERROR: File not found: $filename\n");
|
2012-06-27 09:30:01 +00:00
|
|
|
- $error_occurred = 1;
|
2012-11-26 09:52:19 +00:00
|
|
|
+ push(@missingfiles, "WARNING: File not found: $filename\n");
|
2010-10-09 07:39:30 +00:00
|
|
|
|
2012-11-26 09:52:19 +00:00
|
|
|
next; # removing this file from list, if sourcepath is empty
|
2011-04-12 11:48:59 +00:00
|
|
|
}
|
2010-10-09 07:39:30 +00:00
|
|
|
--- openoffice.org.orig/solenv/bin/modules/installer/simplepackage.pm 2010-07-12 10:27:26.000000000 +0100
|
|
|
|
|
+++ openoffice.org/solenv/bin/modules/installer/simplepackage.pm 2010-07-12 10:27:54.000000000 +0100
|
|
|
|
|
@@ -53,7 +53,7 @@
|
2012-11-26 09:52:19 +00:00
|
|
|
( $installer::globals::packageformat eq "archive" ))
|
|
|
|
|
{
|
|
|
|
|
$installer::globals::is_simple_packager_project = 1;
|
|
|
|
|
- $installer::globals::patch_user_dir = 1;
|
|
|
|
|
+ $installer::globals::patch_user_dir = 1;
|
|
|
|
|
}
|
|
|
|
|
elsif( $installer::globals::packageformat eq "dmg" )
|
|
|
|
|
{
|
