| 1 |
--- solenv/bin/modules/installer/globals.pm~ 2010-12-18 14:23:42.000000000 +0100 |
| 2 |
+++ solenv/bin/modules/installer/globals.pm 2011-01-27 20:17:36.073565393 +0100 |
| 3 |
@@ -411,8 +411,8 @@ |
| 4 |
%usedtreeconditions = (); |
| 5 |
%moduledestination = (); |
| 6 |
|
| 7 |
- $unomaxservices = 1800; # regcomp -c argument length |
| 8 |
- $javamaxservices = 15; |
| 9 |
+ $unomaxservices = 1; # regcomp -c argument length |
| 10 |
+ $javamaxservices = 1; |
| 11 |
|
| 12 |
$one_cab_file = 0; |
| 13 |
$fix_number_of_cab_files = 1; |
| 14 |
--- solenv/bin/modules/installer/servicesfile.pm~ 2010-11-11 20:08:56.000000000 +0100 |
| 15 |
+++ solenv/bin/modules/installer/servicesfile.pm 2011-01-27 20:22:03.017565388 +0100 |
| 16 |
@@ -228,17 +228,31 @@ |
| 17 |
if ( $i % $installer::globals::javamaxservices == 0 || $i > $#{$javacomponents} ) # limiting to $installer::globals::maxservices files |
| 18 |
{ |
| 19 |
my @regcompoutput = (); |
| 20 |
+ my @throwregcompoutput = (); |
| 21 |
|
| 22 |
my $systemcall = "$installer::globals::wrapcmd $$regcompfileref -register -br ".fix_cygwin_path($regcomprdb)." -r ".fix_cygwin_path($servicesfile)." -c " . $installer::globals::quote . $filestring . $installer::globals::quote . " -l com.sun.star.loader.Java2 -wop=" . $installer::globals::quote . $javaservicesurlprefix . $installer::globals::quote ." -env:URE_INTERNAL_JAVA_DIR=" . $installer::globals::quote . make_file_url($$ure_internal_java_dir_ref) . $installer::globals::quote . " 2\>\&1 |"; |
| 23 |
|
| 24 |
- open (REG, "$systemcall"); |
| 25 |
- while (<REG>) {push(@regcompoutput, $_); } |
| 26 |
- close (REG); |
| 27 |
- |
| 28 |
- my $returnvalue = $?; # $? contains the return value of the systemcall |
| 29 |
- |
| 30 |
+ my $returnvalue = 1; |
| 31 |
my $infoline = "Systemcall: $systemcall\n"; |
| 32 |
- push( @installer::globals::logfileinfo, $infoline); |
| 33 |
+ |
| 34 |
+ for ( my $j = 0; $j <= 10; $j++) { |
| 35 |
+ open (REG, "$systemcall"); |
| 36 |
+ while (<REG>) {push(@throwregcompoutput, $_); } |
| 37 |
+ close (REG); |
| 38 |
+ |
| 39 |
+ $returnvalue = $?; # $? contains the return value of the systemcall |
| 40 |
+ |
| 41 |
+ push( @installer::globals::logfileinfo, $infoline); |
| 42 |
+ |
| 43 |
+ if ($returnvalue == 0) { |
| 44 |
+ last; |
| 45 |
+ } |
| 46 |
+ |
| 47 |
+ $infoline = "RATS: attempt $j: $systemcall\n"; |
| 48 |
+ push( @installer::globals::logfileinfo, $infoline); |
| 49 |
+ } |
| 50 |
+ |
| 51 |
+ $regcompoutput = $throwregcompoutput; |
| 52 |
|
| 53 |
for ( my $k = 0; $k <= $#regcompoutput; $k++ ) { push( @installer::globals::logfileinfo, "$regcompoutput[$k]"); } |
| 54 |
|
Parent Directory
| 
Revision Log