summaryrefslogtreecommitdiff
path: root/patches/dev300/piece-services.diff
diff options
context:
space:
mode:
Diffstat (limited to 'patches/dev300/piece-services.diff')
-rw-r--r--patches/dev300/piece-services.diff181
1 files changed, 0 insertions, 181 deletions
diff --git a/patches/dev300/piece-services.diff b/patches/dev300/piece-services.diff
deleted file mode 100644
index 3f217d60b..000000000
--- a/patches/dev300/piece-services.diff
+++ /dev/null
@@ -1,181 +0,0 @@
-diff -u -r solenv.pristine/bin/make_installer.pl solenv/bin/make_installer.pl
---- solenv.pristine/bin/make_installer.pl 2008-08-13 14:01:56.000000000 +0100
-+++ solenv/bin/make_installer.pl 2008-08-14 15:40:16.000000000 +0100
-@@ -302,6 +302,17 @@
- }
-
- my $includepatharrayref = installer::converter::convert_stringlist_into_array($includepathref, ",");
-+# search also the ugly pyuno subdir (needed to separate the complex insternal python?)
-+push @{$includepatharrayref}, "$ENV{SOLARPIECE}/$ENV{INPATH}/bin/pyuno";
-+push @{$includepatharrayref}, "$ENV{SOLARPIECE}/$ENV{INPATH}/lib/pyuno";
-+# search also the system directories when registering services
-+if (defined $ENV{OO_BUILD_SERVICES}) {
-+ push @{$includepatharrayref}, "$ENV{SPLITUREDIR}/share/java";
-+ push @{$includepatharrayref}, "$ENV{SPLITINSTALLDIR}/classes";
-+ push @{$includepatharrayref}, "$ENV{SPLITUREDIR}/bin";
-+ push @{$includepatharrayref}, "$ENV{SPLITUREDIR}/lib";
-+ push @{$includepatharrayref}, "$ENV{SPLITINSTALLDIR}";
-+}
- if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "allpatharray1.log" ,$includepatharrayref); }
- if (defined $ENV{OO_SOLVERDIR}) {
- push @{$includepatharrayref}, "$ENV{OO_SOLVERDIR}/bin";
-@@ -893,6 +893,14 @@
- }
- }
-
-+ if (defined $ENV{OO_BUILD_SERVICES}) {
-+ installer::logger::print_message( "... creating preregistered services.rdb ...\n" );
-+
-+ installer::servicesfile::create_services_rdb($allvariableshashref, $filesinproductlanguageresolvedarrayref, $includepatharrayref, $languagestringref);
-+ if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles14.log", $filesinproductlanguageresolvedarrayref); }
-+ # saving debug info at end
-+ if ( $installer::globals::debug ) { installer::logger::savedebug($installer::globals::exitlog); }
-+
- #####################################
- # Calls of regmerge
- #####################################
-@@ -907,7 +915,15 @@
- if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles14b.log", $filesinproductlanguageresolvedarrayref); }
- }
- }
--
-+
-+#######################################################
-+# Stopping time
-+#######################################################
-+
-+installer::logger::stoptime();
-+ exit 0;
-+ }
-+
- ############################################
- # Collecting directories for epm list file
- ############################################
-Only in solenv/bin: make_installer.pl~
-diff -u -r solenv.pristine/bin/modules/installer/archivefiles.pm solenv/bin/modules/installer/archivefiles.pm
---- solenv.pristine/bin/modules/installer/archivefiles.pm 2008-08-13 14:01:56.000000000 +0100
-+++ solenv/bin/modules/installer/archivefiles.pm 2008-08-14 15:44:09.000000000 +0100
-@@ -198,6 +198,8 @@
-
- if ( $installer::globals::dounzip ) { installer::systemactions::create_directory($unzipdir); } # creating subdirectories with the names of the zipfiles
-
-+ next if (defined $ENV{OO_BUILD_SERVICES});
-+
- my $zip = Archive::Zip->new();
- if ( $zip->read($sourcepath) != AZ_OK )
- {
-Only in solenv/bin/modules/installer: archivefiles.pm~
-diff -u -r solenv.pristine/bin/modules/installer/scpzipfiles.pm solenv/bin/modules/installer/scpzipfiles.pm
---- solenv.pristine/bin/modules/installer/scpzipfiles.pm 2008-08-13 14:01:56.000000000 +0100
-+++ solenv/bin/modules/installer/scpzipfiles.pm 2008-08-14 13:09:29.000000000 +0100
-@@ -147,7 +147,9 @@
- my $onefilename = $onefile->{'Name'};
- my $sourcepath = $onefile->{'sourcepath'};
-
-- next if ($installer::globals::split && $sourcepath eq '');
-+if (!defined $ENV{OO_BUILD_SERVICES}) {
-+ next if ($installer::globals::split && $sourcepath eq '');
-+}
-
- if ( $onefilename =~ /^\s*\Q$installer::globals::separator\E/ ) # filename begins with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
- {
-@@ -165,17 +167,19 @@
- installer::systemactions::create_directory_structure($destdir);
- }
-
-- my $copysuccess = installer::systemactions::copy_one_file($sourcepath, $movepath);
--
-+ my $copysuccess;
-+ if (!defined $ENV{OO_BUILD_SERVICES}) {
-+ $copysuccess = installer::systemactions::copy_one_file($sourcepath, $movepath);
- if ( $copysuccess )
- {
- # Now the file can be edited
- # ToDo: How about binary patching?
-
-- my $onefileref = installer::files::read_file($movepath);
-+ my $onefileref = installer::files::read_file($movepath);
- replace_all_ziplistvariables_in_file($onefileref, $variableshashref);
- installer::files::save_file($destinationpath ,$onefileref);
- }
-+ }
-
- # Saving the original source, where the file was found
- $onefile->{'originalsourcepath'} = $onefile->{'sourcepath'};
-Only in solenv/bin/modules/installer: scpzipfiles.pm~
-diff -u -r solenv.pristine/bin/modules/installer/scriptitems.pm solenv/bin/modules/installer/scriptitems.pm
---- solenv/bin/modules/installer/scriptitems.pm.old1 2009-10-14 17:19:30.000000000 +0200
-+++ solenv/bin/modules/installer/scriptitems.pm 2009-10-14 17:29:33.000000000 +0200
-@@ -1407,7 +1407,10 @@ sub remove_Files_Without_Sourcedirectory
- }
- }
- }
-- next; # removing this file from list, if sourcepath is empty
-+ if (!defined $ENV{OO_BUILD_SERVICES}) {
-+ print STDERR "drop file $filename ?\n";
-+ next; # removing this file from list, if sourcepath is empty
-+ }
- }
- }
-
-Only in solenv/bin/modules/installer: scriptitems.pm~
-diff -u -r solenv.pristine/bin/modules/installer/servicesfile.pm solenv/bin/modules/installer/servicesfile.pm
---- solenv.pristine/bin/modules/installer/servicesfile.pm 2008-08-13 14:01:56.000000000 +0100
-+++ solenv/bin/modules/installer/servicesfile.pm 2008-08-14 16:30:39.000000000 +0100
-@@ -138,6 +138,7 @@
- my $local_error2_occured = 0;
-
- my $sourcepath = make_file_url(${$unocomponents}[$i]->{'sourcepath'});
-+ defined $ENV{OO_BUILD_SERVICES} && $sourcepath eq "" && next;
- my $urlprefix = ${$unocomponents}[$i]->{'NativeServicesURLPrefix'};
- if (defined($urlprefix))
- {
-@@ -506,7 +509,12 @@
- {
- my $filename = $installer::globals::regcompjars[$i];
-
-- my $jarfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$filename, $includepatharrayref, 1);
-+# my @includepath;
-+# for my $foo (@{$includepatharrayref}) { push @includepath, $foo; }
-+# push @includepath, "$ENV{SPLITUREDIR}/share/java";
-+# push @includepath, "$ENV{SPLITINSTALLDIR}/classes";
-+# my $jarfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$filename, \@includepath, 1);
-+ my $jarfileref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$filename, $includepatharrayref, 1);
-
- if ( $$jarfileref eq "" ) { installer::exiter::exit_program("ERROR: Could not find file $filename for registering java components!", "prepare_classpath_for_java_registration"); }
-
-@@ -881,9 +889,12 @@
- {
- my ($allvariableshashref, $filesarrayref, $includepatharrayref, $languagestringref) = @_;
-
-+
- # collecting all services files
- my $unocomponentfiles = installer::worker::collect_all_items_with_special_flag($filesarrayref, "UNO_COMPONENT");
- $unocomponentfiles = filter_regmergefiles($unocomponentfiles);
-+
-+ print STDERR "foo ! - we have to register this many components: $#{$unocomponentfiles}\n";
-
- if ( $#{$unocomponentfiles} > -1 ) # not empty -> at least one file with flag UNO_COMPONENT
- {
-@@ -893,6 +904,8 @@
-
- $registryfiles = check_defintion_of_databasegids($databasegids, $registryfiles);
-
-+ print STDERR "foo ! - into this many registries: $#{$registryfiles}\n";
-+
- # Now the creation of all files with flag STARREGISTRY can begin
-
- for ( my $i = 0; $i <= $#{$registryfiles}; $i++ )
-Only in solenv/bin/modules/installer: servicesfile.pm~
---- solenv/bin/modules/installer/systemactions.pm.old 2009-10-22 15:00:22.000000000 +0200
-+++ solenv/bin/modules/installer/systemactions.pm 2009-10-23 16:07:40.000000000 +0200
-@@ -302,7 +302,8 @@ sub create_directories
-
- my $path = "";
-
-- if (( $newdirectory eq "uno" ) || ( $newdirectory eq "zip" ) || ( $newdirectory eq "cab" ) || ( $newdirectory =~ /rdb\s*$/i )) # special handling for zip files, cab files and services file because of performance reasons
-+ # IMPORTANT: do not hadle .rdb files the special way; we need to find them in the normal tree in the split build (they are created in the 2nd stage and installed another way)
-+ if (( $newdirectory eq "uno" ) || ( $newdirectory eq "zip" ) || ( $newdirectory eq "cab" )) # special handling for zip files, cab files and services file because of performance reasons
- {
- if ( $installer::globals::temppathdefined ) { $path = $installer::globals::temppath; }
- else { $path = $installer::globals::unpackpath; }
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-08 06:59:05 +0000