sb118: merged in backout

273 files changed, 2314 insertions, 3875 deletions

diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk
index b9a1e6e18f66..52efcb4ab740 100644
--- a/solenv/bin/addsym.awk
+++ b/solenv/bin/addsym.awk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: header.hxx,v $
-#
-# $Revision: 1.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,29 +25,17 @@
 #
 #*************************************************************************
 
-# Add symbol patterns _ZTI* and _ZTS* to the global section of version UDK_3_0_0
-# (and if that version is not yet present, add it).  For C++ exception handling
-# to work across libraries, it is important that all libraries use those symbols
-# with the same version name.
-#
-# The below code fails with 'perverted' mapfiles (using a strange line layout,
-# or containing version UDK_3_0_0 without a global section, ...).
+# Add certain symbol patterns to the first global section.
 
 BEGIN { state = 0 }
-END {
-    if (state == 0) {
-        print "# Weak RTTI symbols for C++ exceptions:"
-        print "UDK_3_0_0 {"
-	print "\tglobal:"
-	print "\t_ZTI*; _ZTS*;"
-        print "};"
-    }
-}
+/\{/ && state == 1 { exit 1 } #TODO: print error explanation to stderr?
+/^[\t ]*UDK_3_0_0[\t ]*\{/ && state == 0 { state = 1 }
+/^[\t ]*global[\t ]*:/ && state == 1 { state = 2 }
+{ print }
 state == 2 {
-    print "        _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
+    print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions"
+    if (ENVIRON["USE_SYSTEM_STL"] != "YES")
+        print "_ZN4_STL7num_put*; # for STLport"
     state = 3
 }
-# #i66636# - ???
-/^[\t ]*UDK_3_0_0[\t ]*\{/ { state = 1 }
-/^[\t ]*global[\t ]*:/ && state == 1 { state = 2 }
-{ print }
+END { if (state != 3) exit 1 } #TODO: print error explanation to stderr?
diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index cc0677220777..442dcba26946 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: build.pl,v $
-#
-# $Revision: 1.171 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -118,7 +114,7 @@
     $pre_custom_job = '';
     $custom_job = '';
     $post_custom_job = '';
-    %LocalDepsHash = ();
+    %local_deps_hash = ();
     %PathHash = ();
     %PlatformHash = ();
     %AliveDependencies = ();
@@ -185,7 +181,7 @@
     $setenv_string = ''; # string for configuration of the client environment
     $ports_string = ''; # string with possible ports for server
     @server_ports = ();
-    $html_port;
+    $html_port = 0;
     $server_socket_obj = undef; # socket object for server
     $html_socket_obj = undef; # socket object for server
     my %clients_jobs = ();
@@ -201,7 +197,6 @@
     my %module_paths = (); # hash with absolute module paths
     my %active_modules = ();
     my $generate_config = 0;
-    my $add_modules_to_config = 0;
     my %add_to_config = ();
     my %remove_from_config = ();
     my $clear_config = 0;
@@ -347,102 +342,19 @@ sub rename_file {
 };
 
 sub generate_config_file {
-    my $source_config = SourceConfig -> new();
-    $source_config_file = $source_config->get_config_file_path();
-    my $temp_config_file = File::Temp::tmpnam($ENV{TMP});
-    my @config_content_new = ();
-    my $addition_message;
-    my $removal_message;
-    my %present_modules = ();
-    if ($source_config_file) {
-        open(SOURCE_CONFIG_FILE, $source_config_file);
-        my @config_content = <SOURCE_CONFIG_FILE>;
-        close SOURCE_CONFIG_FILE;
-        my ($module_section, $repository_section);
-        foreach (@config_content) {
-            if ((!/^\S+/)||(/^\s*#+/)) {
-                push(@config_content_new, $_);
-                next;
-            }
-            if (/^\[repositories\]\s*(\s+#)*/) {
-                if ($module_section) {
-                    $addition_message = add_modules_to_source_config(\%add_to_config, \@config_content_new);
-                };
-                $module_section = 0;
-                $repository_section = 1;
-                push(@config_content_new, $_);
-                next;
-            };
-            if (/^\[modules\]\s*(\s+#)*/) {
-                $module_section = 1;
-                $repository_section = 0;
-                push(@config_content_new, $_);
-                next;
-            };
-            if ($module_section && /\s*(\S+)=active\s*(\s+#)*/) {
-                if ($clear_config || defined $remove_from_config{$1}) {
-                    delete $remove_from_config{$1};
-                    $removal_message .= "$1 ";
-                } else {
-                    push(@config_content_new, $_);
-                    if (defined $add_to_config{$1}) {
-                        push(@warnings, "Module $1 already activated in $source_config_file\n");
-                        delete $add_to_config{$1};
-                    }
-                };
-            } else {
-                push(@config_content_new, $_);
-            };
-        };
-                if (keys %add_to_config) {
-                    if (!$module_section) {
-                        push(@config_content_new, "[modules]\n");
-                    };
-                    $addition_message = add_modules_to_source_config(\%add_to_config, \@config_content_new);
-                };
-    } else {
-        if ($clear_config || scalar %remove_from_config) {
-            print_error('No source config file found');
-        };
-        $source_config_file = $source_config->get_config_file_default_path();
-        push(@config_content_new, "[modules]\n");
-        $addition_message = add_modules_to_source_config(\%add_to_config, \@config_content_new);
-    };
-    die("Cannot open $temp_config_file") if (!open(NEW_CONFIG, ">$temp_config_file"));
-    print NEW_CONFIG $_ foreach (@config_content_new);
-    close NEW_CONFIG;
-    rename_file($temp_config_file, $source_config_file, 1);
-    foreach (keys %remove_from_config) {
-        push(@warnings, "Module(s) $_ not found in " . $source_config_file . "\n");
-    };
-    print_warnings();
-    print $addition_message if ($addition_message);
-    print "Module(s):\n$removal_message\nremoved from $source_config_file\n" if ($removal_message);
+    my $source_config = SourceConfig->new();
+    $source_config->add_active_modules([keys %add_to_config], 1) if (scalar %add_to_config);
+    $source_config->remove_activated_modules([keys %remove_from_config], 1) if (scalar %remove_from_config);
+    $source_config->remove_all_activated_modules() if ($clear_config);
 };
 
-#
-# Add modules from the passed hash to the array of config strigns
-#
-sub add_modules_to_source_config {
-    my ($modules_hash_ref, $config_content_new) = @_;
-    my $message;
-    foreach (keys %$modules_hash_ref) {
-        push(@$config_content_new, "$_=active\n");
-        $message .= "$_ ";
-    };
-    if ($message) {
-        return "Module(s):\n" .$message . "\nare added to the " . $source_config_file . "\n\n";
-    } else {
-        return '';
-    };
-};
 
 sub start_interactive {
     $pid = open(HTML_PIPE, "-|");
     print "Pipe is open\n";
 
     if ($pid) {   # parent
-        # make file handle non-bloking
+        # make file handle non-blocking
         my $flags = '';
         fcntl(HTML_PIPE, F_GETFL, $flags);
         $flags |= O_NONBLOCK;
@@ -492,11 +404,12 @@ sub start_html_message_trigger {
         my $rv;
         my $full_buffer = '';
         my %modules_to_rebuild = ();
+        my $paddr;
         while ($rv = sysread(HTML_PIPE, $buffer, $buffer_size)) {
             $full_buffer .= $buffer;
         };
         if (length $full_buffer) {
-            print "**********Got message $fullbuffer\n";
+            print "**********Got message $full_buffer\n";
             socket(SOCKET, PF_INET, SOCK_STREAM, getprotobyname('tcp')) or die "socket: $!";
             if (connect(SOCKET, $paddr)) {
                 $full_buffer .= "\n";
@@ -568,8 +481,8 @@ sub schedule_delete {
             kill 9, keys %{$module_deps_hash_pids{$projects_deps_hash{$_}}};
             handle_dead_children(0);
         };
-        RemoveFromDependencies($_, \%global_deps_hash);
-        RemoveFromDependencies($_, \%global_deps_hash_backup);
+        remove_from_dependencies($_, \%global_deps_hash);
+        remove_from_dependencies($_, \%global_deps_hash_backup);
         delete $reversed_dependencies{$_};
         delete $build_is_finished{$_} if defined $build_is_finished{$_};
         delete $modules_with_errors{$_} if defined $modules_with_errors{$_};
@@ -618,6 +531,7 @@ sub schedule_rebuild {
 #
 sub get_build_list_path {
     my $module = shift;
+    return $build_list_paths{$module} if (defined $build_list_paths{$module});
     my @possible_dirs = ($module, $module. '.lnk', $module. '.link');
     return $build_list_paths{$module} if (defined $build_list_paths{$module});
     foreach (@possible_dirs) {
@@ -720,19 +634,17 @@ sub build_all {
             $modules_types{$initial_module} = 'mod';
         };
         modules_classify(keys %global_deps_hash);
-        store_weights(\%global_deps_hash);
-        prepare_build_from(\%global_deps_hash) if ($build_from);
+        expand_dependencies (\%global_deps_hash);
+#        prepare_build_from(\%global_deps_hash) if (scalar keys %incompatibles);
         prepare_incompatible_build(\%global_deps_hash) if ($incompatible);
         if ($build_all_cont || $build_since) {
-            print STDERR "There are active module in $source_config_file. Inactive modules will be skipped.\n";
-            push (@warnings, "\nThere are active module in $source_config_file. Inactive modules are skipped.\n\n");
             prepare_build_all_cont(\%global_deps_hash);
         };
         if ($generate_config) {
             %add_to_config = %global_deps_hash;
             generate_config_file();
             exit 0;
-        } elsif (keys %incompatibles) {
+        } elsif ($incompatible) {
             my @missing_modules = ();
             foreach (keys %global_deps_hash) {
                 push(@missing_modules, $_) if (!defined $active_modules{$_});
@@ -741,8 +653,12 @@ sub build_all {
                 print_error("There are modules:\n@missing_modules\n\nthat should be built, but they are not activated. Please, verify your $source_config_file.\n");
             };
         };
+        foreach my $module (%dead_parents) {
+            remove_from_dependencies($module, \%global_deps_hash);
+            delete ($global_deps_hash{$module}) if (defined $global_deps_hash{$module});
+        };
+        store_weights(\%global_deps_hash);
         backup_deps_hash(\%global_deps_hash, \%global_deps_hash_backup);
-        expand_dependencies (\%global_deps_hash_backup);
         reverse_dependensies(\%global_deps_hash_backup);
         $modules_number = scalar keys %global_deps_hash;
         initialize_html_info($_) foreach (keys %global_deps_hash);
@@ -757,34 +673,34 @@ sub build_all {
             if (!defined $dead_parents{$Prj}) {
                 if (scalar keys %broken_build) {
                     print $echo . "Skipping project $Prj because of error(s)\n";
-                    RemoveFromDependencies($Prj, \%global_deps_hash);
+                    remove_from_dependencies($Prj, \%global_deps_hash);
                     $build_is_finished{$Prj}++;
                     next;
                 };
 
                 $PrjDir = $module_paths{$Prj};
-                get_module_dep_hash($Prj, \%LocalDepsHash);
+                get_module_dep_hash($Prj, \%local_deps_hash);
                 my $info_hash = $html_info{$Prj};
-                $$info_hash{DIRS} = check_deps_hash(\%LocalDepsHash, $Prj);
-                $module_by_hash{\%LocalDepsHash} = $Prj;
-                build_dependent(\%LocalDepsHash);
+                $$info_hash{DIRS} = check_deps_hash(\%local_deps_hash, $Prj);
+                $module_by_hash{\%local_deps_hash} = $Prj;
+                build_dependent(\%local_deps_hash);
                 print $check_error_string;
             };
 
-            RemoveFromDependencies($Prj, \%global_deps_hash);
+            remove_from_dependencies($Prj, \%global_deps_hash);
             $build_is_finished{$Prj}++;
         };
     } else {
         store_build_list_content($initial_module);
-        get_module_dep_hash($initial_module, \%LocalDepsHash);
+        get_module_dep_hash($initial_module, \%local_deps_hash);
         initialize_html_info($initial_module);
         my $info_hash = $html_info{$initial_module};
-        $$info_hash{DIRS} = check_deps_hash(\%LocalDepsHash, $initial_module);
-        $module_by_hash{\%LocalDepsHash} = $initial_module;
+        $$info_hash{DIRS} = check_deps_hash(\%local_deps_hash, $initial_module);
+        $module_by_hash{\%local_deps_hash} = $initial_module;
         if ($server_mode) {
             run_server();
         } else {
-            build_dependent(\%LocalDepsHash);
+            build_dependent(\%local_deps_hash);
         };
     };
 };
@@ -811,43 +727,42 @@ sub initialize_html_info {
 # Do job
 #
 sub dmake_dir {
-    my ($new_BuildDir, $OldBuildDir, $error_code);
-    my $BuildDir = shift;
-    $jobs_hash{$BuildDir}->{START_TIME} = time();
-    $jobs_hash{$BuildDir}->{STATUS} = 'building';
-    if ($BuildDir =~ /(\s)/o && (!-d $BuildDir)) {
-        print "\n$BuildDir\n\n" if ($BuildDir =~ /\sdeliver$/o);
-        $error_code = do_custom_job($BuildDir, \%LocalDepsHash);
+    my ($new_job_name, $error_code);
+    my $job_name = shift;
+    $jobs_hash{$job_name}->{START_TIME} = time();
+    $jobs_hash{$job_name}->{STATUS} = 'building';
+    if ($job_name =~ /(\s)/o && (!-d $job_name)) {
+        $error_code = do_custom_job($job_name, \%local_deps_hash);
     } else {
-        html_store_job_info(\%LocalDepsHash, $BuildDir);
-        print_error("$BuildDir not found!!\n") if (!-d $BuildDir);
-        if (!-d $BuildDir) {
-            $new_BuildDir = $BuildDir;
-            $new_BuildDir =~ s/_simple//g;
-            if ((-d $new_BuildDir)) {
-                print("\nTrying $new_BuildDir, $BuildDir not found!!\n");
-                $BuildDir = $new_BuildDir;
+        html_store_job_info(\%local_deps_hash, $job_name);
+        print_error("$job_name not found!!\n") if (!-d $job_name);
+        if (!-d $job_name) {
+            $new_job_name = $job_name;
+            $new_job_name =~ s/_simple//g;
+            if ((-d $new_job_name)) {
+                print("\nTrying $new_job_name, $job_name not found!!\n");
+                $job_name = $new_job_name;
             } else {
-                print_error("\n$BuildDir not found!!\n");
+                print_error("\n$job_name not found!!\n");
             }
         }
         if ($cmd_file) {
-            print "cd $BuildDir\n";
+            print "cd $job_name\n";
             print $check_error_string;
-            print $echo.$BuildDir."\n";
+            print $echo.$job_name."\n";
             print "$dmake\n";
             print $check_error_string;
         } else {
             print "\n" if ( ! $show );
-            print "Entering $BuildDir\n";
+            print "Entering $job_name\n";
         };
-        RemoveFromDependencies($BuildDir, \%LocalDepsHash) if (!$child);
+        remove_from_dependencies($job_name, \%local_deps_hash) if (!$child);
         return if ($cmd_file || $show);
-        $error_code = run_job($dmake, $BuildDir);
-        html_store_job_info(\%LocalDepsHash, $BuildDir, $error_code) if (!$child);
+        $error_code = run_job($dmake, $job_name);
+        html_store_job_info(\%local_deps_hash, $job_name, $error_code) if (!$child);
     };
     if ($error_code && $ignore) {
-        push(@ignored_errors, $BuildDir);
+        push(@ignored_errors, $job_name);
         $error_code = 0;
     };
     if ($child) {
@@ -863,7 +778,7 @@ sub dmake_dir {
         _exit(0);
     } elsif ($error_code && ($error_code != -1)) {
         return $error_code;
-#        print_error("Error $? occurred while making $BuildDir");
+#        print_error("Error $? occurred while making $job_name");
     };
 };
 
@@ -1065,7 +980,7 @@ sub get_deps_hash {
         foreach my $alias (keys %DeadDependencies) {
             next if defined $AliveDependencies{$alias};
             if (!IsHashNative($alias)) {
-                RemoveFromDependencies($alias, $dependencies_hash);
+                remove_from_dependencies($alias, $dependencies_hash);
                 delete $DeadDependencies{$alias};
             };
         };
@@ -1208,7 +1123,9 @@ sub get_stand_dir {
         foreach (@possible_build_lists) {# ('build.lst', 'build.xlist');
             if (-e $StandDir . '/prj/'.$_) {
                 $initial_module = File::Basename::basename($StandDir);
+                $build_list_paths{$initial_module} =$StandDir . '/prj/'.$_;
                 $StandDir = File::Basename::dirname($StandDir);
+                $module_paths{$initial_module} = $StandDir . "/$initial_module";
                 return $StandDir;
             } elsif ($StandDir eq $previous_dir) {
                 $ENV{mk_tmp} = '';
@@ -1255,7 +1172,7 @@ sub CheckPlatform {
 # Remove project to build ahead from dependencies and make an array
 # of all from given project dependent projects
 #
-sub RemoveFromDependencies {
+sub remove_from_dependencies {
     my ($ExclPrj, $i, $Prj, $Dependencies);
     $ExclPrj = shift;
     my $ExclPrj_orig = '';
@@ -1326,7 +1243,7 @@ sub check_deps_hash {
                                             CLIENT => '-'
                     };
                 };
-                RemoveFromDependencies($key, \%deps_hash);
+                remove_from_dependencies($key, \%deps_hash);
                 delete $deps_hash{$key};
                 $consistent++;
             };
@@ -1576,7 +1493,6 @@ sub get_options {
         $arg =~ /^--genconf$/        and $generate_config = 1                  and next;
         if ($arg =~ /^--add$/)      {
                                         get_list_of_modules(\%add_to_config);
-                                        $add_modules_to_config++;
                                         next;
         };
         if ($arg =~ /^--remove$/)   {
@@ -1676,16 +1592,19 @@ sub get_options {
 };
 
 sub get_module_and_buildlist_paths {
-    my $source_config = SourceConfig -> new($StandDir);
-    $source_config_file = $source_config->get_config_file_path();
-    $active_modules{$_}++ foreach ($source_config->get_active_modules());
-    my %active_modules_copy = %active_modules;
-    foreach ($source_config->get_all_modules()) {
-        delete $active_modules_copy{$_} if defined($active_modules_copy{$_});
-        $module_paths{$_} = $source_config->get_module_path($_);
-        $build_list_paths{$_} = $source_config->get_module_build_list($_)
-    }
-    $dead_parents{$_}++ foreach (keys %active_modules_copy);
+    if ($build_all_parents || $checkparents) {
+        my $source_config = SourceConfig -> new($StandDir);
+        $source_config_file = $source_config->get_config_file_path();
+        $active_modules{$_}++ foreach ($source_config->get_active_modules());
+        my %active_modules_copy = %active_modules;
+        foreach ($source_config->get_all_modules()) {
+            delete $active_modules_copy{$_} if defined($active_modules_copy{$_});
+            next if ($_ eq $initial_module);
+            $module_paths{$_} = $source_config->get_module_path($_);
+            $build_list_paths{$_} = $source_config->get_module_build_list($_)
+        }
+        $dead_parents{$_}++ foreach (keys %active_modules_copy);
+    };
 };
 
 
@@ -1735,7 +1654,7 @@ sub cancel_build {
     } else {
         $message_part .= "--all:@broken_modules_names\n";
     };
-    if ($broken_modules_number) {
+    if ($broken_modules_number && $build_all_parents) {
         print "\n";
         print $broken_modules_number;
         print " module(s): ";
@@ -1848,7 +1767,7 @@ sub clear_from_child {
     if (defined $broken_build{$child_nick}) {
         $error_code = $broken_build{$child_nick};
     } else {
-        RemoveFromDependencies($child_nick,
+        remove_from_dependencies($child_nick,
                             $folders_hashes{$child_nick});
     };
     foreach (keys %module_deps_hash_pids) {
@@ -2034,12 +1953,12 @@ sub build_actual_queue {
                 delete $$build_queue{$Prj};
                 next;
             };
-            $started_children =+ build_dependent($projects_deps_hash{$Prj});
+            $started_children += build_dependent($projects_deps_hash{$Prj});
             if ((!scalar keys %{$projects_deps_hash{$Prj}}) &&
                 !$running_children{$projects_deps_hash{$Prj}}) {
                 if (!defined $modules_with_errors{$projects_deps_hash{$Prj}} || $ignore)
                 {
-                    RemoveFromDependencies($Prj, \%global_deps_hash);
+                    remove_from_dependencies($Prj, \%global_deps_hash);
                     $build_is_finished{$Prj}++;
                     delete $$build_queue{$Prj};
                     $finished_projects++;
@@ -2060,10 +1979,8 @@ sub build_actual_queue {
 sub run_job {
     my ($job, $path, $registered_name) = @_;
     my $job_to_do = $job;
-    if ( $show ) {
-        print "$job_to_do\n";
-        return 0;
-    }
+    print "$registered_name\n";
+    return 0 if ( $show );
     $job_to_do = $deliver_command if ($job eq 'deliver');
     $registered_name = $path if (!defined $registered_name);
     chdir $path;
@@ -2095,7 +2012,7 @@ sub do_custom_job {
     if ($job eq $pre_job) {
         announce_module($module);
 #        html_store_job_info($dependencies_hash, $job_dir);
-        RemoveFromDependencies($module_job, $dependencies_hash);
+        remove_from_dependencies($module_job, $dependencies_hash);
     } else {
         $error_code = run_job($job, $module_paths{$module}, $module_job);
         if ($error_code) {
@@ -2108,7 +2025,7 @@ sub do_custom_job {
             $modules_with_errors{$dependencies_hash}++;
             $broken_build{$module} = $error_code;
         } else {
-            RemoveFromDependencies($module_job, $dependencies_hash);
+            remove_from_dependencies($module_job, $dependencies_hash);
         };
     };
     html_store_job_info($dependencies_hash, $module_job, $error_code);
@@ -2349,19 +2266,17 @@ sub fix_permissions {
 sub prepare_incompatible_build {
     my ($prj, $deps_hash, @missing_modules);
     $deps_hash = shift;
-    foreach (keys %incompatibles) {
-        my $incomp_prj = $_;
-        if (!defined $$deps_hash{$_}) {
-            $incomp_prj .= '.lnk' if ($module_paths{$module} =~ /\.lnk$/);
-            $incomp_prj .= '.link' if ($module_paths{$module} =~ /\.link$/);
+    foreach my $module (keys %incompatibles) {
+        if (!defined $$deps_hash{$module}) {
+            print_error("The module $initial_module is independent from $module\n");
         }
-        delete $incompatibles{$_};
-        $incompatibles{$incomp_prj} = $$deps_hash{$incomp_prj};
-        delete $$deps_hash{$incomp_prj};
+        delete $incompatibles{$module};
+        $incompatibles{$module} = $$deps_hash{$module};
+        delete $$deps_hash{$module};
     }
     while ($prj = pick_prj_to_build($deps_hash)) {
-        RemoveFromDependencies($prj, $deps_hash);
-        RemoveFromDependencies($prj, \%incompatibles);
+        remove_from_dependencies($prj, $deps_hash);
+        remove_from_dependencies($prj, \%incompatibles);
     };
     foreach (keys %incompatibles) {
         $$deps_hash{$_} = $incompatibles{$_};
@@ -2373,7 +2288,9 @@ sub prepare_incompatible_build {
     @modules_built = keys %$deps_hash;
     %add_to_config = %$deps_hash;
     if ($prepare) {
-        generate_config_file();
+        if ((!defined $ENV{UPDATER}) || (defined $ENV{CWS_WORK_STAMP})) {
+            SourceConfig->new()->add_active_modules([keys %add_to_config], 0);
+        }
         clear_delivered();
     }
     my $old_output_tree = '';
@@ -2419,16 +2336,16 @@ sub prepare_incompatible_build {
 # Removes projects which it is not necessary to build
 # with -with_branches switch
 #
-sub prepare_build_from {
-    my ($prj, $deps_hash);
-    $deps_hash = shift;
-    my %from_deps_hash = ();   # hash of dependencies of the -from project
-    get_parent_deps($build_from_with_branches, \%from_deps_hash);
-    foreach $prj (keys %from_deps_hash) {
-        delete $$deps_hash{$prj};
-        RemoveFromDependencies($prj, $deps_hash);
-    };
-};
+#sub prepare_build_from {
+#    my ($prj, $deps_hash);
+#    $deps_hash = shift;
+#    my %from_deps_hash = ();   # hash of dependencies of the -from project
+#    get_parent_deps($build_from_with_branches, \%from_deps_hash);
+#    foreach $prj (keys %from_deps_hash) {
+#        delete $$deps_hash{$prj};
+#        remove_from_dependencies($prj, $deps_hash);
+#    };
+#};
 
 #
 # Removes projects which it is not necessary to build
@@ -2445,13 +2362,13 @@ sub prepare_build_all_cont {
         $orig_prj = $` if ($prj =~ /\.link$/o);
         if (($border_prj ne $prj) &&
             ($border_prj ne $orig_prj)) {
-            RemoveFromDependencies($prj, $deps_hash);
+            remove_from_dependencies($prj, $deps_hash);
             next;
         } else {
             if ($build_all_cont) {
                 $$deps_hash{$prj} = ();
             } else {
-                RemoveFromDependencies($prj, $deps_hash);
+                remove_from_dependencies($prj, $deps_hash);
             };
             return;
         };
@@ -2605,15 +2522,15 @@ sub clear_delivered {
         my $undeliver = "$deliver_command $deliver_delete_switches $nul";
 #        my $current_dir = getcwd();
         foreach my $module (sort @modules_built) {
-            if (!chdir($module_paths{$module})) {
-                push(@warnings, "Could not remove delivered files from the module $module. Your build can become inconsistent.\n");
-            } else {
+            if (chdir($module_paths{$module})) {
                 print "Removing delivered from module $module\n";
                 next if ($show);
                 if (system($undeliver)) {
                     $ENV{$_} = $backup_vars{$_} foreach (keys %backup_vars);
                     print_error("Cannot run: $undeliver");
                 }
+            } else {
+                push(@warnings, "Could not remove delivered files from the module $module. Your build can become inconsistent.\n");
             };
         };
 #        chdir $current_dir;
@@ -3520,9 +3437,9 @@ sub get_job_string {
             };
         } while (!$job_dir);
     } else {
-        $dependencies_hash = \%LocalDepsHash;
+        $dependencies_hash = \%local_deps_hash;
         do {
-            $job_dir = pick_prj_to_build(\%LocalDepsHash);
+            $job_dir = pick_prj_to_build(\%local_deps_hash);
             if (!$job_dir && !children_number()) {
                 cancel_build() if (scalar keys %broken_build);
                 mp_success_exit();
@@ -3577,7 +3494,7 @@ sub pick_jobdir {
         if ((!scalar keys %$prj_deps_hash) && !$running_children{$prj_deps_hash}) {
             if (!defined $modules_with_errors{$prj_deps_hash} || $ignore)
             {
-                RemoveFromDependencies($Prj, \%global_deps_hash);
+                remove_from_dependencies($Prj, \%global_deps_hash);
                 $build_is_finished{$Prj}++;
                 splice (@$build_queue, $i, 1);
                 next;
diff --git a/solenv/bin/build_client.pl b/solenv/bin/build_client.pl
index 8c8151f0a9b8..54a5c4f84de2 100755
--- a/solenv/bin/build_client.pl
+++ b/solenv/bin/build_client.pl
@@ -5,14 +5,10 @@ eval 'exec perl -S $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: build_client.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/checkapi b/solenv/bin/checkapi
deleted file mode 100755
index f86fcefb93d1..000000000000
--- a/solenv/bin/checkapi
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-PS=":"
-# cygwin:
-if [ "$GUI" = "WNT" ]; then
-    PS=";"
-fi
-
-JARFOLDER=$SOLARVERSION/$INPATH/bin$UPDMINOREXT
-SOLVER_LIB=$SOLARVERSION/$INPATH/lib$UPDMINOREXT
-
-# it is possible to give an other OOoRunner.jar
-if [ -n "$RUNNERJAR" ]; then
-    myCLASSPATH=$RUNNERJAR
-else 
-    myCLASSPATH=$JARFOLDER/OOoRunner.jar
-fi
-
-myCLASSPATH=$myCLASSPATH${PS}${JARFOLDER}/ridl.jar${PS}\
-${JARFOLDER}/unoil.jar${PS}\
-${JARFOLDER}/jurt.jar${PS}\
-${JARFOLDER}/juh.jar${PS}\
-${JARFOLDER}/java_uno.jar
-
-myCLASSPATH=$myCLASSPATH${PS}\
-/net/unoapi/export/unoapi/bin/mysql.jar${PS}\
-$SOLVER_LIB
-
-if [ -n "$JAVAI" ]; then
-	JAVABIN=$JAVAI
-elif [ -n "$JAVA_HOME" ]; then
-    if [ "$OS$CPUNAME$CPU" = SOLARISSPARCU ]; then
-        JAVABIN=$JAVA_HOME/bin/sparcv9/java
-    else
-        JAVABIN=$JAVA_HOME/bin/java
-    fi
-else
-    # there seems to be some machines without real java
-    JAVABIN=$(which java)
-    if [ -z "$JAVABIN" ]; then 
-        echo "please set environment variable JAVA_HOME"
-        exit 1
-    fi
-fi
-
-if [ x${USER}x = xx ]; then
-    if [ x${LOGNAME}x = xx ]; then
-        echo "ERROR: could not determine username. Please export variable USER" >&2
-        exit $EXIT_FAILURE
-    else 
-        USER=$LOGNAME
-        export USER
-    fi
-fi
-
-PARAM="-cs pipe,name=$USER -SRC_ROOT $SRC_ROOT"
-
-if [ -n "$RUNNERPROPS" ]; then
-    PARAM="$PARAM -runnerini $RUNNERPROPS"
-fi
-
-DEBUG_THE_API=""
-if [ -n "$DEBUGAPI" ]; then
-    export DEBUGAPI="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9002,suspend=y" 
-    DEBUG_THE_API=$DEBUGAPI
-fi
-
-COMMAND="$JAVABIN -Xmx120m $DEBUG_THE_API -cp $myCLASSPATH org.openoffice.Runner $PARAM $*"
-echo $COMMAND
-$COMMAND
-# if COMMAND fails, it returns also the exitcode
diff --git a/solenv/bin/checkapi.btm b/solenv/bin/checkapi.btm
deleted file mode 100644
index 7af444eb601f..000000000000
--- a/solenv/bin/checkapi.btm
+++ /dev/null
@@ -1,44 +0,0 @@
-@echo off
-
-setlocal
-
-SET JARFOLDER=%SOLARVERSION%\%INPATH%\bin%UPDMINOREXT%
-
-IFF "%RUNNERJAR%" != "" THEN
-    SET APICLASSPATH=%RUNNERJAR%
-ELSE
-    SET APICLASSPATH=%JARFOLDER%\OOoRunner.jar
-ENDIFF
-
-SET APICLASSPATH=%APICLASSPATH%;%JARFOLDER%\ridl.jar;%JARFOLDER%\unoil.jar;%JARFOLDER%\jurt.jar;%JARFOLDER%\juh.jar;%JARFOLDER%\java_uno.jar;\\unoapi\export\unoapi\bin\mysql.jar
-
-IFF "%JAVAI%" != "" THEN
-    SET JAVABIN=%JAVAI%
-ELSEIFF "%JAVA_HOME%" != "" THEN
-    SET JAVABIN=%JAVA_HOME%\bin\java
-ELSE
-   echo please set environment variable JAVA_HOME
-   exit 1
-ENDIFF
-
-SET PARAM=-cs pipe,name=%USERNAME% -SRC_ROOT %SRC_ROOT%
-
-IFF "%RUNNERPROPS%" != "" THEN
-    SET PARAM=%PARAM% -runnerini %RUNNERPROPS%
-ENDIFF
-
-rem SET MYXDEBUG=""
-IFF "%XDEBUG%" != "" THEN
-    REM SET XDEBUG=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8001 
-    SET MYXDEBUG=%XDEBUG%
-ENDIFF
-
-set COMMAND=%JAVABIN% -Xmx120m %MYXDEBUG% -cp %APICLASSPATH% org.openoffice.Runner %PARAM% %&
-
-
-echo %COMMAND
-%COMMAND
-
-endlocal
-
-quit
diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh
index e64b8fd2aa4c..e8faa516a852 100755
--- a/solenv/bin/checkdll.sh
+++ b/solenv/bin/checkdll.sh
@@ -3,14 +3,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: header.hxx,v $
-#
-# $Revision: 1.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/cleandiff.pl b/solenv/bin/cleandiff.pl
index 6b2e1fbe7244..c7fc80487a7f 100644
--- a/solenv/bin/cleandiff.pl
+++ b/solenv/bin/cleandiff.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cleandiff.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/cleanzip.pl b/solenv/bin/cleanzip.pl
index 87ff24ffa7ef..8103a13945b1 100755
--- a/solenv/bin/cleanzip.pl
+++ b/solenv/bin/cleanzip.pl
@@ -3,14 +3,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cleanzip.pl,v $
-#
-# $Revision$
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/clipatchconfig.pl b/solenv/bin/clipatchconfig.pl
index aa73d86991d2..365e0bb14950 100644
--- a/solenv/bin/clipatchconfig.pl
+++ b/solenv/bin/clipatchconfig.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: clipatchconfig.pl,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/convertlinks.pl b/solenv/bin/convertlinks.pl
index c8644aa4c9af..09b298bd5ea5 100644
--- a/solenv/bin/convertlinks.pl
+++ b/solenv/bin/convertlinks.pl
@@ -2,7 +2,7 @@
 # convertlinks - a perl script to make hrefs to
 # http://api.openoffice.org/common/ref relativ.
 #
-# Copyright (c) 2000 Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 
 use File::Find;
diff --git a/solenv/bin/converttags.pl b/solenv/bin/converttags.pl
index 641b83d696b6..aa2fe63c6ce8 100644
--- a/solenv/bin/converttags.pl
+++ b/solenv/bin/converttags.pl
@@ -2,7 +2,7 @@
 # converttags - a perl script to coonvert some predefined tags
 # to user specified values
 #
-# Copyright (c) 2000 Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 
 if($#ARGV == -1)
diff --git a/solenv/bin/createpdbrelocators.pl b/solenv/bin/createpdbrelocators.pl
index 8b6218adbab2..75047f3952f5 100644
--- a/solenv/bin/createpdbrelocators.pl
+++ b/solenv/bin/createpdbrelocators.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: createpdbrelocators.pl,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl
index 801d62add78c..f3abc0a7a320 100644
--- a/solenv/bin/cws.pl
+++ b/solenv/bin/cws.pl
@@ -3,14 +3,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cws.pl,v $
-#
-# $Revision: 1.1.2.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,6 +34,7 @@ use strict;
 use Getopt::Long;
 use File::Basename;
 use File::Path;
+use File::Copy;
 use Cwd;
 use Benchmark;
 
@@ -62,7 +59,7 @@ use Cws;
 # TODO: replace dummy vales with actual SVN->hg and source_config migration milestones
 my $dev300_migration_milestone = 'm64';
 my $dev300_source_config_milestone = 'm65';
-my $ooo320_migration_milestone = 'm999';
+my $ooo320_migration_milestone = 'm13';
 my $ooo320_source_config_milestone = 'm999';
 
 # valid command with possible abbreviations
@@ -71,7 +68,6 @@ my @valid_commands = (
                         'create',
                         'fetch',  'f',
                         'rebase', 'rb',
-                        'analyze', 'an',
                         'query', 'q',
                         'task', 't',
                         'integrate',
@@ -87,7 +83,6 @@ my %valid_options_hash = (
                             'fetch'      => ['help', 'switch', 'milestone', 'childworkspace','platforms','quiet',
                                             'onlysolver'],
                             'rebase'     => ['help', 'milestone','commit'],
-                            'analyze'    => ['help'],
                             'query'      => ['help', 'milestone','masterworkspace','childworkspace'],
                             'task'       => ['help'],
                             'integrate'  => ['help', 'childworkspace'],
@@ -159,9 +154,6 @@ sub parse_command_line
     elsif ($command eq 'rb') {
         $command = 'rebase';
     }
-    elsif ($command eq 'an') {
-        $command = 'analyze';
-    }
     elsif ($command eq 'q') {
         $command = 'query';
     }
@@ -477,19 +469,7 @@ sub hgrc_append_push_path_and_hooks
     close(HGRC);
 }
 
-sub is_hg_strip_available
-{
-    my $profile = hg_show();
-
-    foreach (@{$profile}) {
-        if ( $_ =~ /hgext.mq=/ ) {
-            return 1;
-        }
-    }
-    return 0;
-}
-
-sub hg_clone_repository
+sub hg_clone_cws_or_milestone
 {
     my $rep_type             = shift;
     my $cws                  = shift;
@@ -530,74 +510,75 @@ sub hg_clone_repository
         }
     }
 
-    # clone from local source if possible, otherwise from LAN source
-    if ( -d $master_local_source && can_use_hardlinks($master_local_source, dirname($target)) ) {
-        hg_local_clone_repository($master_local_source, $target, $milestone_tag);
-    }
-    else {
-        hg_lan_clone_repository($master_lan_source, $target, $milestone_tag);
-    }
-
-    # now pull from the remote cws outgoing repository if it already contains something
+    my $pull_from_remote = 0;
+    my $cws_remote_source;
     if ( !$clone_milestone_only ) {
-        my $cws_remote_source = "$hg_remote_source/cws/" . $cws->child();
+        $cws_remote_source = "$hg_remote_source/cws/" . $cws->child();
 
         # The outgoing repository might not yet be available. Which is not
         # an error. Since pulling from the cws outgoing URL results in an ugly
-        # and hardly understandable error message, we check for the availaility
+        # and hardly understandable error message, we check for availibility
         # first. TODO: incorporate configured proxy instead of env_proxy. Use
         # a dedicated request and content-type to find out if the repo is there
         # instead of parsing the content of the page
+        print_message("... check availibility of 'outgoing' repository '$cws_remote_source'.");
         require LWP::Simple;
         my $content = LWP::Simple::get($cws_remote_source);
         my $pattern = "<title>cws/". $cws->child();
         if ( $content =~ /$pattern/ ) {
-            hg_remote_pull_repository($cws_remote_source, $target);
+            $pull_from_remote = 1;
         }
         else {
-            print_message("The 'outgoing' repository '$cws_remote_source' is not accessible/available");
+            print_message("... 'outgoing' repository '$cws_remote_source' is not accessible/available yet.");
         }
-        hgrc_append_push_path_and_hooks($target, $cws_remote_source);
     }
 
-    # update the result
-    hg_update_repository($target);
-
-}
+    # clone repository (without working tree if we still need to pull from remote)
+    my $clone_with_update = !$pull_from_remote;
+    hg_clone_repository($master_local_source, $master_lan_source, $target, $milestone_tag, $clone_with_update);
 
-sub hg_local_clone_repository
-{
-    my $local_source  = shift;
-    my $dest          = shift;
-    my $milestone_tag = shift;
+    # now pull from the remote cws outgoing repository if its already available
+    if ( $pull_from_remote ) {
+        hg_remote_pull_repository($cws_remote_source, $target);
+    }
 
-    # fastest way to clone a repository up to a certain milestone
-    # 1) clone w/o -r options (hard links!)
-    # 2) find (local) revision which corresponds to milestone
-    # 3) strip revision+1
+    # if we fetched a CWS adorn the result with push-path and hooks
+    if ( $cws_remote_source ) {
+        hgrc_append_push_path_and_hooks($target, $cws_remote_source);
+    }
 
-    my $t1 = Benchmark->new();
-    print_message("... clone LOCAL repository '$local_source' to '$dest'");
-    hg_clone($local_source, $dest, '-U');
-    my $id_option = "-n -r $milestone_tag";
-    my $revision = hg_ident($dest, $milestone_tag);
-    if ( defined($revision) ) {
-        my $strip_revision = $revision+1;
-        hg_strip($dest, $revision);
+    # update the result if necessary
+    if ( !$clone_with_update ) {
+        hg_update_repository($target);
     }
-    my $t2 = Benchmark->new();
-    print_time_elapsed($t1, $t2) if $profile;
+
 }
 
-sub hg_lan_clone_repository
+sub hg_clone_repository
 {
+    my $local_source    = shift;
     my $lan_source    = shift;
     my $dest          = shift;
     my $milestone_tag = shift;
+    my $update        = shift;
 
     my $t1 = Benchmark->new();
-    print_message("... clone LAN repository '$lan_source' to '$dest'");
-    hg_clone($lan_source, $dest, "-U -r $milestone_tag");
+    my $source;
+    my $clone_option = $update ? '' : '-U ';
+    if ( -d $local_source && can_use_hardlinks($local_source, $dest) ) {
+        $source = $local_source;
+        if ( !hg_milestone_is_latest_in_repository($local_source, $milestone_tag) ) {
+                $clone_option .= "-r $milestone_tag";
+        }
+        print_message("... clone LOCAL repository '$local_source' to '$dest'");
+    }
+    else {
+        $source = $lan_source;
+        $clone_option .= "-r $milestone_tag";
+        print_message("... clone LAN repository '$lan_source' to '$dest'");
+    }
+    hg_clone($source, $dest, $clone_option);
+
     my $t2 = Benchmark->new();
     print_time_elapsed($t1, $t2) if $profile;
 }
@@ -625,6 +606,21 @@ sub hg_update_repository
     print_time_elapsed($t1, $t2) if $profile;
 }
 
+sub hg_milestone_is_latest_in_repository
+{
+    my $repository = shift;
+    my $milestone_tag = shift;
+
+    # Our milestone is the lastest thing in the repository
+    # if the parent of the repository tip is adorned
+    # with the milestone tag.
+    my $tags_of_parent_of_tip = hg_parent($repository, 'tip', "--template='{tags}\\n'");
+    if ( $tags_of_parent_of_tip =~ /\b$milestone_tag\b/ ) {
+        return 1;
+    }
+    return 0;
+}
+
 # Check if clone source and destination are on the same filesystem,
 # in that case hg clone can employ hard links.
 sub can_use_hardlinks
@@ -638,12 +634,14 @@ sub can_use_hardlinks
     }
     # st_dev is the first field return by stat()
     my @stat_source = stat($source);
-    my @stat_dest = stat($dest);
+    my @stat_dest = stat(dirname($dest));
 
     if ( $debug ) {
-        print STDERR "can_use_hardlinks(): source device: '$stat_source[0]', destination device: '$stat_dest[0]'\n";
+        my $source_result = defined($stat_source[0]) ? $stat_source[0] : 'stat failed';
+        my $dest_result = defined($stat_dest[0]) ? $stat_dest[0] : 'stat failed';
+        print STDERR "CWS-DEBUG: can_use_hardlinks(): source device: '$stat_source[0]', destination device: '$stat_dest[0]'\n";
     }
-    if ( $stat_source[0] == $stat_dest[0] ) {
+    if ( defined($stat_source[0]) && defined($stat_dest[0]) && $stat_source[0] == $stat_dest[0] ) {
         return 1;
     }
     return 0;
@@ -1320,6 +1318,57 @@ sub relink_workspace {
     }
 }
 
+sub fetch_external_tarballs
+{
+    my $source_root_dir = shift;
+    my $external_tarballs_source = shift;
+
+    my $ooo_external_file = "$source_root_dir/ooo/ooo.lst";
+    my $sun_external_file = "$source_root_dir/sun/sun.lst";
+    my $sun_path          = "$source_root_dir/sun";
+
+    my @external_sources_list;
+    push(@external_sources_list, read_external_file($ooo_external_file));
+    if ( -d $sun_path ) {
+        if ( -e $sun_external_file ) {
+            push(@external_sources_list, read_external_file($sun_external_file));
+        }
+        else {
+            print_error("Can't find external file list '$sun_external_file'.", 8);
+        }
+    }
+
+    my $ext_sources_dir = "$source_root_dir/ext_sources";
+    print_message("Copy external tarballs to '$ext_sources_dir'");
+    if ( ! -d $ext_sources_dir) {
+        if ( !mkdir($ext_sources_dir) ) {
+            print_error("Can't create directory '$ext_sources_dir': $!.", 44);
+        }
+    }
+    foreach (@external_sources_list) {
+        if ( ! copy("$external_tarballs_source/$_", $ext_sources_dir) ) {
+            print_error("Can't copy file '$external_tarballs_source' -> '$ext_sources_dir': $!", 0);
+        }
+    }
+    return;
+}
+
+sub read_external_file
+{
+    my $external_file = shift;
+
+    my @external_sources;
+    open(EXT, "<$external_file") or print_error("Can't open file '$external_file' for reading: $!", 98);
+    while(<EXT>) {
+        if ( !/^http:/ ) {
+            chomp;
+            push(@external_sources, $_);
+        }
+    }
+    close(EXT);
+    return @external_sources;
+}
+
 sub update_solver
 {
     my $platform      = shift;
@@ -1528,11 +1577,10 @@ sub do_help
         print STDERR "\thelp (h,?)\n";
         print STDERR "\tcreate\n";
         print STDERR "\tfetch (f)\n";
-        print STDERR "\trebase (rb)\n";
-        print STDERR "\tanalyze (an)\n";
+        print STDERR "\trebase (rb) (SVN only)\n";
         print STDERR "\tquery (q)\n";
         print STDERR "\ttask (t)\n";
-        print STDERR "\tcdiff (cd)\n";
+        print STDERR "\tcdiff (cd) (SVN only)\n";
         print STDERR "\tsetcurrent\n";
         print STDERR "\tintegrate *** release engineers only ***\n";
         print STDERR "\teisclone *** release engineers only ***\n";
@@ -1602,7 +1650,6 @@ sub do_help
 
      }
     elsif ($arg eq 'fetch') {
-        print STDERR "THE USER-INTERFACE TO THIS SUBCOMMAND IS LIKELY TO CHANGE IN FUTURE\n";
         print STDERR "fetch: fetch a milestone or CWS\n";
         print STDERR "usage: fetch [-q] [-s] [-p platforms] [-o] <-m milestone> <workspace>\n";
         print STDERR "usage: fetch [-q] [-s] [-p platforms] [-o] <-c cws> <workspace>\n";
@@ -1625,7 +1672,7 @@ sub do_help
         print STDERR "\t--quiet:                Same as -q\n";
     }
     elsif ($arg eq 'rebase') {
-        print STDERR "rebase: Rebase a child workspace to a new milestone\n";
+        print STDERR "rebase: Rebase a child workspace to a new milestone (SVN only)\n";
         print STDERR "usage: rebase <-m milestone> <workspace>\n";
         print STDERR "usage: rebase <-C> <workspace>\n";
         print STDERR "\t-m milestone:          Merge changes on MWS into CWS up to and including milestone <milestone>\n";
@@ -1645,7 +1692,7 @@ sub do_help
         print STDERR "\t--commit:               Same as -C\n"
     }
     elsif ($arg eq 'cdiff') {
-        print STDERR "cdiff: Show changes on CWS relative to current milestone\n";
+        print STDERR "cdiff: Show changes on CWS relative to current milestone (SVN only)\n";
         print STDERR "usage: cdiff [-M master] [-c child] [--files] [--modules]\n";
         print STDERR "\t-M master:\t\toverride MWS specified in environment\n";
         print STDERR "\t-c child:\t\toverride CWS specified in environment\n";
@@ -2061,14 +2108,6 @@ sub do_rebase
     }
 }
 
-sub do_analyze
-{
-    my $args_ref    = shift;
-    my $options_ref = shift;
-
-    print_error("not yet implemented.", 2);
-}
-
 sub do_integrate
 {
     my $args_ref    = shift;
@@ -2163,26 +2202,18 @@ sub do_fetch
         print STDERR "CWS-DEBUG: SCM: $scm\n";
     }
 
-    if ( $scm eq 'HG' ) {
-        if ( !is_hg_strip_available() ) {
-            print_error("The 'cws fetch' command requires that 'hg strip' is enabled", 0);
-            print_error("Please add the following lines to your hg profile (\$HOME/.hgrc)", 0);
-            print_error("[extensions]", 0);
-            print_error("hgext.mq=", 33);
-        }
-    }
-
     my $config = CwsConfig->new();
     my $ooo_svn_server = $config->get_ooo_svn_server();
     my $so_svn_server = $config->get_so_svn_server();
+    my $prebuild_dir = $config->get_prebuild_binaries_location();
     # Check early for platforms so we can bail out before anything time consuming is done
     # in case of a missing platform
     my @platforms;
-    my $prebuild_dir;
     if ( defined($platforms) ) {
         use Archive::Zip; # warn early if module is missing
-        $prebuild_dir = $config->get_prebuild_binaries_location();
-        $masterws = $cws->master();
+        if ( !defined($prebuild_dir ) ) {
+            print_error("PREBUILD_BINARIES not configured, can't find platform solvers", 99);
+        }
         $prebuild_dir = "$prebuild_dir/$masterws";
 
         @platforms = split(/,/, $platforms);
@@ -2212,8 +2243,8 @@ sub do_fetch
                     $nonproduct = 1;
                 }
             }
-            push(@platforms, 'common.pro') if ($product && !$added_product);
-            push(@platforms, 'common') if ($nonproduct && !$added_nonproduct);
+            unshift(@platforms, 'common.pro') if ($product && !$added_product);
+            unshift(@platforms, 'common') if ($nonproduct && !$added_nonproduct);
         }
 
         foreach(@platforms) {
@@ -2303,8 +2334,8 @@ sub do_fetch
                     svn_checkout($so_url, "$work_master/sun", $quiet);
                 }
                 else{
-                    hg_clone_repository('ooo', $cws, "$work_master/ooo", $clone_milestone_only);
-                    hg_clone_repository('so', $cws, "$work_master/sun", $clone_milestone_only);
+                    hg_clone_cws_or_milestone('ooo', $cws, "$work_master/ooo", $clone_milestone_only);
+                    hg_clone_cws_or_milestone('so', $cws, "$work_master/sun", $clone_milestone_only);
                 }
                 if ( get_source_config_for_milestone($masterws, $milestone) ) {
                     # write source_config file
@@ -2331,12 +2362,20 @@ sub do_fetch
                     svn_checkout($ooo_url, $workspace, $quiet);
                 }
                 else {
-                    hg_clone_repository('ooo', $cws, $workspace, $clone_milestone_only);
+                    hg_clone_cws_or_milestone('ooo', $cws, $workspace, $clone_milestone_only);
                 }
             }
         }
     }
 
+    if ( !$onlysolver ) {
+        my $source_root_dir = "$workspace/$masterws";
+        my $external_tarball_source = "$prebuild_dir/$masterws/ext_sources";
+        if ( -e "$source_root_dir/ooo/ooo.lst" && defined($prebuild_dir) && -d $external_tarball_source ) {
+            fetch_external_tarballs($source_root_dir, $external_tarball_source);
+        }
+    }
+
     if ( defined($platforms) ) {
         if ( !-d $workspace ) {
             if ( !mkdir($workspace) ) {
@@ -2524,6 +2563,9 @@ sub do_cdiff
         print_error("'$childws' is not a valid CWS name.\n", 30);
     }
 
+    if ( $cws->get_scm() eq 'HG' ) {
+        print_error("cws cdiff is not supported for mercurial based childworkspaces", 80);
+    }
     my $milestone = $cws->milestone();
 
     my $config = CwsConfig->new();
@@ -3005,44 +3047,20 @@ sub hg_clone
     return @result;
 }
 
-sub hg_ident
-{
-    my $repository  = shift;
-    my $rev_id = shift;
-
-    if ( $debug ) {
-        print STDERR "CWS-DEBUG: ... hg ident: 'repository', revision: '$rev_id'\n";
-    }
-
-    my @result = execute_hg_command(0, 'ident', "--cwd $repository", "-n -r $rev_id");
-    my $line = $result[0];
-    if ($line =~ /abort: unknown revision/) {
-        return undef;
-    }
-    else {
-        chomp($line);
-        return $line;
-    }
-}
-
-sub hg_strip
+sub hg_parent
 {
     my $repository  = shift;
     my $rev_id = shift;
+    my $options = shift;
 
     if ( $debug ) {
-        print STDERR "CWS-DEBUG: ... hg strip: 'repository', revision: '$rev_id'\n";
+        print STDERR "CWS-DEBUG: ... hg parent: 'repository', revision: '$rev_id', options: $options\n";
     }
 
-    my @result = execute_hg_command(1, 'strip', "--cwd $repository", '-n', $rev_id);
+    my @result = execute_hg_command(0, 'parent', "--cwd $repository", "-r $rev_id", $options);
     my $line = $result[0];
-    if ($line =~ /abort: unknown revision/) {
-        return undef;
-    }
-    else {
-        chomp($line);
-        return $line;
-    }
+    chomp($line);
+    return $line;
 }
 
 sub hg_pull
diff --git a/solenv/bin/cwsattach.pl b/solenv/bin/cwsattach.pl
index 60ad81f2f152..05e1b8df3cb4 100644
--- a/solenv/bin/cwsattach.pl
+++ b/solenv/bin/cwsattach.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cwsattach.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/cwscheckapi b/solenv/bin/cwscheckapi
deleted file mode 100755
index ddb56fd1d7c1..000000000000
--- a/solenv/bin/cwscheckapi
+++ /dev/null
@@ -1,363 +0,0 @@
-#!/bin/bash
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: cwscheckapi,v $
-#
-# $Revision: 1.5 $
-#
-# 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.
-#***********************************************************************/
-
-
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_ERROR=2
-EXIT_BUG=10
-
-# report the given error parameter to cwstestresult if the is one.
-# 0: no error send ok or parameter $2
-# 1: failure
-# 2...: incomplete
-function reportError()
-{
-    ERRORCODE=$1
-    if [ -e $SOLARENV/bin/cwstestresult.pl ]; then
-        if [ $ERRORCODE -eq 0 ]; then
-            PT_STATUS=${2:-ok} # use default 'ok' or $2
-        elif [ $ERRORCODE -eq 1 ]; then
-            PT_STATUS=failed
-        else
-            PT_STATUS=incomplete
-        fi
-
-        if [ "$OSTYPE" == "cygwin" ]; then
-            CWSENV=Windows
-        elif [ "$OSTYPE" == "linux" ]; then
-            CWSENV=Linux
-        elif [ "$OSTYPE" == "solaris" ]; then
-            CWSENV=SolarisX86
-        else
-            CWSENV=Unknown
-        fi
-        perl $SOLARENV/bin/cwstestresult.pl -c $CWS_WORK_STAMP -n CWSCheckAPI -p $CWSENV $PT_STATUS
-    else
-        echo "No cwstestresult.pl found."
-    fi
-}
-
-usage() {
-    echo "Usage: $SCRIPTNAME [-m MODULE1[,MODULEn]] [-k] [-o] [-h] [-d] [-u] [-t] [-s] [-a]" >&2
-    echo "" >&2
-    echo "[-m] list of modules to test like: '-m sw,sc,sd' or '-m all' for all modules" >&2
-    echo "" >&2
-    echo "[-k] keep Office installation, otherwise it will be removed after test" >&2
-    echo "" >&2
-    echo "[-o] force OpenOffice.org installation instead of StarOffice" >&2
-    echo "" >&2
-    echo "[-d] debug installation and UnoAPI-Tests" >&2
-    # echo "" >&2
-    # echo "[-i] debug installation" >&2
-    echo "" >&2
-    echo "[-t] debug UnoAPI-Tests" >&2
-    echo "" >&2
-    echo "[-s] skip installation of Office" >&2
-    echo "" >&2
-    echo "[-a] NoCwsAttach: do not attach UnoAPI-Test result to EIS database" >&2
-    echo "" >&2
-    echo "[-u] UseInstalledOffice: do not install an office" >&2
-    echo "" >&2
-    echo "further informations: http://wiki.services.openoffice.org/wiki/Cwscheckapi" >&2
-    echo "" >&2
-    exit $EXIT_FAILURE
-}
-
-# we start cwscheckapi
-reportError 0 running
-
-if [ "$PROEXT" != ".pro" ]; then
-    echo "ERROR: cwscheckapi works only on pro-versions" >&2
-    reportError 2
-    exit $EXIT_FAILURE
-fi
-
-if [ x${USER}x = xx ]; then
-    if [ x${LOGNAME}x = xx ]; then
-        echo "ERROR: could not determine username. Please export variable USER" >&2
-        reportError 2
-        exit $EXIT_FAILURE
-    else 
-        USER=$LOGNAME
-        export USER
-    fi
-fi
-
-
-
-#DEBUG_I=false
-DEBUG_T=false
-INSTALL=true
-ATTACH=true
-MODULES="auto"
-OOO=false
-KEEPOFFICE=false
-USE_INSTALLED_OFFICE=false
-
-while getopts ':m:dkutsaho' OPTION ; do
-        case $OPTION in
-            d)
-#                DEBUG_I=true
-                DEBUG_T=true
-                ;;
-            m) 
-                MODULES="$OPTARG"
-                ;;
-            k)
-                KEEPOFFICE=true
-                ;;
-            o)
-                OOO=true
-                ;;
-#            i)
-#                DEBUG_I=true
-#                ;;
-            t)
-                DEBUG_T=true
-                ;;
-            s)
-                INSTALL=false
-                ;;
-            a)
-                ATTACH=false
-                ;;
-            u)
-                USE_INSTALLED_OFFICE=true
-                INSTALL=false
-                KEEPOFFICE=true
-                echo "make sure your office is started with parameter -accept=pipe,name=$USER;urp;"
-                ;;
-            h)
-                usage $EXIT_SUCCESS
-                ;;
-            \?)
-            echo "unkown option \"-$OPTARG\"." >&2
-            usage $EXIT_ERROR
-            ;;
-            *)
-                echo "this is not possible...">&2
-                usage $EXIT_BUG
-                ;;
-        esac
-done
-
-shift `expr $OPTIND - 1`
-
-if [ -d /export/home/$USER ]; then
-    CWSCHECKAPIPATH=/export/home/$USER/cwscheckapi
-else
-    if [ -w /export/home ]; then
-        mkdir /export/home/$USER
-        CWSCHECKAPIPATH=/export/home/$USER/cwscheckapi
-    else
-        CWSCHECKAPIPATH=/tmp/$USER/cwscheckapi
-    fi
-fi
-
-# the following line is to cleanup old cwscheckapi-installations. It results form the first version of cwscheckapi
-# The disk space on /tmp is limited. If a lot of users run cwscheckapi a lot of installed offices are in /tmp
-# The new concept is to remove the offices after test. But old unused installations should be removed...
-if [ $CWSCHECKAPIPATH != /tmp/$USER/cwscheckapi ]; then
-    rm -rf /tmp/$USER/cwscheckapi
-fi
-
-LOCALINSTALLDIR=$CWSCHECKAPIPATH/office
-LOCALUNPACKDIR=$CWSCHECKAPIPATH/unpack
-export LOCALINSTALLDIR
-export LOCALUNPACKDIR
-
-unset FORCE2ARCHIVE
-
-if [ $INSTALL = true ]; then
-    
-    date 2>&1
-    
-#    if [ $DEBUG_I = true ]; then
-#        echo "start installation: `date`"
-#        echo call "$SOLARENV/bin/installoffice.pl -cwscheckapi true -dest $LOCALINSTALLDIR -debug $DEBUG_I"
-#    fi
-    perl -w $SOLARENV/bin/installoffice.pl -cwscheckapi true -dest $LOCALINSTALLDIR -ooo $OOO -debug $DEBUG_I
-    
-    EXITVAL=$?
-    
-    if [ $EXITVAL -ne 0 ]; then
-        echo "ERROR: could not install office"
-        reportError 2
-        exit $EXITVAL
-    fi
-    echo "`date` installation successfull, start testing...." 
-fi
-
-SOFFICE="soffice"
-PS=":"
-CYGWIN=""
-
-SHELL="/bin/bash"
-# cygwin:
-if [ "$GUI" = "WNT" ]; then
-    SOFFICE="soffice.exe"
-    PS=";"
-    CYGWIN="-Cygwin true"
-    SHELL=$(which bash)
-    SHELL=$(cygpath -w $SHELL)
-    if [ ! -f $SHELL ]; then
-        echo "could not determine bash shell" 
-        reportError 2
-        exit 1
-    fi
-fi
-
-# if [ $DEBUG_T = true ]; then
-#     echo find $LOCALINSTALLDIR -name $SOFFICE
-# fi
-
-if [ $USE_INSTALLED_OFFICE = false ]; then
-
-    OFFICEBIN=`find $LOCALINSTALLDIR -name $SOFFICE`
-
-    if [ ! -f "$OFFICEBIN" ]; then
-        echo "could not find 'soffice' in subfolders of $LOCALINSTALLDIR"
-        reportError 2
-        exit 1
-    fi
-
-    if [ "$GUI" = "WNT" ]; then
-    # transform /tmp/... -> c:\tmp\...
-        OFFICEBIN=`cygpath -w $OFFICEBIN`
-    fi
-else
-    OFFICEBIN=$SOFFICE
-    echo "Use already installed and running office."
-fi
-
-JARFOLDER=$SOLARVERSION/$INPATH/bin$UPDMINOREXT
-SOLVER_LIB=$SOLARVERSION/$INPATH/lib$UPDMINOREXT
-
-myCLASSPATH=${PS}${JARFOLDER}/ridl.jar${PS}\
-${JARFOLDER}/unoil.jar${PS}\
-${JARFOLDER}/jurt.jar${PS}\
-${JARFOLDER}/juh.jar${PS}\
-${JARFOLDER}/java_uno.jar
-
-myCLASSPATH=$myCLASSPATH${PS}\
-${JARFOLDER}/OOoRunner.jar
-
-myCLASSPATH=$myCLASSPATH${PS}\
-/net/unoapi/export/unoapi/bin/mysql.jar${PS}\
-$SOLVER_LIB
-
-PARAM=""
-if [ -n "$JAVAI" ]; then
-    JAVABIN=$JAVAI
-elif [ -n "$JAVA_HOME" ]; then
-    if [ "$OS$CPUNAME$CPU" = SOLARISSPARCU ]; then
-        JAVABIN=$JAVA_HOME/bin/sparcv9/java
-    else
-        JAVABIN=$JAVA_HOME/bin/java
-    fi
-else
-    echo "please set environment variable JAVA_HOME"
-    reportError 2
-    exit 1
-fi
-
-if [ -n "$WORK_STAMP" ]; then
-    if [ -n "$CWS_WORK_STAMP" ]; then
-        PARAM="$PARAM -Version cws_${CWS_WORK_STAMP}"
-    else
-        echo "######"
-        echo CAUTION! You are working on the MWS
-        echo "######"
-        PARAM="$PARAM -Version ${WORK_STAMP}_${UPDMINOR}"
-    fi
-fi
-
-PARAM="$PARAM -cmd '$OFFICEBIN -nofirststartwizard -accept=pipe,name=$USER;urp; -norestore -nocrashreport -nolockcheck -enableautomation'"
-PARAM="$PARAM -cs pipe,name=$USER"
-PARAM="$PARAM -NoOffice true"
-PARAM="$PARAM -SRC_ROOT $SRC_ROOT"
-PARAM="$PARAM -COMP_ENV $OUTPATH"
-PARAM="$PARAM -Shell $SHELL"
-PARAM="$PARAM $CYGWIN"
-PARAM="$PARAM -tb java_complex"
-PARAM="$PARAM -TimeOut 90000"
-PARAM="$PARAM -o complex.unoapi.CheckModuleAPI::module($MODULES)"
-if [ $ATTACH = false ]; then
-    PARAM="$PARAM -nca true"
-fi
-if [ $DEBUG_T = true ]; then
-    PARAM="$PARAM -debug true -log true"
-fi
-
-# Sample command
-# /so/env/Linux_JDK_1.5.0_06/bin/java
-# -Xmx120m $XDEBUG
-# -cp :/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/ridl.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/unoil.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/jurt.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/juh.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/java_uno.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/bin.m50/OOoRunner.jar:/net/unoapi/export/unoapi/bin/mysql.jar:/net/so-cwsserv02/export/cws/unoapi04/DEV300/unxlngi6.pro/lib.m50
-# org.openoffice.Runner
-# -Version cws_unoapi04
-# -cmd '/tmp/ll93751/cwscheckapi/office/staroffice9/program/soffice -nofirststartwizard -accept=pipe,name=ll93751;urp; -norestore -nocrashreport -nolockcheck -enableautomation'
-# -cs pipe,name=ll93751
-# -NoOffice true
-# -SRC_ROOT /net/so-cwsserv02/export/cws/unoapi04/DEV300/src.m50
-# -COMP_ENV unxlngi6
-# -Shell /bin/bash 
-# -tb java_complex
-# -TimeOut 90000 
-# -o 'complex.unoapi.CheckModuleAPI::module(auto)'
-
-# XDEBUG=" -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=9003,suspend=y "
-
-# set DEBUGAPI if you want to debug the checkapi
-# DEBUGAPI=t
-
-COMMAND="$JAVABIN -Xmx120m $XDEBUG -cp $myCLASSPATH org.openoffice.Runner $PARAM $*"
-echo "$COMMAND"
-
-LOGFILE=$CWSCHECKAPIPATH/cwscheckapi.log
-$COMMAND | tee $LOGFILE
-EXITVAL=$?
-
-if [ $KEEPOFFICE = false ]; then
-    echo "remove office instrallation in $LOCALINSTALLDIR..."
-    rm -rf $LOCALINSTALLDIR
-fi
-
-echo
-echo A logfile could be found here: $LOGFILE
-
-date 2>&1
-
-# send the results via cwstestresult.pl to EIS
-if [ $EXITVAL -eq 0 ]; then
-    reportError 0 ok
-else
-    reportError 1
-fi
diff --git a/solenv/bin/cwscheckapi.btm b/solenv/bin/cwscheckapi.btm
deleted file mode 100755
index 64c624dd4bba..000000000000
--- a/solenv/bin/cwscheckapi.btm
+++ /dev/null
@@ -1,208 +0,0 @@
-@echo off
-REM **************************************************************************
-REM * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-REM * 
-REM * Copyright 2008 by Sun Microsystems, Inc.
-REM *
-REM * OpenOffice.org - a multi-platform office productivity suite
-REM *
-REM * $RCSfile: cwscheckapi.btm,v $
-REM *
-REM * $Revision: 1.3.6.4 $
-REM *
-REM * This file is part of OpenOffice.org.
-REM *
-REM * OpenOffice.org is free software: you can redistribute it and/or modify
-REM * it under the terms of the GNU Lesser General Public License version 3
-REM * only, as published by the Free Software Foundation.
-REM *
-REM * OpenOffice.org is distributed in the hope that it will be useful,
-REM * but WITHOUT ANY WARRANTY; without even the implied warranty of
-REM * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-REM * GNU Lesser General Public License version 3 for more details
-REM * (a copy is included in the LICENSE file that accompanied this code).
-REM *
-REM * You should have received a copy of the GNU Lesser General Public License
-REM * version 3 along with OpenOffice.org.  If not, see
-REM * <http://www.openoffice.org/license.html>
-REM * for a copy of the LGPLv3 License.
-REM ************************************************************************/
-
-rem echo on
-
-call reportErrorCheckAPI.btm 0 running
-
-iff "%PROEXT" != ".pro" THEN
-    echo ERROR: cwscheckapi works only on pro-versions >&2
-    call reportErrorCheckAPI.btm 2
-    quit 1
-endiff
-
-SET DEBIG_I=false
-SET DEBUG_T=false
-SET INSTALL=true
-SET ATTACH=true
-SET MODULES=auto
-SET OOO=false
-SET KEEPOFFICE=false
-SET USE_INSTALLED_OFFICE=false
-
-for %opt in (%&%) DO (
-    if "%opt%" == "-d" (SET DEBUG_I=true ^ SET DEBUG_T=true ^ shift)
-    if "%opt%" == "-o" (SET OOO=true  ^ shift)
-    if "%opt%" == "-k" (SET KEEPOFFICE=true  ^ shift)
-    if "%opt%" == "-i" (SET DEBUG_I=true  ^ shift)
-    if "%opt%" == "-m" (SET MODULES=%2  ^ shift ^ shift)
-    if "%opt%" == "-t" (SET DEBUG_T=true ^ shift)
-    if "%opt%" == "-s" (SET INSTALL=false ^ shift)
-    if "%opt%" == "-u" (SET USE_INSTALLED_OFFICE=true ^ SET INSTALL=false ^ SET KEEPOFFICE=true ^ shift)
-    if "%opt%" == "-a" (SET attach=false ^ shift)
-    if "%opt%" == "-h" goto usage
-    if "%opt%" == "/h" goto usage
-)
-
-set tmppath=not_set
-for %LW in (e:\,d:\,c:\) DO (
-    iff NOT ISDIR %tmppath% then
-        iff ISDIR %LW  then
-            iff ISDIR %LW%temp then
-                set tmppath=%LW%temp
-            elseiff ISDIR %LW%tmp then
-                set tmppath=%LW%tmp
-            else
-                mkdir %LW%temp
-                set tmppath=%LW%temp
-            endiff
-        endiff
-    endiff
-)
-
-SET CWSCHECKAPIPATH=%tmppath%\%USERNAME%\cwscheckapi
-SET LOCALINSTALLDIR=%CWSCHECKAPIPATH%\office
-SET LOCALUNPACKDIR=%CWSCHECKAPIPATH%\unpack
-
-iff "%INSTALL%" == "true" THEN
-    call perl5 %SOLARENV%/bin/installoffice.pl -cwscheckapi true -dest %LOCALINSTALLDIR% -ooo %OOO% -debug %DEBUG_I%
-    
-    IFF %? NE 0 THEN
-        echo ERROR: coud not install office  >&2
-        call reportErrorCheckAPI.btm 2
-        quit %?
-    ENDIFF
-ENDIFF
-
-setlocal
-
-IFF %USE_INSTALLED_OFFICE% == "false" then
-
-    SET CWD=%_CWD%
-    cdd %LOCALINSTALLDIR%
-    SET ffindtxt="ffind.txt"
-    ffind /s /f /m soffice.exe > %ffindtxt
-    SET FindFile=%@FILEOPEN[%ffindtxt%, READ]
-    SET OfficeBin=%@FILEREAD[%FindFile]
-    set dummy=%@FILECLOSE[%FindFile]
-    DEL /q %ffindtxt
-    cdd %CWD
-
-    IFF NOT EXIST %OFFICEBIN% THEN
-        echo could not find 'soffice.exe' in subfolders of %OFFICEBIN%  >&2
-        call reportErrorCheckAPI.btm 2
-        quit 1
-    ENDIFF
-ELSE
-    SET OFFICEBIN=soffice.exe
-    echo "Use already installed office."
-ENDIFF
-
-SET JARFOLDER=%SOLARVERSION%\%INPATH%\bin%UPDMINOREXT%
-SET MYCLASSPATH=%JARFOLDER%\OOoRunner.jar;%JARFOLDER%\ridl.jar;%JARFOLDER%\unoil.jar;%JARFOLDER%\jurt.jar;%JARFOLDER%\juh.jar;%JARFOLDER%\java_uno.jar
-
-IFF "%JAVAI%" != "" THEN
-    SET JAVABIN=%JAVAI%
-ELSEIFF "%JAVA_HOME%" != "" THEN
-    SET JAVABIN=%JAVA_HOME%\bin\java
-ELSE
-   echo please set environment variable JAVA_HOME  >&2
-   call reportErrorCheckAPI.btm 2
-   quit 1
-ENDIFF
-
-IFF "%CWS_WORK_STAMP%" != "" THEN
-    SET PARAM=-Version cws_%CWS_WORK_STAMP%
-ELSEIFF "%WORK_STAMP%" != "" THEN
-    echo ######  >&2
-    echo CAUTION! You\'re working on the MWS  >&2
-    echo ######  >&2
-    SET PARAM=-Version %WORK_STAMP%_%UPDMINOR%
-ELSE
-    echo ######  >&2
-    echo ERROR: could not determine your CWS or MWS version  >&2
-    echo ######  >&2
-    call reportErrorCheckAPI.btm 2
-    quit 1
-ENDIFF
-
-SET KILLCOMMAND="%SOLARVERSION%\%INPATH%\bin%UPDMINOREXT%\kill.exe -9 soffice.bin^%SOLARVERSION%\%INPATH%\bin%UPDMINOREXT%\kill.exe -9 soffice.exe"
-
-SET PARAM=%PARAM% -cmd '\"%OFFICEBIN%\"  -nofirststartwizard -norestore -nocrashreport -nolockcheck -enableautomation -accept=pipe,name=%USERNAME%;urp;'
-SET PARAM=%PARAM% -cs pipe,name=%USERNAME%
-SET PARAM=%PARAM% -NoOffice true
-SET PARAM=%PARAM% -SRC_ROOT %SRC_ROOT%
-SET PARAM=%PARAM% -COMP_ENV %OUTPATH%
-SET PARAM=%PARAM% -Shell %COMSPEC%
-SET PARAM=%PARAM% -tb java_complex
-SET PARAM=%PARAM% -o complex.unoapi.CheckModuleAPI::module(%MODULES%)
-SET PARAM=%PARAM% -TimeOut 200000
-SET PARAM=%PARAM% -AppKillCommand %KILLCOMMAND%
-IF "%ATTACH%" == "false" SET PARAM=%PARAM% -nca true
-IF "%DEBUG_T%" == "true" SET PARAM=%PARAM -debug true -log true
-
-set COMMANDO=%JAVABIN% -Xmx120m -cp %MYCLASSPATH% org.openoffice.Runner %PARAM% %&
-
-echo %COMMANDO
-SET LOGFILE=%CWSCHECKAPIPATH%\cwscheckapi.log
-%COMMANDO |& tee %LOGFILE%
-set EXITVAL=%?
-
-IFF %KEEPOFFICE% == "false" THEN
-    echo remove office instrallation in %LOCALINSTALLDIR%...
-    DEL /E/F/Q/K/S/X/Y/Z %LOCALINSTALLDIR%
-fi
-
-echo .
-echo A logfile could be found here: %LOGFILE%
-
-IFF %EXITVAL% NE 0 THEN
-    call reportErrorCheckAPI.btm 1
-ELSE
-    call reportErrorCheckAPI.btm 0 ok
-ENDIFF
-
-endlocal
-
-quit 0
-
-:usage
-    echo. 
-    echo Usage: %0% [-m MODULE1[,MODULEn]] [-o] [-k] [-h] [-d] [-i] [-t] [-s] [-a] >&2
-    echo. 
-    echo [-m] list of modules to test like: '-m "sw,sc,sd"' or '-m all' for all modules >&2
-    echo. >&2
-    echo [-o] force OpenOffice.org installation instead of StarOffice >&2
-    echo. >&2
-    echo [-k] keep Office installation, otherwise it will be removed after test >&2
-    echo. >&2
-    echo [-d] debug installation and UnoAPI-Tests >&2
-    echo. >&2
-    echo [-i] debug installation >&2
-    echo. >&2
-    echo [-t] debug UnoAPI-Tests >&2
-    echo. >&2
-    echo [-s] skip installation of Office >&2
-    echo. >&2
-    echo [-a] NoCwsAttach: do not attach UnoAPI-Test result to EIS database >&2
-    echo. >&2
-    echo further informations: http://wiki.services.openoffice.org/wiki/Cwscheckapi >&2
-    echo. >&2
-   quit 1
diff --git a/solenv/bin/cwstestresult.pl b/solenv/bin/cwstestresult.pl
index c786870b4c61..43b41ff7b5e8 100644
--- a/solenv/bin/cwstestresult.pl
+++ b/solenv/bin/cwstestresult.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cwsattach.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/cwstouched.pl b/solenv/bin/cwstouched.pl
index 03e5095e78b4..eb306277580c 100755
--- a/solenv/bin/cwstouched.pl
+++ b/solenv/bin/cwstouched.pl
@@ -5,7 +5,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #*************************************************************************
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -25,6 +25,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 use strict;
diff --git a/solenv/bin/cwstouched.py b/solenv/bin/cwstouched.py
index 6ed3e67757b2..87dfe4b03595 100755
--- a/solenv/bin/cwstouched.py
+++ b/solenv/bin/cwstouched.py
@@ -3,7 +3,7 @@
 #*************************************************************************
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -23,6 +23,7 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 import os
diff --git a/solenv/bin/dbgsv.ini b/solenv/bin/dbgsv.ini
new file mode 100644
index 000000000000..006dadf98a40
--- /dev/null
+++ b/solenv/bin/dbgsv.ini
@@ -0,0 +1,29 @@
+=*************************************************************************
+=
+= 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.
+=
+=***********************************************************************/
+
+[output]
+error=shell
diff --git a/solenv/bin/deliver.pl b/solenv/bin/deliver.pl
index 0d6c8b27afa4..a4fc9f21d2b5 100755
--- a/solenv/bin/deliver.pl
+++ b/solenv/bin/deliver.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: deliver.pl,v $
-#
-# $Revision$
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -111,9 +107,17 @@ $opt_checkdlst      = 0;
 $delete_common      = 1;            # for "-delete": if defined delete files from common tree also
 
 if ($^O ne 'cygwin') {              # iz59477 - cygwin needes a dot "." at the end of filenames to disable
-  $maybedot     = '';               # some .exe transformation magic.
+    $maybedot     = '';             # some .exe transformation magic.
 } else {
-  $maybedot     = '.';
+    my $cygvernum = `uname -r`;
+    my @cygvernum = split( /\./, $cygvernum);
+    $cygvernum = shift @cygvernum;
+    $cygvernum .= shift @cygvernum;
+    if ( $cygvernum < 17 ) {
+        $maybedot     = '.';
+    } else {
+        $maybedot     = '';               # no longer works with cygwin 1.7. other magic below.
+    }
 }
 
 ($gui       = lc($ENV{GUI}))        || die "Can't determine 'GUI'. Please set environment.\n";
@@ -832,6 +836,11 @@ sub copy_if_newer
             sleep $try;
             $try ++;
             $success = rename($temp_file, $to);
+            if ( $^O eq 'cygwin' && $to =~ /\.bin$/) {
+                # hack to survive automatically added .exe for executables renamed to
+                # *.bin - will break if there is intentionally a .bin _and_ .bin.exe file.
+                $success = rename( "$to.exe", $to ) if -f "$to.exe";
+            }
         }
         if ( $success ) {
             # handle special packaging of *.dylib files for Mac OS X
@@ -1204,16 +1213,7 @@ sub zip_files
         next if ( $opt_check );
 
         local $work_file = "";
-        if ( $ext) {
-            # We are delivering into a minor. Zip files must not contain the
-            # minor extension, so we have to pre and post process it.
-            #
-            # Pre process: add minor extension to path, create working copy in
-            # temp directory.
-            $work_file = get_tempfilename() . ".zip";
-            die "Error: temp file $work_file already exists" if ( -e $work_file);
-            zipped_path_extension($zip_file, $work_file, $ext, 1) if ( -e $zip_file );
-        } elsif ( $zip_file eq $common_zip_file) {
+        if ( $zip_file eq $common_zip_file) {
             # Zip file in common tree: work on uniq copy to avoid collisions
             $work_file = $zip_file;
             $work_file =~ s/\.zip$//;
@@ -1263,14 +1263,9 @@ sub zip_files
                 print ZIP "$file\n";
             }
             close(ZIP);
+            fix_broken_cygwin_created_zips($work_file) if $^O eq "cygwin";
         }
-        if ( $ext ) {
-            # Post process: strip minor from stored path again
-            zipped_path_extension($work_file, $zip_file, $ext, 0);
-            if (( -e $work_file ) && ($work_file ne $zip_file)) {
-                unlink $work_file;
-            }
-        } elsif ( $zip_file eq $common_zip_file) {
+        if ( $zip_file eq $common_zip_file) {
             # rename work file back
             if ( -e $work_file ) {
                 if ( -e $zip_file) {
@@ -1294,45 +1289,30 @@ sub zip_files
     }
 }
 
-sub zipped_path_extension
+sub fix_broken_cygwin_created_zips
 # add given extension to or strip it from stored path
 {
     require Archive::Zip; import Archive::Zip;
-    my ($from, $to, $extension, $with_ext) = @_;
+    my $zip_file = shift;
 
     $zip = Archive::Zip->new();
-    if ( -e $from) {
-        die 'Error: zip read error' unless $zip->read( $from) == 0;
-        my $name;
-        my $newmember;
-        my $DateTime = 0;
-        foreach my $member ( $zip->members() ) {
-            $name = $member->fileName();
-            if ( $with_ext ) {
-                if ( $name !~ m#$extension/# ) {
-                    $name =~ s#^(.*?)/#$1$extension/#o;
-                }
-            } else {
-                $name =~ s#^(.*?)$extension/#$1/#o;
-            }
-            $member->fileName( $name );
-            if ( $member->lastModTime() ) {
-                if ( $DateTime < $member->lastModTime() ) {
-                    $DateTime = $member->lastModTime();
-                }
-            }
+    unless ( $zip->read($work_file) == AZ_OK ) {
+        die "Error: can't open zip file '$zip_file' to fix broken cygwin file permissions";
+    }
+    my $latest_member_mod_time = 0;
+    foreach $member ( $zip->members() ) {
+        my $attributes = $member->unixFileAttributes();
+        $attributes &= ~0xFE00;
+        print $member->fileName($name) . ": " . sprintf("%lo", $attributes) if $is_debug;
+        $attributes |= 0x10; # add group write permission
+        print "-> " . sprintf("%lo", $attributes) . "\n" if $is_debug;
+        $member->unixFileAttributes($attributes);
+        if ( $latest_member_mod_time < $member->lastModTime() ) {
+            $latest_member_mod_time = $member->lastModTime();
         }
-        if ( -e $to ) {
-            die 'Error: zip write error' unless $zip->overwrite( ) == 0;
-            File::Copy::move( $from, $to) or die "Error $!: cannot move $from $to";
-        } else {
-            die 'Error: zip write error' unless $zip->writeToFileNamed( $to ) == 0;
-        }
-        utime $DateTime, $DateTime, $to;
-    } else {
-        die "Error: file $from does not exist" if ( ! $opt_delete);
     }
-    return;
+    die "Error: can't overwrite zip file '$zip_file' for fixing permissions" unless $zip->overwrite() == AZ_OK;
+    utime($latest_member_mod_time, $latest_member_mod_time, $zip_file);
 }
 
 sub get_tempfilename
diff --git a/solenv/bin/diffmv.pl b/solenv/bin/diffmv.pl
index 3bd1065b9569..89e5e4fd9ffb 100755
--- a/solenv/bin/diffmv.pl
+++ b/solenv/bin/diffmv.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: diffmv.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/exectest.pl b/solenv/bin/exectest.pl
index 552935eb5b6b..d343cf298017 100644
--- a/solenv/bin/exectest.pl
+++ b/solenv/bin/exectest.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: exectest.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl
index 6b2ec3170641..7c9ac4b24c2e 100644..100755
--- a/solenv/bin/gccinstlib.pl
+++ b/solenv/bin/gccinstlib.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: gccinstlib.pl,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/gen_update_info.pl b/solenv/bin/gen_update_info.pl
index d1a2e1ba2dee..ae2aa6f251e0 100644
--- a/solenv/bin/gen_update_info.pl
+++ b/solenv/bin/gen_update_info.pl
@@ -6,14 +6,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: gen_update_info.pl,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/gen_userfeedback_VCL_names.pl b/solenv/bin/gen_userfeedback_VCL_names.pl
index 2e5ed3cf2588..e65968e6b6c2 100755
--- a/solenv/bin/gen_userfeedback_VCL_names.pl
+++ b/solenv/bin/gen_userfeedback_VCL_names.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: ,v $
-#
-# $Revision:  $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/getcompver.awk b/solenv/bin/getcompver.awk
index 7b471294180c..068960481130 100644
--- a/solenv/bin/getcompver.awk
+++ b/solenv/bin/getcompver.awk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: header.hxx,v $
-#
-# $Revision: 1.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/getcsym.awk b/solenv/bin/getcsym.awk
index daa3a81fad60..9490a06b3535 100644
--- a/solenv/bin/getcsym.awk
+++ b/solenv/bin/getcsym.awk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: getcsym.awk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/guw.pl b/solenv/bin/guw.pl
index 9839a5d637d7..c5326204eb49 100755
--- a/solenv/bin/guw.pl
+++ b/solenv/bin/guw.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: guw.pl,v $
-#
-# $Revision: 1.28 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/hicontrast-to-theme.pl b/solenv/bin/hicontrast-to-theme.pl
index 531762889914..027d7405dab2 100644
--- a/solenv/bin/hicontrast-to-theme.pl
+++ b/solenv/bin/hicontrast-to-theme.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: hicontrast-to-theme.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/installoffice b/solenv/bin/installoffice
deleted file mode 100755
index 29645688b56a..000000000000
--- a/solenv/bin/installoffice
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/bash
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# 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.
-#***********************************************************************/
-
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_ERROR=2
-EXIT_BUG=10
-
-if [ x${SOLARENV}x = xx ]; then
-    echo No environment found, please use 'configure' or 'setsolar'
-    exit $EXIT_FAILURE
-fi
-usage() {
-        echo "Usage: $SCRIPTNAME [-t DESTPATH] [-o] [-d] [-a]" >&2
-        echo "" >&2
-        echo "[-t] target path: path wehre tho office should installed to. The default is '$DESTPATH'" >&2
-        echo "" >&2
-        echo "[-o] force OpenOffice.org installation instead of StarOffice" >&2
-        echo "" >&2
-        echo "[-d] installation with debug output" >&2
-        echo "" >&2
-        echo "[-a] the office will be patched to run without FirstStartWizard" >&2
-        echo "" >&2
-        echo "[-i] impress should open documents without autopilot" >&2
-        exit $EXIT_FAILURE
-}
-
-if [ x${USER}x = xx ]; then
-    if [ x${LOGNAME}x = xx ]; then
-        echo "ERROR: could not determine username. Please export variable USER" >&2
-        exit $EXIT_FAILURE
-    else 
-        USER=$LOGNAME
-        export USER
-    fi
-fi
-     
-DESTPATH=/tmp/$USER
-PARAM=""
-
-while getopts ':mt:aicdhot' OPTION ; do
-        case $OPTION in
-        d)        PARAM="$PARAM -debug true"
-                ;;
-        c)        PARAM="$PARAM -cwscheckapi true"
-                ;;
-        o)        PARAM="$PARAM -ooo true"
-                ;;
-        a)        PARAM="$PARAM -autorun true"
-                ;;
-        i)        PARAM="$PARAM -autoimpress true"
-                ;;
-        t)        DESTPATH="$OPTARG"
-                ;;
-        h)        usage $EXIT_SUCCESS
-                ;;
-        \?)        echo "unkown option \"-$OPTARG\"." >&2
-                usage $EXIT_ERROR
-                ;;
-        *)        echo "this is not possible...">&2
-                usage $EXIT_BUG
-                ;;
-        esac
-done
-
-shift `expr $OPTIND - 1`
-
-LOCALINSTALLDIR=$DESTPATH/office
-LOCALUNPACKDIR=$DESTPATH/unpack
-
-export LOCALINSTALLDIR
-export LOCALUNPACKDIR
-echo "export LOCALINSTALLDIR"
-echo "export LOCALUNPACKDIR"
-
-unset LD_LIBRARY_PATH
-unset FORCE2ARCHIVE
-
-echo "### $SOLARENV/bin/installoffice.pl $PARAM -cleanup true $@"
-exec perl -w $SOLARENV/bin/installoffice.pl $PARAM -cleanup true $@
-
-exit $?
diff --git a/solenv/bin/installoffice.btm b/solenv/bin/installoffice.btm
deleted file mode 100755
index ffd6633fafcd..000000000000
--- a/solenv/bin/installoffice.btm
+++ /dev/null
@@ -1,122 +0,0 @@
-@echo off
-REM **************************************************************************
-REM * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-REM * 
-REM * Copyright 2008 by Sun Microsystems, Inc.
-REM *
-REM * OpenOffice.org - a multi-platform office productivity suite
-REM *
-REM * $RCSfile: installoffice.btm,v $
-REM *
-REM * $Revision: 1.3.6.1 $
-REM *
-REM * This file is part of OpenOffice.org.
-REM *
-REM * OpenOffice.org is free software: you can redistribute it and/or modify
-REM * it under the terms of the GNU Lesser General Public License version 3
-REM * only, as published by the Free Software Foundation.
-REM *
-REM * OpenOffice.org is distributed in the hope that it will be useful,
-REM * but WITHOUT ANY WARRANTY; without even the implied warranty of
-REM * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-REM * GNU Lesser General Public License version 3 for more details
-REM * (a copy is included in the LICENSE file that accompanied this code).
-REM *
-REM * You should have received a copy of the GNU Lesser General Public License
-REM * version 3 along with OpenOffice.org.  If not, see
-REM * <http://www.openoffice.org/license.html>
-REM * for a copy of the LGPLv3 License.
-REM ************************************************************************/
-
-
-SET DESTPATH=%USERNAME%
-SET DEBUG=false
-SET OOO=false
-SET PARAM=
-
-for %opt in (%&%) DO (
-    iff "%opt%" == "-d" THEN 
-        SET PARAM=%PARAM% -debug true
-        shift
-
-    elseiff "%opt%" == "-o" THEN 
-        SET PARAM=%PARAM% -ooo true
-        shift
-
-    elseiff "%opt%" == "-c" THEN 
-        SET PARAM=%PARAM% -cwscheckapi true
-        shift
-
-    elseiff "%opt%" == "-a" THEN 
-        SET PARAM=%PARAM% -autorun true
-        shift
-
-    elseiff "%opt%" == "-i" THEN
-        SET PARAM=%PARAM% -autoimpress true
-        shift
-
-    elseiff "%opt%" == "-t" THEN 
-        SET DESTPATH=%2
-        shift
-        shift
-
-    elseiff "%opt%" == "-h" THEN 
-        goto usage
-
-    elseiff "%opt%" == "/h" THEN 
-        goto usage
-
-    elseiff "%opt%" == "%DESTPATH%" THEN
-        shift
-
-    else 
-        echo wrong param: %opt%
-        goto usage
-    endiff
-)
-
-iff "%DESTPATH%" == "%USERNAME%" THEN
-iff EXIST e:\  then
-    iff EXIST e:\temp then
-        set temppath=e:\temp
-    elseiff EXIST e:\tmp then
-        set temppath=c:\tmp
-    else
-        mkdir e:\temp
-        set tmppath=c:\temp
-    endiff
-elseiff EXIST c:\tmp then
-    set temppath=c:\tmp
-elseiff EXIST c:\temp then
-    set temppath=c:\temp
-else
-    set temppath=%TMP%
-endiff
-    DESTPATH=%temppath%\%USERNAME%
-endiff
-
-SET LOCALINSTALLDIR=%DESTPATH%\office
-SET LOCALUNPACKDIR=%DESTPATH%\unpack
-echo LOCALINSTALLDIR=%LOCALINSTALLDIR%
-echo LOCALUNPACKDIR=%LOCALUNPACKDIR%
-
-echo call perl5 %SOLARENV%\bin\installoffice.pl -dest %LOCALINSTALLDIR% %PARAM% -cleanup true %&
-call perl5 %SOLARENV%\bin\installoffice.pl -dest %LOCALINSTALLDIR% %PARAM% -cleanup true %&
-
-quit %?
-
-:usage
-    echo. 
-    echo Usage: %0% [-t DESTPATH] [-o] [-d] >&2
-    echo. 
-    echo [-d] installation with debug output>&2
-    echo. 
-    echo [-o] force OpenOffice.org installation instead of StarOffice>&2
-    echo. 
-    echo [-t] target path: path where the office should installed to. The default is '%DESTPATH%'>&2
-    echo.
-    echo [-a] the office will be patched to run without FirstStartWizard >&2
-   echo. 
-    echo [-i] impress should open documents without autopilot
-    echo.
-    quit 1
diff --git a/solenv/bin/installoffice.pl b/solenv/bin/installoffice.pl
deleted file mode 100755
index 0d297e289b3f..000000000000
--- a/solenv/bin/installoffice.pl
+++ /dev/null
@@ -1,936 +0,0 @@
-:
-eval 'exec perl -wS $0 ${1+"$@"}'
-    if 0;
-
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: installoffice.pl,v $
-#
-# $Revision: 1.2.24.1 $
-#
-# 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.
-#***********************************************************************/
-
-use strict;
-use File::Find;
-use File::Path;
-my $script = $0;
-
-( our $script_name = $script ) =~ s/^.*\b(\w+)\.pl$/$1/;
-( our $script_path = $script ) =~ s/$script_name.*//;
-
-# Prototypes
-sub installOffice();
-
-our $debug = 0;           # run without executing commands
-
-our $is_command_infos = 1;   # print command details before exec
-our $show_NoMessage = 0;
-our $show_Message = 1;
-
-# special handling for cwschackapi
-our $cwsCheckApi = 0;
-
-# remove existant office installation
-our $cleanup = 0;
-
-# should the office be startable without user interaction
-our $autorun = 0;
-
-# should impress open documents without autopilot
-our $autoimpress = 0;
-
-# force openOffice.org installation if StarOffice is available
-our $is_ooo = 0;
-
-parseArgs();
-
-our $is_admin_installation = 1;
-
-our $gui = $ENV{GUI};
-our $temp_path = $ENV{TEMP};
-if (!defined($temp_path)) {
-   $temp_path = $ENV{TMP};
-}
-
-our $vcsid = $ENV{VCSID};
-our $sversion_saved = 0;
-our $FileURLPrefix = "file:///";
-our $userinstalldir = "UserInstallation";
-our $cygwin = "cygwin";
-our $prefered_lang = "en-US";
-our $global_instset_mask = "";
-#$smoketest_install = $ENV{SMOKETESTINSTALLSET};
-
-if (!defined($gui)) {
-    print "The workstamp is missing. Please use setsolar\n";
-    exit(1);
-}
-
-our $OfficeDestinationPath;
-our $is_do_deinstall;
-our $CygwinLineends;
-our $WinLineends;
-our $PS ;
-our $NewPathSeparator ;
-our $shell ;
-our $shellSetEnvVar;
-our $shellCommandSep;
-our $cdCommand;
-our $PERL ;
-our $REMOVE_DIR ;
-our $REMOVE_FILE ;
-our $LIST_DIR ;
-our $COPY_FILE ;
-our $COPY_DIR ;
-our $MK_DIR ;
-our $RENAME_FILE ;
-our $nul ;
-our $RESPFILE;
-our $SVERSION_INI ;
-our $SOFFICEBIN ;
-our $UNOPKGBIN;
-our $bootstrapini ;
-our $bootstrapiniTemp ;
-our $packpackage ;
-our $user;
-
-if ($gui eq "WNT") {
-    $gui = $cygwin;
-}
-
-if ($gui eq "WNT") {
-    $user = $ENV{USERNAME};
-    $PS = '\\';
-    $NewPathSeparator = ';';
-    $shell = "$ENV{COMSPEC} -c ";
-    $shellSetEnvVar = "set ";
-    $shellCommandSep = "& ";
-    $cdCommand="cd /d ";
-    $PERL = "$shell $ENV{PERL}";
-    $REMOVE_DIR = "$shell del /qsxyz";
-    $REMOVE_FILE = "$shell del /q";
-    $LIST_DIR = "$shell ls";
-    $COPY_FILE = "$shell copy";
-    $COPY_DIR = "$shell copy /s";
-    $MK_DIR = "md";
-    $RENAME_FILE = "ren";
-    $nul = '> NUL';
-    $RESPFILE="response_fat_wnt";
-    $SVERSION_INI = $ENV{USERPROFILE} . $PS . "Anwendungsdaten" . $PS . "sversion.ini";
-    $SOFFICEBIN = "soffice.exe";
-    $bootstrapini = "bootstrap.ini";
-    $UNOPKGBIN="unopkg.exe";
-    $bootstrapiniTemp = $bootstrapini . "_";
-    $packpackage = "msi";
-    if (!defined($temp_path)) {
-        print "temp value is missing. Please set temp-variable\n";
-        exit(1);
-    }
-}
-elsif ($gui eq "UNX") {
-    $user = $ENV{USER};
-    $is_do_deinstall = 0;
-    $PS = '/';
-    $shell = "/bin/sh -c ";
-    $shellSetEnvVar = "export ";
-    $shellCommandSep = ";";
-    $cdCommand="cd ";
-    $NewPathSeparator = ':';
-    $shell = "";
-    $PERL = "$ENV{PERL}";
-    $REMOVE_DIR = "rm -rf";
-    $REMOVE_FILE = "rm -f";
-    $LIST_DIR = "ls";
-    $COPY_FILE = "cp -f";
-    $COPY_DIR = "cp -rf";
-    $MK_DIR = "mkdir";
-    $RENAME_FILE = "mv";
-    $nul = '> /dev/null';
-    $RESPFILE="response_fat_unx";
-    $SVERSION_INI = $ENV{HOME} . $PS . ".sversionrc";
-    $SOFFICEBIN = "soffice";
-    $bootstrapini = "bootstraprc";
-    $UNOPKGBIN="unopkg";
-    $bootstrapiniTemp = $bootstrapini . "_";
-    $packpackage = $ENV{PKGFORMAT};
-    if (!defined($temp_path)) {
-        $temp_path="/tmp";
-        if (! -e $temp_path){
-            print "temp value is missing. Please set temp-variable\n";
-            exit(1);
-        }
-    }
-}
-elsif ($gui eq $cygwin) {
-
-    $PS = '/';
-    $NewPathSeparator = ':';
-    $shell = "/bin/sh -c ";
-    $shellSetEnvVar = "export ";
-    $shellCommandSep = ";";
-    $cdCommand = "cd ";
-    $PERL = "$ENV{PERL}";
-    $REMOVE_DIR = "rm -rf";
-    $REMOVE_FILE = "rm -f";
-    $LIST_DIR = "ls";
-    $COPY_FILE = "cp -f";
-    $COPY_DIR = "cp -rf";
-    $MK_DIR = "mkdir";
-    $RENAME_FILE = "mv";
-    $nul = '> /dev/null';
-    $RESPFILE="response_fat_wnt";
-    $SVERSION_INI = $ENV{USERPROFILE} . $PS . "Anwendungsdaten" . $PS . "sversion.ini";
-    $SOFFICEBIN = "soffice";
-    $bootstrapini = "bootstrap.ini";
-    $bootstrapiniTemp = $bootstrapini . "_";
-    $CygwinLineends = $/;
-    $WinLineends = "\r\n";
-    &SetWinLineends();
-    $packpackage = "msi";
-    if (!defined($temp_path)) {
-        $temp_path="/tmp";
-        if (! -e $temp_path){
-            print "temp value is missing. Please set temp-variable\n";
-            exit(1);
-        }
-    }
-}
-else {
-    print_error ("not supported system\n",1);
-}
-
-my %PRODUCT1 = (Name => "StarOffice", instset => "instset_native");
-my %PRODUCT2 = (Name => "OpenOffice", instset => "instsetoo_native");
-our @PRODUCT = (\%PRODUCT1, \%PRODUCT2);
-
-our $SHIP = defined $ENV{SHIPDRIVE} ? $ENV{SHIPDRIVE} . $PS : "shipdrive_not_set";
-
-if (defined($ENV{CWS_WORK_STAMP})){
-    print " found CWS\n";
-}
-elsif (isLocalEnv()){
-    print " local environment\n";
-}
-elsif (defined $ENV{SHIPDRIVE}) {
-    print " master version\n";
-}
-elsif (defined $ENV{SOLARSRC}) {
-    print " OpenOffice master version\n";
-}
-else {
-    print "Could not determine environment. Exit\n";
-    exit 1
-}
-
-
-our @error_messages = ( '',
-            'lock flag for pkgadd still exist. Installation not possible!',
-            'Error during installation!',
-            'Error: patching configuration failed!',
-            'Error: starting office failed or office crashed!',
-            'Error during testing',
-            'can not copy extension',
-            'Error in setup log',
-            'installationsset is not complete',
-            'can not copy all basic scripts',
-            'can not patch bottstrapini',
-            'msiexec failed. Maybe you have got an installed version',
-            'deinstallation is incomplete'
-);
-
-
-my $success = 0;
-$success = installOffice();
-
-if ($success != 0){
-    exit(1);
-}
-exit(0);
-
-sub installOffice(){
-
-    # <DISABLED>
-    # my ($officeVersion, $instsetPath)= getInstset();
-    # print "OFFICEVERSION:$officeVersion INSTSETPATH:$instsetPath\n" if $debug;
-    # my $sourcePath=$instsetPath.$PS.$officeVersion;
-    # </DISABLED>
-    #
-    # currently this installer does not install an office, it do pack a runnable office.
-    # Therefore we do not need to search for an instSet
-    my $sourcePath="dummy";
-    my $officeVersion="dummy";
-
-    my $destinationPath = getDestinationPath($officeVersion);
-    print "destinationPath: $destinationPath\n" if $debug;
-
-    removeOffice($destinationPath);
-    mkdirs($destinationPath);
-
-    my $installCommand = getInstallCommand($sourcePath, $destinationPath, $officeVersion);
-    print "installCommand: $installCommand\n" if $debug;
-
-    my $success=0;
-    $success = system($installCommand);
-    print "installoofice.pl::installoffice::success $success\n" if ($debug);
-
-    if ($autorun) {
-        makeAutoRun($destinationPath);
-    }
-
-    if ($autoimpress) {
-        makeAutoImpress($destinationPath);
-    }
-
-    return $success;
-}
-
-sub makeAutoImpress(){
-    my $destinationPath = shift;
-
-    if (patchXCU ($destinationPath, $script_path.$script_name."_impress.oxt") != 0) {
-        print_error("could not register ".$script_path.$script_name."_impress.oxt", "1");
-    }
-    return 0;
-}
-
-
-sub makeAutoRun(){
-
-    my $destinationPath = shift;
-
-    patchBootstraprc($destinationPath);
-
-    if (patchXCU ($destinationPath, $script_path.$script_name.".oxt") != 0) {
-        print_error("could not register ".$script_path.$script_name.".oxt", "1");
-    }
-    return 0;
-}
-
-
-sub patchBootstraprc(){
-    my $destinationPath = shift;
-    my $bootstraprc="";
-
-    find sub { $bootstraprc=$File::Find::name if -e _ && /$bootstrapini$/ }, $destinationPath;
-
-    print_error("could not find $bootstrapini", "1") if ( ! -e $bootstraprc );
-
-    open(BSRC, "<$bootstraprc") or errorFromOpen(" for reading " .$bootstraprc);
-    my @content = <BSRC>;
-    close(BSRC);
-    my @newContent;
-    foreach(@content) {
-        if ( /UserInstallation=./ ) {
-            push(@newContent, "UserInstallation=\$ORIGIN/../UserInstallation\n");
-        }
-        else {
-            push(@newContent,$_);
-        }
-    }
-
-    chmod(0755,$bootstraprc);
-
-    open OUTFILE, ">$bootstraprc" or return errorFromOpen (" for writing " . $bootstraprc);
-    print OUTFILE @newContent;
-    close OUTFILE;
-
-}
-
-sub patchXCU(){
-    my $destinationPath = shift;
-    my $oxt = shift;
-    my $unopkg="";
-
-    find sub { $unopkg=$File::Find::name if -e _ && /$UNOPKGBIN$/ }, $destinationPath;
-
-    print_error("could not find $UNOPKGBIN", "1") if ( !-e $unopkg );
-    print "unopkg: '$unopkg'\n" if $debug;
-
-    if ($gui eq "WNT") {
-        $unopkg = "\"$unopkg\"";
-    }
-
-    my $unopkgCommand = "$unopkg add $oxt";
-    print "register oxt file ...\n" if $debug;
-    print "call $unopkgCommand\n" if $debug;
-    my $success=0;
-    $success = system($unopkgCommand);
-
-    return $success;
-}
-
-sub writeFile(){
-    my $fileName = shift;
-    my @content = @_;
-
-    open OUTFILE, ">$fileName" or return errorFromOpen (" for writing " . $fileName);
-
-    my $lf;
-    if ($packpackage eq "msi"){
-        $lf = "\r\n";
-    } else {
-        $lf = "\n";
-    }
-
-    my $line;
-    foreach $line(@content) {
-        print "LINE: $line\n" if $debug;
-        print OUTFILE $line.$lf;
-    }
-    close(OUTFILE);
-    return 0;
-}
-
-sub mkdirs(){
-    my $directory = shift;
-    my $splitter=$PS;
-    if ( $PS eq "\\" ){
-       $splitter="\\\\";
-    }
-    my @aFolder=split($splitter,$directory);
-
-    my $dir;
-    my $folder;
-    foreach $folder(@aFolder){
-        if ( (! defined($dir)) && ($PS eq "\\")){
-            $dir=$folder;
-        } else {
-            $dir=$dir.$PS.$folder;
-        }
-        if (! -e $dir ){
-            print "try to create $dir\n" if $debug;
-            mkdir($dir);
-        }
-    }
-}
-
-sub removeOffice(){
-
-    my $destPath=shift;
-
-    if ($cleanup){
-        print "remove old office installation...\n";
-
-        print "remove $destPath...\n" if $debug;
-        rmtree($destPath);
-
-    }
-}
-
-sub getInstallCommand() {
-    my $command;
-    $command = getDmakeInstalledCommand(@_);
-    # if ($packpackage eq "msi"){
-    #     $command = getWindowsInallCommand(@_);
-    # } else {
-    #     $command = getUnixInstallCommand(@_);
-    # }
-    return $command;
-}
-
-sub getDmakeInstalledCommand(){
-    my ($sourcePath, $destPath, $officeVersion) = @_;
-    my $RootDir=$ENV{SRC_ROOT};
-
-    my $ProductName;
-    my $instset;
-
-    # check if instset_native could be found
-    foreach my $pointer (@PRODUCT) {
-        $instset = $pointer->{'instset'};
-        $ProductName = $pointer->{'Name'};
-        my $instsetDir = "$RootDir$PS$instset";
-        print "instsetDir: $instsetDir \n" if $debug;
-
-        last if ($is_ooo && $ProductName eq "OpenOffice");
-        last if ( ! $is_ooo && -e "$instsetDir");
-    }
-    print "Product: $ProductName\n" if $debug;;
-
-    my $dmakeTarget=lc($ProductName)."_en-US";
-
-    my $utilFolder = getInstsetUtilFolder($instset, $destPath, $RootDir);
-    my $dmakeCommand = " $cdCommand \"$utilFolder\" $shellCommandSep dmake $dmakeTarget PKGFORMAT=installed -vt";
-    my $envset;
-    if ($gui eq "WNT") {
-        $envset="set LOCALINSTALLDIR=$destPath & set LOCALUNPACKDIR=$destPath &";
-    }else {
-        $envset="LOCALINSTALLDIR=$destPath ; LOCALUNPACKDIR=$destPath ; export LOCALINSTALLDIR ; export LOCALUNPACKDIR ; ";
-    }
-    #my $command=$envset.$dmakeCommand;
-    my $command=$dmakeCommand;
-    return $command;
-}
-
-sub getInstsetUtilFolder(){
-    my $instset = shift;
-    my $destPath = shift;
-    my $RootDir = shift;
-
-    my $instsetFolder = $RootDir.$PS.$instset;
-    my $utilFolder="";
-
-    if( open(DATEI, ">$instsetFolder".$PS."touch"))
-    {
-        close(DATEI);
-        unlink($instsetFolder.$PS."touch");
-        print "$instsetFolder is writable \n" if $debug;
-        $utilFolder = $RootDir.$PS.$instset.$PS."util";
-    }
-    else
-    {
-        print "$instsetFolder is NOT writable \n" if $debug;
-        print "copy $instset to $destPath$PS..\n" if $debug;
-        my $prjPath=$destPath.$PS."..";
-
-        my $command = "$ENV{COPYPRJ} -x $instset $prjPath";
-        print $command if $debug;
-        system($command);
-        $utilFolder=$prjPath.$PS.$ENV{WORK_STAMP}.$PS.$instset.$PS."util";
-    }
-    print "utilFolder: $utilFolder\n" if $debug;
-    return $utilFolder;
-}
-
-# sub getInstsetFomInstsetNative(){
-#     my (@DirArray, $TestDir1, $TestDir2);
-#     my $instset;
-#     my $ProductName;
-#     my $instDir="";
-#     my $lang;
-#     my $RootDir=$ENV{SRC_ROOT};
-#     my $StandDir = $ENV{SOLARSRC} . $PS;
-#     #$RootDir=~s/\w+$//;
-
-#     foreach my $pointer (@PRODUCT) {
-#         $instset = $pointer->{'instset'};
-#         $ProductName = $pointer->{'Name'};
-#         @DirArray=();
-#         $TestDir1 = "$RootDir$PS$instset$PS$ENV{INPATH}$PS$ProductName$PS$packpackage$PS" . "install$PS";
-#         $TestDir2 = "$StandDir$instset$PS$ENV{INPATH}$PS$ProductName$PS$packpackage$PS" . "install$PS";
-#         print "TestDir1: $TestDir1 \n";
-#         print "TestDir2: $TestDir2 \n";
-#         if (-e "$TestDir1") {
-#             $instDir= $TestDir1;
-#         }
-#         elsif (-e "$TestDir2") {
-#             $instDir="$TestDir2";
-#         }
-#         if ($instDir eq "") {
-#             next;
-#         }
-
-#         getSubDirs ("$instDir", \@DirArray);
-#         $lang = findSubDir (\@DirArray);
-#         print "Lang-Sel: $lang\n" if $is_command_infos;
-# ;
-#         if (($instDir ne "") and  (-e $instDir)) {
-#             return ($lang, $instDir, $ProductName, $instset);
-#         }
-#     }
-#     print_error ("no installationset found\n",2);
-
-# }
-
-sub getWindowsInallCommand(){
-    my ($sourcePath, $destPath) = @_;
-    my $mask = "\\.msi\$";
-    #my $DirArray;
-    my @DirArray = ();
-    getSubFiles ("$sourcePath", \@DirArray, $mask);
-    if ($#DirArray == -1) {
-        print_error ("Installationset in $sourcePath is incomplete", 2);
-    }
-    if ($#DirArray >= 1) {
-        print_error ("Installationset in $sourcePath hat too many msi-files", 2);
-        print "found the following msi-files: @DirArray\n" if $debug;
-    }
-    my $command = "msiexec.exe /a $sourcePath$PS$DirArray[0] -qn ALLUSERS=2 INSTALLLOCATION=$destPath";
-
-    return $command;
-}
-
-sub getUnixInstallCommand() {
-    my ($sourcePath, $destPath, $officeVersion) = @_;
-
-    my $userland="unknown";
-
-    if (defined($ENV{CWS_WORK_STAMP})){
-        print " found CWS\n";
-        $userland=$ENV{SOLARVERSION}.$PS.$ENV{INPATH}.$PS."bin".$ENV{UPDMINOREXT}.$PS."userscripts".$PS."install";
-    }
-    elsif (isLocalEnv()){
-        print " local environment\n";
-    }
-    elsif (defined $ENV{SHIPDRIVE}) {
-        print " master version\n";
-        $userland=$ENV{SHIPDRIVE}.$PS.$ENV{INPATH}.$PS."UserScripts".$PS.$ENV{PKGFORMAT}.$PS.$officeVersion.$PS."install";
-    }
-    elsif (defined $ENV{SOLARSRC}) {
-        print " OpenOffice master version\n";
-        print " command to install Office not implementet yet\n";
-        exit(1);
-    }
-    else {
-        print "Could not determine environment. Exit\n";
-        exit(1);
-    }
-    return "$userland $sourcePath $destPath";
-;
-
-}
-
-sub getDestinationPath {
-    # if (defined $ENV{SOLARROOT}){
-    #     # seems to be a Sun environment
-    #     if (! -e $OfficeDestinationPath){
-
-    #     }
-    # }
-    my $officeVersion = shift;
-    my $officename;
-
-    if (defined($ENV{LOCALINSTALLDIR})){
-        $OfficeDestinationPath=$ENV{LOCALINSTALLDIR};
-        if(index($OfficeDestinationPath," ") >= 0) {
-            my $msg="You environemt variable '\$LOCALINSTALLDIR=$OfficeDestinationPath' contains white spaces.";
-            $msg = $msg." This is not allowed!";
-            print_error($msg, "1");
-        }
-    }
-    if (!defined($OfficeDestinationPath)){
-        $officename = $officeVersion;
-        if (defined($ENV{CWS_WORK_STAMP})){
-            $officename=$ENV{CWS_WORK_STAMP};
-        }
-        $OfficeDestinationPath=$temp_path.$PS.$user.$PS."office".$PS.$officename;
-    }
-
-    return $OfficeDestinationPath;
-}
-
-# sub getInstset {
-
-#     my ($INSTSET, $NEWINSTSET, $ProductName);
-
-#     if (defined ($ENV{EPM}) && ($ENV{EPM} eq 'NO') && ($gui eq "UNX")) { # we do the install ourselves ...
-#         return ();
-#     }
-
-#     print "get Instset\n" if $debug;
-#     $NEWINSTSET = "";
-
-#     if (!isLocalEnv() and !defined($ENV{CWS_WORK_STAMP}) and (-e $SHIP) and ($gui ne $cygwin)) {
-#         ($NEWINSTSET, $INSTSET) = getSetFromServer();
-#     }
-#     else {
-#         ($NEWINSTSET, $INSTSET, $ProductName) = getInstsetFomInstsetNative();
-#     }
-#     return ($NEWINSTSET, $INSTSET);
-# }
-
-# sub getSetFromServer {
-#     my ($DirName, $SetupFullPath);
-#     my $workspace = $ENV{WORK_STAMP};
-#     my $platform  = $ENV{INPATH};
-#     my $latestset;
-#     my (@DirArray, $mask, $buildid, $milestone);
-
-#     foreach my $pointer (@PRODUCT) {
-#         my $ProductName = $pointer->{'Name'};
-
-#         print "##PRODUCT: $ProductName\n";
-#         my $SetupFullPath = "$SHIP$ENV{INPATH}$PS$ProductName$PS$packpackage$PS";
-#         if ( ! ( $workspace && $platform ) ) {
-#             print_error ( "Error: environment not set correctly.", 1);
-#         }
-#         # get latest broadcastet milestone and pack number
-#         ($milestone, $buildid) = get_milestoneAndBuildID( $workspace, $platform );
-
-#         if (defined $ENV{CWS_WORK_STAMP}) {
-#             # /unxlngi6.pro/StarOffice/rpm/ SRC680_m245_native_packed-2_en-US.9267/
-#             $mask = "^$workspace" . "_" . $milestone . "_native_packed-(\\d+)_en-US\\.$buildid";
-#         } else {
-#             # cws03/os110/OOH680/src.m4/instset_native/unxlngi6.pro/StarOffice/rpm install/en-US/RPMS
-#             $mask = "^$workspace" . "_" . $milestone . "_native_packed-(\\d+)_en-US\\.$buildid";
-#         }
-#         print "MASK: $mask\n";
-#         $global_instset_mask = $mask;
-#         getSubFiles ($SetupFullPath, \@DirArray, $mask);
-#         @DirArray = sort InstsetSort @DirArray;
-
-#         if ($#DirArray > -1) {
-#             $latestset = $DirArray [$#DirArray];
-#             $DirName = $latestset;
-#         }
-#         else {
-#                 print_error ("Cannot find install set $SetupFullPath for $workspace $milestone", 2);
-#         }
-
-#         print "Latest install sets: $latestset\n" if $debug;
-
-#         print "$DirName\t $SetupFullPath\n" if $debug;
-#         # compare with file system
-#         # at the moment just the existence is checked. For security reasons it might be
-#         # better to additionally check whether there are newer sets (this must not happen,
-#         # but who knows ...)
-#         if ( -d $SetupFullPath ) {
-#             # if found => return and don't continue searching
-#             # this is usefull to set a priority to find installsets in @PRODUCT
-#             # first comes, first wins
-#             return ($DirName, $SetupFullPath);
-#         }
-#     }
-
-#     # compare with file system
-#     # at the moment just the existence is checked. For security reasons it might be
-#     # better to additionally check whether there are newer sets (this must not happen,
-#     # but who knows ...)
-#     if ( -d $SetupFullPath ) {
-#         return ($DirName, $SetupFullPath);
-#     } else {
-#         print_error ("Cannot find install set $SetupFullPath for $workspace $milestone", 2);
-#         }
-# }
-
-# sub get_milestoneAndBuildID {
-#     my ( $ws, $pf ) = @_;
-#     my ($milestone, $buildid, $upd, $path, $updext, $line);
-
-#     if ( $ws =~ /^\D+(\d+)$/) {
-#         $upd = $1;
-#     }
-
-#     if (defined ($ENV{UPDMINOREXT})) {
-#         $updext = $ENV{UPDMINOREXT};
-#     }
-#     else {
-#         $updext = "";
-#     }
-
-#     $path = "$ENV{SOLARVER}$PS$pf$PS" . "inc$updext$PS$upd" . "minor.mk";
-#     print "$path\n" if $debug;
-#     local *MINORMK;
-
-#     if ( !open(MINORMK,$path) ) {
-#         print "FATAL: can't open $path\n";
-#         return (0,0);
-#     }
-
-#     if (!eof(MINORMK)) {
-#         while ($line = <MINORMK>) {
-#             chomp($line);
-#             if ( $line =~ /LAST_MINOR=(\w+)/ ) {
-#                 $milestone = $1;
-#             }
-#             elsif ( $line =~ /BUILD=(\d+)/ ) {
-#                 $buildid = $1;
-#             }
-#         }
-
-#         close(MINORMK);
-#     }
-#     if (!defined($milestone)) {
-#             print_error ("Milestone ist not defined!", 2);
-#     }
-#     if (!defined($buildid)) {
-#             print_error ("Build-ID ist not defined!", 2);
-#     }
-
-#     return ($milestone, $buildid);
-# }
-
-sub print_error
-{
-    my $message     = shift;
-    my $error_code  = shift;
-
-    print STDERR "ERROR: $message\n";
-    doExit($error_code);
-}
-
-sub getSubFiles {
-    my ($startDir, $DirArray_ref, $mask) = @_;
-    my ($dir);
-    local *DIR;
-    opendir(DIR,"$startDir");
-    while($dir = readdir(DIR)) {
-        if (($dir =~ /\.$/) or ($dir !~ /$mask/)) {
-            next;
-        }
-        push (@{$DirArray_ref}, "$dir");
-    }
-    closedir(DIR);
-
-}
-
-sub InstsetSort {
-    my ($a1, $b1);
-    if ($a =~ /$global_instset_mask/) {
-        $a1 = $1;
-    }
-    if ($b =~ /$global_instset_mask/) {
-        $b1 = $1;
-    }
-    $a1 <=> $b1;
-}
-
-sub isLocalEnv {
-    my $returnvalue = 0;
-    if (defined ($ENV{SOL_TMP}) && defined ($ENV{SOLARVERSION})) {
-        my $mask = $ENV{SOL_TMP};
-        $mask =~ s/\\/\\\\/;
-        print "Mask: $mask\n" if $debug;
-        if ($ENV{SOLARVERSION}=~ /$mask/) {
-            $returnvalue = 1;
-        }
-    }
-    return $returnvalue;
-}
-
-sub getSubDirs {
-    my ($startDir, $DirArray_ref) = @_;
-    my ($dir);
-    opendir(DIR,"$startDir");
-    while($dir = readdir(DIR)) {
-        if (($dir !~ /\.$/) and ( -d "$startDir$dir") ) {
-            push (@{$DirArray_ref}, "$dir");
-        }
-    }
-    closedir(DIR);
-
-}
-
-sub findSubDir {
-    my ($DirArray_ref) = @_;
-    my (@sortedArray, $dir, $instdir);
-    @sortedArray = sort langsort @{$DirArray_ref};
-    print "Langs: @sortedArray\n" if $is_command_infos;
-    foreach $dir (@sortedArray) {
-        if ($dir =~ /log$/) {
-            next;
-        }
-        $instdir = "$dir";
-        return $instdir;
-    }
-    return "";
-}
-
-sub langsort {
-    if ($a eq $prefered_lang) {
-        return -1;
-    }
-    elsif ($b eq $prefered_lang) {
-        return 1;
-    }
-    else {
-        $a cmp $b;
-    }
-}
-
-sub doExit
-{
-    my $error_code  = shift;
-    # if ($sversion_saved) {
-    # restore_sversion ($SVERSION_INI);
-    # }
-    # if ($is_remove_on_error) {
-    #     if ($is_do_deinstall) {
-    #         deinstallInstallation ($installpath);
-    #     }
-    #     removeInstallation($installpath);
-    # }
-    # else {
-    #     print_notRemoved ($installpath);
-    # }
-    if ( $error_code ) {
-        print STDERR "\nFAILURE: $script_name aborted.\n";
-    }
-    exit($error_code);
-
-}
-
-
-sub parseArgs
-{
-    for (my $i=0; $i<=$#ARGV; $i++) {
-        if ( $ARGV[$i] =~ /^-cwscheckapi$/ ) {
-            my $value = $ARGV[++$i];
-            if ($value =~ /^true$/ || ($value =~ /^1$/) ) {
-                $cwsCheckApi = 1;
-                $cleanup = 1;
-                $autorun = 1;
-            };
-
-        }
-
-        if ( $ARGV[$i] =~ /^-dest$/ ) {
-            $OfficeDestinationPath = $ARGV[++$i];
-        }
-
-        if ( $ARGV[$i] =~ /^-cleanup$/ ) {
-            my $value = $ARGV[++$i];
-            if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $cleanup = 1 };
-        }
-
-        if ( $ARGV[$i] =~ /^-autorun$/ ) {
-            my $value = $ARGV[++$i];
-            if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $autorun = 1 };
-        }
-
-        if ( $ARGV[$i] =~ /^-autoimpress$/ ) {
-            my $value = $ARGV[++$i];
-            if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $autoimpress = 1 };
-        }
-
-        if ( $ARGV[$i] =~ /^-debug$/ ) {
-            my $value = $ARGV[++$i];
-            if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $debug = 1 };
-        }
-
-        if ( $ARGV[$i] =~ /^-ooo$/ ) {
-            my $value = $ARGV[++$i];
-            if ($value =~ /^true$/ || ($value =~ /^1$/ )) { $is_ooo = 1 };
-        }
-    }
-
-}
-
-sub getSubDirsFullPath {
-    my ($startDir, $DirArray_ref) = @_;
-    my ($dir);
-    opendir(DIR,"$startDir");
-    while($dir = readdir(DIR)) {
-        if (($dir !~ /\.$/) and ( -d "$startDir$dir") ) {
-            push (@{$DirArray_ref}, "$startDir$dir");
-        }
-    }
-    closedir(DIR);
-}
-
-sub errorFromOpen {
-    my ($file) = @_;
-    print_error( "can not open $file", "1");
-}
-
diff --git a/solenv/bin/leconvert.pl b/solenv/bin/leconvert.pl
index 48723c1d79f0..dec0d333f99d 100755
--- a/solenv/bin/leconvert.pl
+++ b/solenv/bin/leconvert.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: leconvert.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/licinserter.pl b/solenv/bin/licinserter.pl
index b01a85b75731..bfb4d1999fe1 100644
--- a/solenv/bin/licinserter.pl
+++ b/solenv/bin/licinserter.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: licinserter.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index a413e485b30a..fe75d0d562d4 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -12,14 +12,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: linkoo,v $
-#
-# $Revision: 1.17 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,7 +53,7 @@ export OOO_DISABLE_RECOVERY=1
 $program_dir = 'program';
 $program_dir = 'MacOS' if ($ENV{OS} eq 'MACOSX');
 
-my @exceptions = ( 'cppuhelper', 'configmgr2', 'sunjavaplugin', 'libjvmfwk' );
+my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
 
 %replaceable = (
 	$program_dir => '\.so',
@@ -298,9 +294,6 @@ sub link_soffice_bin_files()
     do_link ($src, $dest, 'intro.bmp', 'intro.bmp', 1);
     do_link ("$OOO_INSTALL", "$OOO_BUILD/desktop/$TARGET", 'share', 'share', 1);
 
-    $dest = "$OOO_BUILD/configmgr/$TARGET/lib";
-    do_link ($src, $dest, 'configmgrrc', 'configmgrrc', 1);
-
     print "\n";
 }
 
diff --git a/solenv/bin/localize b/solenv/bin/localize
index 74a75ecc3aee..e14b149226b5 100755
--- a/solenv/bin/localize
+++ b/solenv/bin/localize
@@ -12,9 +12,9 @@ else
     export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
 fi
 
-if [ x${SOLARVER}x = xx -o x${UPDMINOR}x = xx  ]; then
+if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
     exec perl -w $SOLARVERSION/$INPATH/bin/localize.pl "$@"
 else
-    exec perl -w $SOLARVERSION/$INPATH/bin.$UPDMINOR/localize.pl "$@"
+    exec perl -w $SOLARVERSION/$INPATH/bin$UPDMINOREXT/localize.pl "$@"
 fi
 
diff --git a/solenv/bin/localize_sl b/solenv/bin/localize_sl
new file mode 100755
index 000000000000..df8205cf6d22
--- /dev/null
+++ b/solenv/bin/localize_sl
@@ -0,0 +1,18 @@
+#!/bin/sh
+if [ x${SOLARENV}x = xx ]; then
+    echo No environment found, please use 'setsolar'
+exit 1
+fi
+
+if [ "${OS?}" = MACOSX ]; then
+    export DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH+${DYLD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+else
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${SOLARVERSION?}/${INPATH?}/lib${UPDMINOREXT}
+fi
+
+if [ x${SOLARVER}x = xx -o x${UPDMINOREXT}x = xx  ]; then
+    exec $SOLARVERSION/$INPATH/bin/localize_sl "$@"
+else
+    exec $SOLARVERSION/$INPATH/bin$UPDMINOREXT/localize_sl "$@"
+fi
+
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index c6eb30c8ed5d..6f824f34ff0c 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: macosx-change-install-names.pl,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/macosx-create-bundle b/solenv/bin/macosx-create-bundle
index f4cbeacc20f1..ba7d624e68f3 100755
--- a/solenv/bin/macosx-create-bundle
+++ b/solenv/bin/macosx-create-bundle
@@ -3,14 +3,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: macosx-create-bundle,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/macosx-dylib-link-list.pl b/solenv/bin/macosx-dylib-link-list.pl
index 159eb66d782d..1554bbe56016 100644
--- a/solenv/bin/macosx-dylib-link-list.pl
+++ b/solenv/bin/macosx-dylib-link-list.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: macosx-dylib-link-list.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/make_download.pl b/solenv/bin/make_download.pl
index 464b0d75e25d..dd492ea3bfa1 100644
--- a/solenv/bin/make_download.pl
+++ b/solenv/bin/make_download.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: make_installer.pl,v $
-#
-# $Revision: 1.121 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/make_ext_update_info.pl b/solenv/bin/make_ext_update_info.pl
index e3dac8a95cbe..f350dc489386 100755
--- a/solenv/bin/make_ext_update_info.pl
+++ b/solenv/bin/make_ext_update_info.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: make_ext_update_info.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 6458fbfdc5cb..bde0763e4564 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -2,12 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: make_installer.pl,v $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -396,9 +394,14 @@ if ( $installer::globals::globallogging ) { installer::files::save_hash($logging
 installer::setupscript::add_forced_properties($allvariableshashref);
 if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables5.log", $allvariableshashref); }
 
+# Replacing preset properties, not using the default mechanisms (for example for UNIXPRODUCTNAME)
+installer::setupscript::replace_preset_properties($allvariableshashref);
+if ( $installer::globals::globallogging ) { installer::files::save_hash($loggingdir . "allvariables6.log", $allvariableshashref); }
+
 installer::scpzipfiles::replace_all_ziplistvariables_in_file($setupscriptref, $allvariableshashref);
 if ( $installer::globals::globallogging ) { installer::files::save_file($loggingdir . "setupscript3.log" ,$setupscriptref); }
 
+
 installer::logger::log_hashref($allvariableshashref);
 
 installer::logger::print_message( "... analyzing directories ... \n" );
diff --git a/solenv/bin/makemani.pl b/solenv/bin/makemani.pl
index df11a50c7e17..cdebaab77617 100644
--- a/solenv/bin/makemani.pl
+++ b/solenv/bin/makemani.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makemani.pl,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/mapgen.pl b/solenv/bin/mapgen.pl
index 9d1c837377b6..48c335c2adba 100644
--- a/solenv/bin/mapgen.pl
+++ b/solenv/bin/mapgen.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: mapgen.pl,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl
index 52a62ef70040..f2d0acc649f6 100644
--- a/solenv/bin/mhids.pl
+++ b/solenv/bin/mhids.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: mhids.pl,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/mkdir.pl b/solenv/bin/mkdir.pl
index d2a374adfc67..85c2cc78f199 100755
--- a/solenv/bin/mkdir.pl
+++ b/solenv/bin/mkdir.pl
@@ -7,7 +7,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 # options -p (for compatibility)
 #         -mode mode
 #
-# Copyright (c) 2000 Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 
 use Cwd;
 
diff --git a/solenv/bin/mkout.pl b/solenv/bin/mkout.pl
index d803e83bf991..4839b8525bb9 100755
--- a/solenv/bin/mkout.pl
+++ b/solenv/bin/mkout.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: mkout.pl,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/CreatePDBRelocators.pm b/solenv/bin/modules/CreatePDBRelocators.pm
index 0b57e748b486..8f272fe896f8 100644
--- a/solenv/bin/modules/CreatePDBRelocators.pm
+++ b/solenv/bin/modules/CreatePDBRelocators.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: CreatePDBRelocators.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/Cws.pm b/solenv/bin/modules/Cws.pm
index 2ec5d13ff88c..6948c21d554e 100755
--- a/solenv/bin/modules/Cws.pm
+++ b/solenv/bin/modules/Cws.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: Cws.pm,v $
-#
-# $Revision: 1.26 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/CwsConfig.pm b/solenv/bin/modules/CwsConfig.pm
index 3574bc89e7a8..6121691e1e7f 100644
--- a/solenv/bin/modules/CwsConfig.pm
+++ b/solenv/bin/modules/CwsConfig.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: CwsConfig.pm,v $
-#
-# $Revision: 1.11.44.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/Eis.pm b/solenv/bin/modules/Eis.pm
index f06c0387d64f..696595f5af71 100755
--- a/solenv/bin/modules/Eis.pm
+++ b/solenv/bin/modules/Eis.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: Eis.pm,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/GenInfoParser.pm b/solenv/bin/modules/GenInfoParser.pm
index c211c0c82a28..2671da13a69d 100644
--- a/solenv/bin/modules/GenInfoParser.pm
+++ b/solenv/bin/modules/GenInfoParser.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: GenInfoParser.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index e43b1f50a990..c3503221b8fa 100644
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: SourceConfig.pm,v $
-#
-# $Revision: 1.0 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,10 +38,12 @@ package SourceConfig;
 use strict;
 
 use constant SOURCE_CONFIG_FILE_NAME => 'source_config';
+use constant SOURCE_CONFIG_VERSION => 2;
 
 use Carp;
 use Cwd;
 use File::Basename;
+use File::Temp qw(tmpnam);
 
 my $debug = 0;
 
@@ -57,22 +55,37 @@ sub new {
     my $proto = shift;
     my $class = ref($proto) || $proto;
     my $source_root = shift;
+    my $self = {};
+    $self->{USER_SOURCE_ROOT} = undef;
     if (defined $source_root) {
+        $self->{USER_SOURCE_ROOT} = $source_root;
         $source_root =~ s/\\|\/$//;
+        $source_root .= '/..';
     } else {
-        $source_root = $ENV{SOLARSRC};
+        $source_root = $ENV{SOURCE_ROOT_DIR};
     };
-    my $self = {};
+    $self->{SOURCE_ROOT} = Cwd::realpath($source_root);
     $self->{DEBUG} = 0;
-    $self->{SOURCE_ROOT} = $source_root;
+    $self->{VERBOSE} = 0;
     $self->{REPOSITORIES} = {};
+    $self->{ACTIVATED_REPOSITORIES} = {};
     $self->{MODULE_PATHS} = {};
     $self->{MODULE_BUILD_LIST_PATHS} = {};
     $self->{ACTIVATED_MODULES} = {};
     $self->{MODULE_REPOSITORY} = {};
     $self->{REAL_MODULES} = {};
-    $self->{SOURCE_CONFIG_FILE} = get_config_file($source_root);
-    $self->{SOURCE_CONFIG_DEFAULT} = Cwd::realpath($source_root) .'/'.SOURCE_CONFIG_FILE_NAME;
+    $self->{NEW_MODULES} = [];
+    $self->{REMOVE_MODULES} = {};
+    $self->{REMOVE_REPOSITORIES} = {};
+    $self->{NEW_REPOSITORIES} = [];
+    $self->{WARNINGS} = [];
+    $self->{REPORT_MESSAGES} = [];
+    $self->{CONFIG_FILE_CONTENT} = [];
+    if (defined $self->{USER_SOURCE_ROOT}) {
+        ${$self->{REPOSITORIES}}{File::Basename::basename($self->{USER_SOURCE_ROOT})} = $self->{USER_SOURCE_ROOT};
+    };
+    $self->{SOURCE_CONFIG_FILE} = get_config_file($self->{SOURCE_ROOT});
+    $self->{SOURCE_CONFIG_DEFAULT} = $self->{SOURCE_ROOT} .'/'.SOURCE_CONFIG_FILE_NAME;
     read_config_file($self);
     bless($self, $class);
     return $self;
@@ -80,6 +93,10 @@ sub new {
 
 ##### methods #####
 
+sub get_version {
+    return SOURCE_CONFIG_VERSION;
+};
+
 sub get_repositories
 {
     my $self        = shift;
@@ -201,30 +218,56 @@ sub get_module_paths {
             croak("Cannot read $_ repository content");
         };
     };
+    my @false_actives = ();
+    foreach (keys %{$self->{ACTIVATED_MODULES}}) {
+        push(@false_actives, $_) if (!defined  ${$self->{MODULE_PATHS}}{$_});
+    };
+    croak("Error!! Activated module(s): @false_actives\nnot found in the active repositories!! Please check your " . $self->{SOURCE_CONFIG_FILE} . "\n") if (scalar @false_actives);
     croak("No modules found!") if (!scalar keys %{$self->{MODULE_PATHS}});
 };
 
 sub get_config_file {
     my $source_root = shift;
-    foreach ($source_root, $source_root . '/..') {
-        if (-f $_ . '/' . SOURCE_CONFIG_FILE_NAME) {
-            return Cwd::realpath($_) .'/'.SOURCE_CONFIG_FILE_NAME;
+    my $possible_path = $source_root . '/' . SOURCE_CONFIG_FILE_NAME;
+    return $possible_path if (-f $possible_path);
+    return '';
+};
+
+sub get_hg_root {
+    my $self = shift;
+    return $self->{USER_SOURCE_ROOT} if (defined $self->{USER_SOURCE_ROOT});
+    my $hg_root;
+    if (open(COMMAND, "hg root 2>&1 |")) {
+        foreach (<COMMAND>) {
+            next if (/^Not trusting file/);
+            chomp;
+            $hg_root = $_;
+            last;
+        };
+        close COMMAND;
+        chomp $hg_root;
+        if ($hg_root !~ /There is no Mercurial repository here/) {
+            return $hg_root;
         };
     };
-    return '';
+    croak('Cannot open find source_config and/or determine hg root directory for ' . cwd());
 };
 
 sub read_config_file {
     my $self = shift;
     if (!$self->{SOURCE_CONFIG_FILE}) {
-        ${$self->{REPOSITORIES}}{File::Basename::basename($self->{SOURCE_ROOT})} = $self->{SOURCE_ROOT};
+        my $repository_root = get_hg_root($self);
+        ${$self->{REPOSITORIES}}{File::Basename::basename($repository_root)} = $repository_root;
         return;
     };
     my $repository_section = 0;
     my $module_section = 0;
     my $line = 0;
+    my @file_content = ();
+
     if (open(SOURCE_CONFIG_FILE, $self->{SOURCE_CONFIG_FILE})) {
         foreach (<SOURCE_CONFIG_FILE>) {
+            push (@{$self->{CONFIG_FILE_CONTENT}}, $_);
             $line++;
             chomp;
             next if (!/^\S+/);
@@ -243,7 +286,11 @@ sub read_config_file {
             next if (!$repository_section && !$module_section);
             if (/\s*(\S+)=active\s*(\s+#)*/) {
                 if ($repository_section) {
-                    ${$self->{REPOSITORIES}}{$1} = File::Basename::dirname($self->{SOURCE_ROOT}) . "/$1";
+                    ${$self->{REPOSITORIES}}{$1} = $self->{SOURCE_ROOT} . "/$1";
+                    ${$self->{ACTIVATED_REPOSITORIES}}{$1}++;
+                    if (defined $ENV{UPDMINOREXT}) {
+                        ${$self->{REPOSITORIES}}{$1} .= $ENV{UPDMINOREXT};
+                    };
                     next;
                 }
                 if ($module_section) {
@@ -254,11 +301,197 @@ sub read_config_file {
             croak("Line $line in " . $self->{SOURCE_CONFIG_FILE} . 'violates format. Please make your checks!!');
         };
         close SOURCE_CONFIG_FILE;
+        if (!scalar keys %{$self->{REPOSITORIES}}) {
+            # Fallback - default repository is the directory where is our module...
+            my $hg_root = get_hg_root($self);
+            ${$self->{REPOSITORIES}}{File::Basename::basename($hg_root)} = $hg_root;
+        };
     } else {
         croak('Cannot open ' . $self->{SOURCE_CONFIG_FILE} . 'for reading');
     };
 };
 
+sub remove_all_activated_repositories {
+    my $self = shift;
+    $self->remove_activated_repositories([keys %{$self->{ACTIVATED_REPOSITORIES}}]);
+};
+
+sub remove_activated_repositories {
+    my $self = shift;
+    my $new_repositories_ref = shift;
+    push(@{$self->{WARNINGS}}, "\nWARNING: Empty repository list passed for removing from source_config\n") if (!scalar @$new_repositories_ref);
+    $self->{VERBOSE} = shift;
+    $self->{REMOVE_REPOSITORIES} = {};
+    foreach (@$new_repositories_ref) {
+        if (!defined ${$self->{ACTIVATED_REPOSITORIES}}{$_}) {
+            push (@{$self->{WARNINGS}}, "\nWARNING: repository $_ is not activated in ". $self->get_config_file_default_path()."\n");
+        } else {
+            ${$self->{REMOVE_REPOSITORIES}}{$_}++;
+            delete ${$self->{ACTIVATED_REPOSITORIES}}{$_};
+        };
+    };
+    generate_config_file($self);
+};
+
+sub remove_all_activated_modules {
+    my $self = shift;
+    $self->remove_activated_modules([keys %{$self->{ACTIVATED_MODULES}}]);
+};
+
+sub remove_activated_modules {
+    my $self = shift;
+    my $new_modules_ref = shift;
+    push(@{$self->{WARNINGS}}, "\nWARNING: Empty module list passed for removing from source_config\n") if (!scalar @$new_modules_ref);
+    $self->{VERBOSE} = shift;
+    $self->{REMOVE_MODULES} = {};
+    foreach (@$new_modules_ref) {
+        if (!defined ${$self->{ACTIVATED_MODULES}}{$_}) {
+            push (@{$self->{WARNINGS}}, "\nWARNING: module $_ is not activated in ". $self->get_config_file_default_path()."\n");
+        } else {
+            ${$self->{REMOVE_MODULES}}{$_}++;
+            delete ${$self->{ACTIVATED_MODULES}}{$_};
+        };
+    };
+    generate_config_file($self);
+};
+
+sub add_active_repositories {
+    my $self = shift;
+    $self->{NEW_REPOSITORIES} = shift;
+    croak('Empty module list passed for adding to source_config') if (!scalar @{$self->{NEW_REPOSITORIES}});
+    $self->{VERBOSE} = shift;
+    generate_config_file($self);
+};
+
+sub add_active_modules {
+    my $self = shift;
+    $self->{NEW_MODULES} = shift;
+    croak('Empty module list passed for adding to source_config') if (!scalar @{$self->{NEW_MODULES}});
+    $self->{VERBOSE} = shift;
+    generate_config_file($self);
+};
+
+sub add_content {
+    my $self = shift;
+    my $content = shift;
+    my $entries_to_add = shift;
+    return if (!scalar @$entries_to_add);
+    my $message;
+    my $message_part1;
+    my $warning_message;
+    my $activated_entries;
+
+    if ($entries_to_add == $self->{NEW_MODULES}) {
+        $self->{NEW_MODULES} = [];
+        $message_part1 = "Module(s):\n";
+        $activated_entries = $self->{ACTIVATED_MODULES};
+    } elsif ($entries_to_add == $self->{NEW_REPOSITORIES}) {
+        $self->{NEW_REPOSITORIES} = [];
+        $message_part1 = "Repositories:\n";
+        $activated_entries = $self->{ACTIVATED_REPOSITORIES};
+    };
+    foreach my $entry (@$entries_to_add) {
+        if (defined $$activated_entries{$entry}) {
+            $warning_message .= "$entry "
+        } else {
+            push(@$content, "$entry=active\n");
+            ${$activated_entries}{$entry}++;
+            $message .= "$entry "
+        };
+    };
+
+    push(@{$self->{REPORT_MESSAGES}}, "\n$message_part1 $message\nhave been added to the ". $self->get_config_file_default_path()."\n") if ($message);
+    push (@{$self->{WARNINGS}}, "\nWARNING: $message_part1 $warning_message\nare already added to the ". $self->get_config_file_default_path()."\n") if ($warning_message);
+};
+
+sub generate_config_file {
+    my $self = shift;
+    my @config_content_new = ();
+    my ($module_section, $repository_section);
+    my %removed_modules = ();
+    my %removed_repositories = ();
+    foreach (@{$self->{CONFIG_FILE_CONTENT}}) {
+        if (/^\[repositories\]\s*(\s+#)*/) {
+            if ($module_section) {
+                $self->add_content(\@config_content_new, $self->{NEW_MODULES});
+            };
+            $module_section = 0;
+            $repository_section = 1;
+        };
+        if (/^\[modules\]\s*(\s+#)*/) {
+            if ($repository_section) {
+                $self->add_content(\@config_content_new, $self->{NEW_REPOSITORIES});
+            };
+            $module_section = 1;
+            $repository_section = 0;
+        };
+        if ($module_section && /\s*(\S+)=active\s*(\s+#)*/) {
+            if (defined ${$self->{REMOVE_MODULES}}{$1}) {
+                $removed_modules{$1}++;
+                next;
+            };
+        }
+        if ($repository_section && /\s*(\S+)=active\s*(\s+#)*/) {
+            if (defined ${$self->{REMOVE_REPOSITORIES}}{$1}) {
+                $removed_repositories{$1}++;
+                next;
+            };
+        }
+        push(@config_content_new, $_);
+    };
+    if (scalar @{$self->{NEW_MODULES}}) {
+        push(@config_content_new, "[modules]\n") if (!$module_section);
+        $self->add_content(\@config_content_new, $self->{NEW_MODULES});
+    };
+    if (scalar @{$self->{NEW_REPOSITORIES}}) {
+        push(@config_content_new, "[repositories]\n") if (!$repository_section);
+        $self->add_content(\@config_content_new, $self->{NEW_REPOSITORIES});
+    };
+    if (scalar keys %removed_modules) {
+        my @deleted_modules = keys %removed_modules;
+        push(@{$self->{REPORT_MESSAGES}}, "\nModules: @deleted_modules\nhave been removed from the ". $self->get_config_file_default_path()."\n");
+
+    };
+    if (scalar keys %removed_repositories) {
+        my @deleted_repositories = keys %removed_repositories;
+        push(@{$self->{REPORT_MESSAGES}}, "\nRepositories: @deleted_repositories\nhave been removed from the ". $self->get_config_file_default_path()."\n");
+
+    };
+
+    # Writing file, printing warnings and reports
+
+    #check if we need to write a new file
+    my $write_needed = 0;
+    if ((scalar @{$self->{CONFIG_FILE_CONTENT}}) != (scalar @config_content_new)) {
+        $write_needed++;
+    } else {
+        foreach my $i (0 .. $#{$self->{CONFIG_FILE_CONTENT}}) {
+            if (${$self->{CONFIG_FILE_CONTENT}}[$i] ne $config_content_new[$i]) {
+                $write_needed++;
+                last;
+            };
+        };
+    };
+    if ($write_needed) {
+        my $temp_config_file = File::Temp::tmpnam($ENV{TMP});
+        die("Cannot open $temp_config_file") if (!open(NEW_CONFIG, ">$temp_config_file"));
+        print NEW_CONFIG $_ foreach (@config_content_new);
+        close NEW_CONFIG;
+        rename($temp_config_file, $self->get_config_file_default_path()) or  system("mv", $temp_config_file, $self->get_config_file_default_path());
+        if (-e $temp_config_file) {
+            system("rm -rf $temp_config_file") if (!unlink $temp_config_file);
+        };
+        $self->{CONFIG_FILE_CONTENT} = \@config_content_new;
+    };
+    if ($self->{VERBOSE}) {
+        print $_ foreach (@{$self->{WARNINGS}});
+        $self->{VERBOSE} = 0;
+    };
+    $self->{WARNINGS} = [];
+    print $_ foreach (@{$self->{REPORT_MESSAGES}});
+    $self->{REPORT_MESSAGES} = [];
+};
+
 ##### finish #####
 
 1; # needed by use or require
@@ -294,6 +527,10 @@ SourceConfig::new()
 
 Creates a new instance of SourceConfig. Can't fail.
 
+SourceConfig::get_version()
+
+Returns version number of the module. Can't fail.
+
 
 SourceConfig::get_repositories()
 
@@ -333,9 +570,35 @@ SourceConfig::is_active()
 Returns 1 (TRUE) if a module is active
 Returns 0 (FALSE) if a module is not active
 
+SourceConfig::add_active_modules($module_array_ref)
+
+Adds modules from the @$module_array_ref as active to the source_config file
+
+SourceConfig::add_active_repositories($repository_array_ref)
+
+Adds repositories from the @$repository_array_ref as active to the source_config file
+
+SourceConfig::remove_activated_modules($module_array_ref)
+
+Removes modules from the @$module_array_ref from the source_config file
+
+SourceConfig::remove_all_activated_modules()
+
+Removes all activated modules from the source_config file
+
+SourceConfig::remove_activated_repositories($repository_array_ref)
+
+Removes repositories from the @$repository_array_ref from the source_config file
+
+SourceConfig::remove_all_activated_repositories()
+
+Removes all activated repositories from the source_config file
+
+
 =head2 EXPORT
 
 SourceConfig::new()
+SourceConfig::get_version()
 SourceConfig::get_repositories()
 SourceConfig::get_active_modules()
 SourceConfig::get_all_modules()
@@ -345,6 +608,12 @@ SourceConfig::get_module_repository($module)
 SourceConfig::get_config_file_path()
 SourceConfig::get_config_file_default_path()
 SourceConfig::is_active($module)
+SourceConfig::add_active_modules($module_array_ref)
+SourceConfig::add_active_repositories($repository_array_ref)
+SourceConfig::remove_activated_modules($module_array_ref)
+SourceConfig::remove_all_activated_modules()
+SourceConfig::remove_activated_repositories($repository_array_ref)
+SourceConfig::remove_all_activated_repositories()
 
 =head1 AUTHOR
 
diff --git a/solenv/bin/modules/installer/archivefiles.pm b/solenv/bin/modules/installer/archivefiles.pm
index 62a35193cd69..80c468b61db2 100644
--- a/solenv/bin/modules/installer/archivefiles.pm
+++ b/solenv/bin/modules/installer/archivefiles.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: archivefiles.pm,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/configuration.pm b/solenv/bin/modules/installer/configuration.pm
index ed6a5b4b2707..4aa82d25b5b2 100644
--- a/solenv/bin/modules/installer/configuration.pm
+++ b/solenv/bin/modules/installer/configuration.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: configuration.pm,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index b58f376486e0..7818b74f4b40 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: control.pm,v $
-#
-# $Revision: 1.42 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/converter.pm b/solenv/bin/modules/installer/converter.pm
index 72901448598a..beeec52b71ac 100644
--- a/solenv/bin/modules/installer/converter.pm
+++ b/solenv/bin/modules/installer/converter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: converter.pm,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/copyproject.pm b/solenv/bin/modules/installer/copyproject.pm
index ed826d692df5..5db9cf7f8b04 100644
--- a/solenv/bin/modules/installer/copyproject.pm
+++ b/solenv/bin/modules/installer/copyproject.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: copyproject.pm,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 4fbe8d4255f8..46512e525046 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: download.pm,v $
-#
-# $Revision: 1.47 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1043,6 +1039,10 @@ sub nsis_language_converter
 
     my $nsislanguage = "";
 
+    # Assign language used by NSIS.
+    # The files "$nsislanguage.nsh" and "$nsislanguage.nlf"
+    # are needed in the NSIS environment.
+    # Directory: <NSIS-Dir>/Contrib/Language files
     if ( $language eq "en-US" ) { $nsislanguage = "English"; }
     elsif ( $language eq "sq" ) { $nsislanguage = "Albanian"; }
     elsif ( $language eq "ar" ) { $nsislanguage = "Arabic"; }
@@ -1061,6 +1061,7 @@ sub nsis_language_converter
     elsif ( $language eq "fr" ) { $nsislanguage = "French"; }
     elsif ( $language eq "hu" ) { $nsislanguage = "Hungarian"; }
     elsif ( $language eq "he" ) { $nsislanguage = "Hebrew"; }
+    elsif ( $language eq "is" ) { $nsislanguage = "Icelandic"; }
     elsif ( $language eq "id" ) { $nsislanguage = "Indonesian"; }
     elsif ( $language eq "it" ) { $nsislanguage = "Italian"; }
     elsif ( $language eq "lv" ) { $nsislanguage = "Latvian"; }
diff --git a/solenv/bin/modules/installer/downloadsigner.pm b/solenv/bin/modules/installer/downloadsigner.pm
index ad6ddabece55..aa3bbb25a484 100644
--- a/solenv/bin/modules/installer/downloadsigner.pm
+++ b/solenv/bin/modules/installer/downloadsigner.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: remover.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index c51612722fd9..2ee6fd41af47 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: environment.pm,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -80,6 +76,30 @@ sub create_pathvariables
 }
 
 ##################################################
+# Replacing tilde in pathes, because of
+# problem with deep recursion (task 104830)
+##################################################
+
+sub check_tilde_in_directory
+{
+    if ( $ENV{'HOME'} )
+    {
+        my $home = $ENV{'HOME'};
+        $home =~ s/\Q$installer::globals::separator\E\s*$//;
+        $installer::globals::localinstalldir =~ s/~/$home/;
+        my $infoline = "Info: Changing LOCALINSTALLDIR to $installer::globals::localinstalldir\n";
+        push(@installer::globals::logfileinfo, $infoline);
+    }
+    else
+    {
+        # exit, because "~" is not allowed, if HOME is not set
+        my $infoline = "ERROR: If \"~\" is used in \"LOCALINSTALLDIR\", environment variable \"HOME\" needs to be defined!\n";
+        push(@installer::globals::logfileinfo, $infoline);
+        installer::exiter::exit_program("ERROR: If \"~\" is used in \"LOCALINSTALLDIR\", environment variable \"HOME\" needs to be defined!", "check_tilde_in_directory");
+    }
+}
+
+##################################################
 # Setting some fundamental global variables.
 # All these variables can be overwritten
 # by parameters.
@@ -111,6 +131,9 @@ sub set_global_environment_variables
     if ( $ENV{'SOLAR_JAVA'} ) { $installer::globals::solarjavaset = 1; }
     if ( $ENV{'RPM'} ) { $installer::globals::rpm = $ENV{'RPM'}; }
     if ( $ENV{'DONTCOMPRESS'} ) { $installer::globals::solarisdontcompress = 1; }
+
+    # Special handling, if LOCALINSTALLDIR contains "~" in the path
+    if ( $installer::globals::localinstalldir =~ /^\s*\~/ ) { check_tilde_in_directory(); }
 }
 
 1;
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 8b8a7aa2bafb..ffe79136b57e 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: epmfile.pm,v $
-#
-# $Revision: 1.87 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -2548,6 +2544,7 @@ sub create_packages_without_epm
             my $dir = getcwd;
             my $buildroot = $dir . "/" . $epmdir . "buildroot/";
             $buildrootstring = "--buildroot=$buildroot";
+            mkdir($buildroot = $dir . "/" . $epmdir . "BUILD/");
         }
 
         my $systemcall = "$rpmcommand -bb --define \"_unpackaged_files_terminate_build  0\" $specfilename --target $target $buildrootstring 2\>\&1 |";
@@ -2723,6 +2720,15 @@ sub remove_temporary_epm_files
 
         my $returnvalue = system($systemcall);
 
+        $removedir = $epmdir . "BUILD";
+
+        $systemcall = "rm -rf $removedir";
+
+        installer::logger::print_message( "... $systemcall ...\n" );
+
+        $returnvalue = system($systemcall);
+
+
         my $infoline = "Systemcall: $systemcall\n";
         push( @installer::globals::logfileinfo, $infoline);
 
diff --git a/solenv/bin/modules/installer/existence.pm b/solenv/bin/modules/installer/existence.pm
index bcdcfa478a78..1ecf9ce9965b 100644
--- a/solenv/bin/modules/installer/existence.pm
+++ b/solenv/bin/modules/installer/existence.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: existence.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/exiter.pm b/solenv/bin/modules/installer/exiter.pm
index 15192ca86378..d5976f428b93 100644
--- a/solenv/bin/modules/installer/exiter.pm
+++ b/solenv/bin/modules/installer/exiter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: exiter.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/files.pm b/solenv/bin/modules/installer/files.pm
index db869ad7906a..73ea26738b05 100644
--- a/solenv/bin/modules/installer/files.pm
+++ b/solenv/bin/modules/installer/files.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: files.pm,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/followme.pm b/solenv/bin/modules/installer/followme.pm
index 0a1ef456adcb..1abc035d5615 100644
--- a/solenv/bin/modules/installer/followme.pm
+++ b/solenv/bin/modules/installer/followme.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: environment.pm,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 1a54e46a9da2..b646b071dda0 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: globals.pm,v $
-#
-# $Revision: 1.103.16.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -184,7 +180,7 @@ BEGIN
     $installertypedir = "";
     $controlledmakecabversion = "5";
     $saved_packages_path = "";
-    $max_lang_length = 50;
+    $max_lang_length = 65;
     $globalblock = "Globals";
     $rootmodulegid = "";
     %alllangmodules = ();
@@ -237,7 +233,7 @@ BEGIN
     $mergefiles_added_into_collector = 0;
     $creating_windows_installer_patch = 0;
 
-    $strip = 1;
+    $strip = $ENV{DISABLE_STRIP} eq '';
     $solarjava = 0;
     $jdklib = "";
     $jrepath = "";
@@ -272,7 +268,7 @@ BEGIN
     $isopensourceproduct = 1;
     $manufacturer = "";
     $longmanufacturer = "";
-    $sundirname = "Sun";
+    $sundirname = "";
     $codefilename = "codes.txt";
     $componentfilename = "components.txt";
     $productcode = "";
diff --git a/solenv/bin/modules/installer/javainstaller.pm b/solenv/bin/modules/installer/javainstaller.pm
index b9735e5aee29..f68346bdcce2 100644
--- a/solenv/bin/modules/installer/javainstaller.pm
+++ b/solenv/bin/modules/installer/javainstaller.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: javainstaller.pm,v $
-#
-# $Revision: 1.30 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/languagepack.pm b/solenv/bin/modules/installer/languagepack.pm
index 11b8ecbd2edb..ded5bc3d2e21 100644
--- a/solenv/bin/modules/installer/languagepack.pm
+++ b/solenv/bin/modules/installer/languagepack.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: languagepack.pm,v $
-#
-# $Revision: 1.16.226.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/languages.pm b/solenv/bin/modules/installer/languages.pm
index 978a213bda35..7070b09f80b8 100644
--- a/solenv/bin/modules/installer/languages.pm
+++ b/solenv/bin/modules/installer/languages.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: languages.pm,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/logger.pm b/solenv/bin/modules/installer/logger.pm
index 26d0b6313743..c5982c6a05f9 100644
--- a/solenv/bin/modules/installer/logger.pm
+++ b/solenv/bin/modules/installer/logger.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: logger.pm,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/mail.pm b/solenv/bin/modules/installer/mail.pm
index 054eccf3f4db..3580b3f3b6ab 100644
--- a/solenv/bin/modules/installer/mail.pm
+++ b/solenv/bin/modules/installer/mail.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: mail.pm,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/packagelist.pm b/solenv/bin/modules/installer/packagelist.pm
index 79eaa3a96d7d..f2becc19a610 100644
--- a/solenv/bin/modules/installer/packagelist.pm
+++ b/solenv/bin/modules/installer/packagelist.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: packagelist.pm,v $
-#
-# $Revision: 1.19 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/packagepool.pm b/solenv/bin/modules/installer/packagepool.pm
index 4ca68bf30d38..d4032b7db17e 100644
--- a/solenv/bin/modules/installer/packagepool.pm
+++ b/solenv/bin/modules/installer/packagepool.pm
@@ -1,35 +1,27 @@
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-#   $RCSfile: copyproject.pm,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $Revision: 1.8 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   last change: $Author: obo $ $Date: 2007/07/19 07:16:23 $
+# This file is part of OpenOffice.org.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# 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).
 #
-#     GNU Lesser General Public License Version 2.1
-#     =============================================
-#     Copyright 2005 by Sun Microsystems, Inc.
-#     901 San Antonio Road, Palo Alto, CA 94303, USA
-#
-#     This library is free software; you can redistribute it and/or
-#     modify it under the terms of the GNU Lesser General Public
-#     License version 2.1, as published by the Free Software Foundation.
-#
-#     This library 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 for more details.
-#
-#     You should have received a copy of the GNU Lesser General Public
-#     License along with this library; if not, write to the Free Software
-#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-#     MA  02111-1307  USA
+# 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.
 #
 #*************************************************************************
 
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index b065dc5ca5d6..bb38eede2375 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: parameter.pm,v $
-#
-# $Revision: 1.56 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/pathanalyzer.pm b/solenv/bin/modules/installer/pathanalyzer.pm
index 3aa6ece5f691..1c57a0d76e02 100644
--- a/solenv/bin/modules/installer/pathanalyzer.pm
+++ b/solenv/bin/modules/installer/pathanalyzer.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: pathanalyzer.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/profiles.pm b/solenv/bin/modules/installer/profiles.pm
index 5bea2b9f9b27..3feef2e8a367 100644
--- a/solenv/bin/modules/installer/profiles.pm
+++ b/solenv/bin/modules/installer/profiles.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: profiles.pm,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/regmerge.pm b/solenv/bin/modules/installer/regmerge.pm
index bb6461b00d7d..1c2821549131 100644
--- a/solenv/bin/modules/installer/regmerge.pm
+++ b/solenv/bin/modules/installer/regmerge.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: regmerge.pm,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/remover.pm b/solenv/bin/modules/installer/remover.pm
index e142682be614..541a33bce4c1 100644
--- a/solenv/bin/modules/installer/remover.pm
+++ b/solenv/bin/modules/installer/remover.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: remover.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/scppatchsoname.pm b/solenv/bin/modules/installer/scppatchsoname.pm
index bc358903093c..32a142828981 100644
--- a/solenv/bin/modules/installer/scppatchsoname.pm
+++ b/solenv/bin/modules/installer/scppatchsoname.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: scppatchsoname.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/scpzipfiles.pm b/solenv/bin/modules/installer/scpzipfiles.pm
index f5a242b5ff0a..52dea6032ee1 100644
--- a/solenv/bin/modules/installer/scpzipfiles.pm
+++ b/solenv/bin/modules/installer/scpzipfiles.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: scpzipfiles.pm,v $
-#
-# $Revision: 1.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 5f02acab8e81..778ca23e740a 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: scriptitems.pm,v $
-#
-# $Revision: 1.53 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/servicesfile.pm b/solenv/bin/modules/installer/servicesfile.pm
index f0afea5583a6..38c21a57593b 100644
--- a/solenv/bin/modules/installer/servicesfile.pm
+++ b/solenv/bin/modules/installer/servicesfile.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: servicesfile.pm,v $
-#
-# $Revision: 1.33 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/setupscript.pm b/solenv/bin/modules/installer/setupscript.pm
index a131d32b21c0..9da5340f915f 100644
--- a/solenv/bin/modules/installer/setupscript.pm
+++ b/solenv/bin/modules/installer/setupscript.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: setupscript.pm,v $
-#
-# $Revision: 1.19 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -160,13 +156,28 @@ sub add_lowercase_productname_setupscriptvariable
                 push(@{$variablesref} ,$newline);
                 $value = $original;
                 $value =~ s/\s/\_/g;
+                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
                 $newline = "\%UNIXPRODUCTNAME " . lc($value) . "\n";
                 push(@{$variablesref} ,$newline);
+                $newline = "\%SYSTEMINTUNIXPACKAGENAME " . lc($value) . "\n";
+                push(@{$variablesref} ,$newline);
+                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
+                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $2 . $4; }
+                $newline = "\%UNIXPACKAGENAME " . lc($value) . "\n";
+                push(@{$variablesref} ,$newline);
                 $value = $original;
                 $value =~ s/\s/\_/g;
                 $value =~ s/\.//g;
+                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
                 $newline = "\%WITHOUTDOTUNIXPRODUCTNAME " . lc($value) . "\n";
                 push(@{$variablesref} ,$newline);
+                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $1 . $2 . $4; }
+                # if ( $value =~ /^\s*(.*?)\_(\w)(.*?)\_(\w)(.*)\s*$/ ) { $value = $2 . $4; }
+                $newline = "\%WITHOUTDOTUNIXPACKAGENAME " . lc($value) . "\n";
+                push(@{$variablesref} ,$newline);
+                $newline = "\%SOLARISBRANDPACKAGENAME " . lc($value) . "\n";
+                push(@{$variablesref} ,$newline);
+                $value = $original;
             }
             elsif  ( $key eq "PRODUCTEXTENSION" )
             {
@@ -486,4 +497,38 @@ sub add_forced_properties
     }
 }
 
+#####################################################################################
+# Some properties are created automatically. It should be possible to
+# overwrite them, with PRESET properties. For example UNIXPRODUCTNAME
+# with PRESETUNIXPRODUCTNAME, if this is defined and the automatic process
+# does not deliver the desired results.
+#####################################################################################
+
+sub replace_preset_properties
+{
+    my ($allvariables) = @_;
+
+    # SOLARISBRANDPACKAGENAME
+    # needs to be replaced by
+    # PRESETSOLARISBRANDPACKAGENAME
+
+    my @presetproperties = ();
+    push(@presetproperties, "SOLARISBRANDPACKAGENAME");
+    push(@presetproperties, "SYSTEMINTUNIXPACKAGENAME");
+    # push(@presetproperties, "UNIXPACKAGENAME");
+    # push(@presetproperties, "WITHOUTDOTUNIXPACKAGENAME");
+    # push(@presetproperties, "UNIXPRODUCTNAME");
+    # push(@presetproperties, "WITHOUTDOTUNIXPRODUCTNAME");
+
+
+    foreach $property ( @presetproperties )
+    {
+        my $presetproperty = "PRESET" . $property;
+        if (( exists($allvariables->{$presetproperty}) ) && ( $allvariables->{$presetproperty} ne "" ))
+        {
+            $allvariables->{$property} = $allvariables->{$presetproperty};
+        }
+    }
+}
+
 1;
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 39530ee96843..9666ef3e1af5 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: simplepackage.pm,v $
-#
-# $Revision: 1.19.48.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -115,7 +111,7 @@ sub register_extensions
         {
             my $oneextension = $extensiondir . $installer::globals::separator . ${$allextensions}[$i];
 
-            # my $systemcall = $unopkgfile . " add --shared " . "\"" . $oneextension . "\"";
+            # my $systemcall = $unopkgfile . " add --shared --suppress-license " . "\"" . $oneextension . "\"";
 
             if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); }
             if ( ! -f $oneextension ) { installer::exiter::exit_program("ERROR: $oneextension not found!", "register_extensions"); }
@@ -135,7 +131,7 @@ sub register_extensions
                 $localtemppath =~ s/\\/\//g;
                 $localtemppath = "/".$localtemppath;
             }
-            my $systemcall = $unopkgfile . " add --shared --verbose " . $oneextension . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
+            my $systemcall = $unopkgfile . " add --shared --suppress-license --verbose " . $oneextension . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
 
             print "... $systemcall ...\n";
 
diff --git a/solenv/bin/modules/installer/sorter.pm b/solenv/bin/modules/installer/sorter.pm
index 080a20223e70..dd983c060093 100644
--- a/solenv/bin/modules/installer/sorter.pm
+++ b/solenv/bin/modules/installer/sorter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: sorter.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/strip.pm b/solenv/bin/modules/installer/strip.pm
index 5a2f3b23947c..a9541879d119 100644
--- a/solenv/bin/modules/installer/strip.pm
+++ b/solenv/bin/modules/installer/strip.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: strip.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/substfilenamefiles.pm b/solenv/bin/modules/installer/substfilenamefiles.pm
index c97b2ec6ec57..12cb6ab8eb4f 100644
--- a/solenv/bin/modules/installer/substfilenamefiles.pm
+++ b/solenv/bin/modules/installer/substfilenamefiles.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: substfilenamefiles.pm,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index ba04d1085532..bbc65d3c1f7a 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: systemactions.pm,v $
-#
-# $Revision: 1.38 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,7 +55,12 @@ sub create_directory
             $infoline = "\nCreated directory: $directory\n";
             push(@installer::globals::logfileinfo, $infoline);
 
-            my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
+            my $localcall = "chmod 0775 $directory \>\/dev\/null 2\>\&1";
+            system($localcall);
+
+            # chmod 0775 is not sufficient on mac to remove sticky tag
+            $localcall = "chmod a-s $directory \>\/dev\/null 2\>\&1";
+            system($localcall);
         }
         else
         {
@@ -1401,7 +1402,11 @@ sub try_to_create_directory
             $infoline = "\nCreated directory: $directory\n";
             push(@installer::globals::logfileinfo, $infoline);
 
-            my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1";
+            my $localcall = "chmod 0775 $directory \>\/dev\/null 2\>\&1";
+            system($localcall);
+
+            # chmod 0775 is not sufficient on mac to remove sticky tag
+            $localcall = "chmod a-s $directory \>\/dev\/null 2\>\&1";
             system($localcall);
         }
         else
diff --git a/solenv/bin/modules/installer/upx.pm b/solenv/bin/modules/installer/upx.pm
index ebdd859a87d2..7bfb14fae0d5 100644
--- a/solenv/bin/modules/installer/upx.pm
+++ b/solenv/bin/modules/installer/upx.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: upx.pm,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
index c6c175fa5027..d22a1299e9c9 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: admin.pm,v $
-#
-# $Revision: 1.1.2.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/assembly.pm b/solenv/bin/modules/installer/windows/assembly.pm
index 7b2372603b70..bb5efe2207d5 100644
--- a/solenv/bin/modules/installer/windows/assembly.pm
+++ b/solenv/bin/modules/installer/windows/assembly.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: assembly.pm,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/binary.pm b/solenv/bin/modules/installer/windows/binary.pm
index 4f327b6d93c0..96ee50eb4b19 100644
--- a/solenv/bin/modules/installer/windows/binary.pm
+++ b/solenv/bin/modules/installer/windows/binary.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: binary.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/component.pm b/solenv/bin/modules/installer/windows/component.pm
index 1cddc98cf6af..125c8607f249 100644
--- a/solenv/bin/modules/installer/windows/component.pm
+++ b/solenv/bin/modules/installer/windows/component.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: component.pm,v $
-#
-# $Revision: 1.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/createfolder.pm b/solenv/bin/modules/installer/windows/createfolder.pm
index 3abb3acad3d3..7ade8866c6c5 100644
--- a/solenv/bin/modules/installer/windows/createfolder.pm
+++ b/solenv/bin/modules/installer/windows/createfolder.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: createfolder.pm,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm
index 94ac41d8cb92..2a9463f508a1 100644
--- a/solenv/bin/modules/installer/windows/directory.pm
+++ b/solenv/bin/modules/installer/windows/directory.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: directory.pm,v $
-#
-# $Revision: 1.30.126.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -324,6 +320,7 @@ sub add_root_directories
 
         if ( $allvariableshashref->{'SUNDIR'} )
         {
+            if ( $allvariableshashref->{'SUNDIRNAME'} ) { $installer::globals::sundirname = $allvariableshashref->{'SUNDIRNAME'}; }
             $oneline = "sundirectory\t$installer::globals::programfilesfolder\t$installer::globals::sundirname$sourcediraddon\n";
             push(@{$directorytableref}, $oneline);
 
diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index b422dc45eb65..39521baecdfe 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: feature.pm,v $
-#
-# $Revision: 1.24 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/featurecomponent.pm b/solenv/bin/modules/installer/windows/featurecomponent.pm
index 0c3d5763325e..c5053212aad3 100644
--- a/solenv/bin/modules/installer/windows/featurecomponent.pm
+++ b/solenv/bin/modules/installer/windows/featurecomponent.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: featurecomponent.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm
index e8d46c124317..10666be7460c 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: file.pm,v $
-#
-# $Revision: 1.24 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/font.pm b/solenv/bin/modules/installer/windows/font.pm
index fec60e719150..9dab78caf5f7 100644
--- a/solenv/bin/modules/installer/windows/font.pm
+++ b/solenv/bin/modules/installer/windows/font.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: font.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/icon.pm b/solenv/bin/modules/installer/windows/icon.pm
index 5f101131ff4f..ac2fa9ea8cfa 100644
--- a/solenv/bin/modules/installer/windows/icon.pm
+++ b/solenv/bin/modules/installer/windows/icon.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: icon.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/idtglobal.pm b/solenv/bin/modules/installer/windows/idtglobal.pm
index e9ad0c73d249..6f03228ca10a 100644
--- a/solenv/bin/modules/installer/windows/idtglobal.pm
+++ b/solenv/bin/modules/installer/windows/idtglobal.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: idtglobal.pm,v $
-#
-# $Revision: 1.45 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/inifile.pm b/solenv/bin/modules/installer/windows/inifile.pm
index b6737495279a..de279da8d48b 100644
--- a/solenv/bin/modules/installer/windows/inifile.pm
+++ b/solenv/bin/modules/installer/windows/inifile.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: inifile.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/java.pm b/solenv/bin/modules/installer/windows/java.pm
index 6b9cb7d725aa..11ccd7076f71 100644
--- a/solenv/bin/modules/installer/windows/java.pm
+++ b/solenv/bin/modules/installer/windows/java.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: java.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/language.pm b/solenv/bin/modules/installer/windows/language.pm
index 11a31c6c5f60..c0dca543eb56 100644
--- a/solenv/bin/modules/installer/windows/language.pm
+++ b/solenv/bin/modules/installer/windows/language.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: language.pm,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/media.pm b/solenv/bin/modules/installer/windows/media.pm
index c8b1e03ab5e3..35e90f6a3856 100644
--- a/solenv/bin/modules/installer/windows/media.pm
+++ b/solenv/bin/modules/installer/windows/media.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: media.pm,v $
-#
-# $Revision: 1.12 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/mergemodule.pm b/solenv/bin/modules/installer/windows/mergemodule.pm
index 7dfd8ff49c76..eb524fdafc3e 100755
--- a/solenv/bin/modules/installer/windows/mergemodule.pm
+++ b/solenv/bin/modules/installer/windows/mergemodule.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: mergemodule.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm
index 6c49a8db3cf2..9f2d21f8b7f8 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -2,12 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: msiglobal.pm,v $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,7 +58,7 @@ sub write_ddf_file_header
     push(@{$ddffileref} ,$oneline);
     $oneline = ".Set ReservePerCabinetSize=128\n";  # This reserves space for a digital signature.
     push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set MaxDiskSize=CDROM\n";          # This allows the .cab file to be as large as needed.
+    $oneline = ".Set MaxDiskSize=2147483648\n";     # This allows the .cab file to get a size of 2 GB.
     push(@{$ddffileref} ,$oneline);
     $oneline = ".Set CompressionType=LZX\n";
     push(@{$ddffileref} ,$oneline);
@@ -1879,15 +1877,22 @@ sub set_global_code_variables
 
     if ( $#{$languagesref} > 0 )    # more than one language
     {
-        if (( ${$languagesref}[1] =~ /jp/ ) ||
-            ( ${$languagesref}[1] =~ /ko/ ) ||
-            ( ${$languagesref}[1] =~ /zh/ ))
+        if (( $installer::globals::added_english ) && ( $#{$languagesref} == 1 )) # only multilingual because of added English
         {
-            $onelanguage = "multiasia";
+            $onelanguage = ${$languagesref}[1];  # setting the first language, that is not english
         }
         else
         {
-            $onelanguage = "multiwestern";
+            if (( ${$languagesref}[1] =~ /jp/ ) ||
+                ( ${$languagesref}[1] =~ /ko/ ) ||
+                ( ${$languagesref}[1] =~ /zh/ ))
+            {
+                $onelanguage = "multiasia";
+            }
+            else
+            {
+                $onelanguage = "multiwestern";
+            }
         }
     }
     else    # only one language
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index 0a5a35f05693..a4996945de4d 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: msp.pm,v $
-#
-# $Revision: 1.1.2.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/patch.pm b/solenv/bin/modules/installer/windows/patch.pm
index 25f8fab6caa2..536464192a71 100644
--- a/solenv/bin/modules/installer/windows/patch.pm
+++ b/solenv/bin/modules/installer/windows/patch.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: patch.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 9ce90d8bc7eb..7b890d06d58f 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: property.pm,v $
-#
-# $Revision: 1.31 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -544,7 +540,7 @@ sub set_languages_in_property_table
 
     if ($installer::globals::sofficeiconadded)  # set in shortcut.pm
     {
-        $onepropertyline =  "ARPPRODUCTICON" . "\t" . "soffice.exe" . "\n";
+        $onepropertyline =  "ARPPRODUCTICON" . "\t" . "soffice.ico" . "\n";
         push(@{$propertyfile}, $onepropertyline);
     }
 
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index 9f9da9485677..16174750d178 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: registry.pm,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/removefile.pm b/solenv/bin/modules/installer/windows/removefile.pm
index 73c276a44310..ec2a6142db71 100644
--- a/solenv/bin/modules/installer/windows/removefile.pm
+++ b/solenv/bin/modules/installer/windows/removefile.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: removefile.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/selfreg.pm b/solenv/bin/modules/installer/windows/selfreg.pm
index 821eae4dceb4..70dffc3ea1af 100644
--- a/solenv/bin/modules/installer/windows/selfreg.pm
+++ b/solenv/bin/modules/installer/windows/selfreg.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: selfreg.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/shortcut.pm b/solenv/bin/modules/installer/windows/shortcut.pm
index acc0f7484910..b15c7418352f 100644
--- a/solenv/bin/modules/installer/windows/shortcut.pm
+++ b/solenv/bin/modules/installer/windows/shortcut.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: shortcut.pm,v $
-#
-# $Revision: 1.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -669,40 +665,25 @@ sub create_shortcut_table
             }
         }
 
-        # if it is part of the product, the soffice.exe has to be included into the icon table
+        # The soffice.ico has to be included into the icon table
         # as icon for the ARP applet
 
-        my $sofficefile = "soffice.exe";
-        my $onefile = get_file_by_name($filesref, $sofficefile);
+        my $onefile = "";
+        my $sofficefile = "soffice.ico";
 
-        if ( $onefile ne "" )
-        {
-            my $sourcepath = $onefile->{'sourcepath'};
-            if (! installer::existence::exists_in_array($sourcepath, $iconfilecollector))
-            {
-                unshift(@{$iconfilecollector}, $sourcepath);
-                $installer::globals::sofficeiconadded = 1;
-            }
-        }
+        my $sourcepathref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$sofficefile, $includepatharrayref, 0);
 
-        # For language packs and patches the soffice.exe has to be included, even if it is not part of the product.
-        # Also as part of the ARP applet (no substitution needed for ProductName, because the file is not installed!)
+        if ($$sourcepathref eq "") { installer::exiter::exit_program("ERROR: Could not find $sofficefile as icon!", "create_shortcut_table"); }
 
-        if (( $onefile eq "" ) && (( $installer::globals::languagepack ) || ( $installer::globals::patch )))
+        if (! installer::existence::exists_in_array($$sourcepathref, $iconfilecollector))
         {
-            my $sourcepathref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$sofficefile, $includepatharrayref, 1);
-            if ($$sourcepathref eq "") { installer::exiter::exit_program("ERROR: Could not find $sofficefile as icon in language pack!", "create_shortcut_table"); }
-
-            if (! installer::existence::exists_in_array($$sourcepathref, $iconfilecollector))
-            {
-                unshift(@{$iconfilecollector}, $$sourcepathref);
-                $installer::globals::sofficeiconadded = 1;
-            }
-
-            my $localinfoline = "Added icon file $$sourcepathref for language pack into icon file collector.\n";
-            push(@installer::globals::logfileinfo, $localinfoline);
+            unshift(@{$iconfilecollector}, $$sourcepathref);
+            $installer::globals::sofficeiconadded = 1;
         }
 
+        my $localinfoline = "Added icon file $$sourcepathref for language pack into icon file collector.\n";
+        push(@installer::globals::logfileinfo, $localinfoline);
+
         # Saving the file
 
         my $shortcuttablename = $basedir . $installer::globals::separator . "Shortcut.idt" . "." . $onelanguage;
diff --git a/solenv/bin/modules/installer/windows/sign.pm b/solenv/bin/modules/installer/windows/sign.pm
index ecefbd9fd1f8..70954bd9f5b1 100644
--- a/solenv/bin/modules/installer/windows/sign.pm
+++ b/solenv/bin/modules/installer/windows/sign.pm
@@ -2,12 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: binary.pm,v $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -120,9 +118,9 @@ sub check_system_path
 {
     # The following files have to be found in the environment variable PATH
     # Only, if \"-sign\" is used.
-    # Windows : "msicert.exe", "msidb.exe", "signtool.exe"
+    # Windows : "msicert.exe", "diff.exe", "msidb.exe", "signtool.exe"
 
-    my @needed_files_in_path = ("msicert.exe", "msidb.exe", "signtool.exe");
+    my @needed_files_in_path = ("msicert.exe", "msidb.exe", "signtool.exe", "diff.exe");
     if ( $installer::globals::internal_cabinet_signing )
     {
         push(@needed_files_in_path, "cabarc.exe");
@@ -307,6 +305,34 @@ sub get_hash_count
 }
 
 ############################################################
+# Collect all last files in a cabinet file. This is
+# necessary to control, if the cabinet file was damaged
+# by calling signtool.exe.
+############################################################
+
+sub analyze_file_file
+{
+    my ($filecontent) = @_;
+
+    my %filenamehash = ();
+
+    for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
+    {
+        if ( $i < 3 ) { next; }
+
+        if ( ${$filecontent}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
+        {
+            my $name = $1;
+            my $sequence = $8;
+
+            $filenamehash{$sequence} = $name;
+        }
+    }
+
+    return ( \%filenamehash );
+}
+
+############################################################
 # Collect all DiskIds to the corresponding cabinet files.
 ############################################################
 
@@ -315,6 +341,7 @@ sub analyze_media_file
     my ($filecontent) = @_;
 
     my %diskidhash = ();
+    my %lastsequencehash = ();
 
     for ( my $i = 0; $i <= $#{$filecontent}; $i++ )
     {
@@ -323,13 +350,15 @@ sub analyze_media_file
         if ( ${$filecontent}[$i] =~ /^\s*(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\t(.*?)\s*$/ )
         {
             my $diskid = $1;
+            my $lastsequence = $2;
             my $cabfile = $4;
 
             $diskidhash{$cabfile} = $diskid;
+            $lastsequencehash{$cabfile} = $lastsequence;
         }
     }
 
-    return \%diskidhash;
+    return ( \%diskidhash, \%lastsequencehash );
 }
 
 ########################################################
@@ -342,15 +371,20 @@ sub collect_diskid_from_media_table
 
     # creating working directory
     my $workdir = installer::systemactions::create_directories("media", \$languagestring);
-    installer::windows::admin::extract_tables_from_pcpfile($msidatabase, $workdir, "Media");
+    installer::windows::admin::extract_tables_from_pcpfile($msidatabase, $workdir, "Media File");
 
     # Reading tables
     my $filename = $workdir . $installer::globals::separator . "Media.idt";
     if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find required file: $filename !", "collect_diskid_from_media_table"); }
     my $filecontent = installer::files::read_file($filename);
-    my $diskidhash = analyze_media_file($filecontent);
+    my ( $diskidhash, $lastsequencehash ) = analyze_media_file($filecontent);
+
+    $filename = $workdir . $installer::globals::separator . "File.idt";
+    if ( ! -f $filename ) { installer::exiter::exit_program("ERROR: Could not find required file: $filename !", "collect_diskid_from_media_table"); }
+    $filecontent = installer::files::read_file($filename);
+    my $filenamehash = analyze_file_file($filecontent);
 
-    return $diskidhash;
+    return ( $diskidhash, $filenamehash, $lastsequencehash );
 }
 
 ########################################################
@@ -429,7 +463,7 @@ sub analyze_installset_content
 
     if ( $msidatabase ne "" ) { $contains_msidatabase = 1; }
 
-    return (\%allcabfileshash, \%allfileshash, $msidatabase, $contains_external_cabfiles, $contains_msidatabase);
+    return (\%allcabfileshash, \%allfileshash, $msidatabase, $contains_external_cabfiles, $contains_msidatabase, \@sourcefiles);
 }
 
 ########################################################
@@ -445,6 +479,8 @@ sub msicert_database
 
     foreach my $cabfile ( keys %{$allcabfiles} )
     {
+        my $origfilesize = -s $cabfile;
+
         my $mediacabfilename = $cabfile;
         if ( $internalcabfile ) { $mediacabfilename = "\#" . $mediacabfilename; }
         if ( ! exists($cabfilehash->{$mediacabfilename}) ) { installer::exiter::exit_program("ERROR: Could not determine DiskId from media table for cabinet file \"$cabfile\" !", "msicert_database"); }
@@ -453,18 +489,168 @@ sub msicert_database
         my $systemcall = "msicert.exe -d $msidatabase -m $diskid -c $cabfile -h";
          $success = make_systemcall($systemcall, $systemcall);
         if ( ! $success ) { $fullsuccess = 0; }
+
+        # size of cabinet file must not change
+        my $finalfilesize = -s $cabfile;
+
+        if ( $origfilesize != $finalfilesize ) { installer::exiter::exit_program("ERROR: msicert.exe changed size of cabinet file !", "msicert_database"); }
     }
 
     return $fullsuccess;
 }
 
 ########################################################
+# Checking if cabinet file was broken by signtool.
+########################################################
+
+sub cabinet_cosistency_check
+{
+    my ( $onefile, $followmeinfohash, $filenamehash, $lastsequencehash, $temppath ) = @_;
+
+    my $infoline = "Making consistency check of $onefile\n";
+    push( @installer::globals::logfileinfo, $infoline);
+    my $expandfile = "expand.exe";  # Has to be in the path
+
+    if ( $^O =~ /cygwin/i )
+    {
+        $expandfile = qx(cygpath -u "$ENV{WINDIR}"/System32/expand.exe);
+        chomp $expandfile;
+    }
+
+    if ( $filenamehash == 0 )
+    {
+        $infoline = "Warning: Stopping consistency check: Important hash of filenames is empty!\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+    elsif  ( $lastsequencehash == 0 )
+    {
+        $infoline = "Warning: Stopping consistency check; Important hash of last sequences is empty!\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+    else # both hashes are available
+    {
+        # $onefile contains only the name of the cabinet file without path
+         my $sequence = $lastsequencehash->{$onefile};
+         my $lastfile = $filenamehash->{$sequence};
+        $infoline = "Check of $onefile: Sequence: $sequence is file: $lastfile\n";
+        push( @installer::globals::logfileinfo, $infoline);
+
+         # Therefore the file $lastfile need to be binary compared.
+         # It has to be expanded from the cabinet file
+         # of the original installation set and from the
+         # newly signed cabinet file.
+
+        # How about cabinet files extracted from msi database?
+        my $finalinstalldir = $followmeinfohash->{'finalinstalldir'};
+
+        $finalinstalldir =~ s/\\\s*$//;
+        $finalinstalldir =~ s/\/\s*$//;
+        my $sourcecabfile = $finalinstalldir . $installer::globals::separator . $onefile;
+        my $currentpath = cwd();
+        my $destcabfile = $currentpath . $installer::globals::separator . $onefile;
+        # my $destcabfile = $onefile;
+
+        if ( $^O =~ /cygwin/i )
+        {
+            chomp( $destcabfile = qx{cygpath -w "$destcabfile"} );
+            $destcabfile =~ s/\\/\//g;
+        }
+
+        if ( ! -f $sourcecabfile )
+        {
+            $infoline = "WARNING: Check of cab file cannot happen, because source cabinet file was not found: $sourcecabfile\n";
+            push( @installer::globals::logfileinfo, $infoline);
+        }
+        elsif ( ! -f $destcabfile )
+        {
+            $infoline = "WARNING: Check of cab file cannot happen, because destination cabinet file was not found: $sourcecabfile\n";
+            push( @installer::globals::logfileinfo, $infoline);
+        }
+        else # everything is okay for the check
+        {
+            my $diffpath = get_diff_path($temppath);
+
+            my $origdiffpath = $diffpath . $installer::globals::separator . "orig";
+            my $newdiffpath = $diffpath . $installer::globals::separator . "new";
+
+            if ( ! -d $origdiffpath ) { mkdir($origdiffpath); }
+            if ( ! -d $newdiffpath ) { mkdir($newdiffpath); }
+
+            my $systemcall = "$expandfile $sourcecabfile $origdiffpath -f:$lastfile ";
+            $infoline = $systemcall . "\n";
+            push( @installer::globals::logfileinfo, $infoline);
+
+            my $success = make_systemcall($systemcall, $systemcall);
+            if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not successfully execute: $systemcall !", "cabinet_cosistency_check"); }
+
+            $systemcall = "$expandfile $destcabfile $newdiffpath -f:$lastfile ";
+            $infoline = $systemcall . "\n";
+            push( @installer::globals::logfileinfo, $infoline);
+
+            $success = make_systemcall($systemcall, $systemcall);
+            if ( ! $success ) { installer::exiter::exit_program("ERROR: Could not successfully execute: $systemcall !", "cabinet_cosistency_check"); }
+
+            # and finally the two files can be diffed.
+            my $origfile = $origdiffpath . $installer::globals::separator . $lastfile;
+            my $newfile = $newdiffpath . $installer::globals::separator . $lastfile;
+
+            if ( ! -f $origfile ) { installer::exiter::exit_program("ERROR: Unpacked original file not found: $origfile !", "cabinet_cosistency_check"); }
+            if ( ! -f $newfile ) { installer::exiter::exit_program("ERROR: Unpacked new file not found: $newfile !", "cabinet_cosistency_check"); }
+
+            my $origsize = -s $origfile;
+            my $newsize = -s $newfile;
+
+            if ( $origsize != $newsize ) # This shows an error!
+            {
+                $infoline = "ERROR: Different filesize after signtool.exe was used. Original: $origsize Bytes, new: $newsize. File: $lastfile\n";
+                push( @installer::globals::logfileinfo, $infoline);
+                installer::exiter::exit_program("ERROR: The cabinet file $destcabfile is broken after signtool.exe signed this file !", "cabinet_cosistency_check");
+            }
+            else
+            {
+                $infoline = "Same size of last file in cabinet file after usage of signtool.exe: $newsize (File: $lastfile)\n";
+                push( @installer::globals::logfileinfo, $infoline);
+
+                # Also making a binary diff?
+
+                my $difffile = "diff.exe";  # has to be in the path
+                # $systemcall = "$difffile $sourcecabfile $destcabfile";  # Test for differences
+                $systemcall = "$difffile $origfile $newfile";
+                $infoline = $systemcall . "\n";
+                $returnvalue = make_systemcall($systemcall, $systemcall);
+
+                my $success = $?;
+
+                if ( $success == 0 )
+                {
+                    $infoline = "Last files are identical after signing cabinet file (File: $lastfile)\n";
+                    push( @installer::globals::logfileinfo, $infoline);
+                }
+                elsif ( $success == 1 )
+                {
+                    $infoline = "ERROR: Last files are different after signing cabinet file (File: $lastfile)\n";
+                    push( @installer::globals::logfileinfo, $infoline);
+                    installer::exiter::exit_program("ERROR: Last files are different after signing cabinet file (File: $lastfile)!", "cabinet_cosistency_check");
+                }
+                else
+                {
+                    $infoline = "ERROR: Problem occured calling diff.exe (File: $lastfile)\n";
+                    push( @installer::globals::logfileinfo, $infoline);
+                    installer::exiter::exit_program("ERROR: Problem occured calling diff.exe (File: $lastfile) !", "cabinet_cosistency_check");
+                }
+            }
+        }
+    }
+
+}
+
+########################################################
 # Signing a list of files
 ########################################################
 
 sub sign_files
 {
-    my ( $followmeinfohash, $allfiles, $pw, $cabinternal ) = @_;
+    my ( $followmeinfohash, $allfiles, $pw, $cabinternal, $filenamehash, $lastsequencehash, $temppath ) = @_;
 
     my $infoline = "";
     my $fullsuccess = 1;
@@ -508,6 +694,12 @@ sub sign_files
              $counter++;
          }
 
+         # Special check for cabinet files, that sometimes get damaged by signtool.exe
+         if (( $success ) && ( $onefile =~ /\.cab\s*$/ ) && ( ! $cabinternal ))
+         {
+             cabinet_cosistency_check($onefile, $followmeinfohash, $filenamehash, $lastsequencehash, $temppath);
+        }
+
          if ( ! $success )
          {
              $fullsuccess = 0;
@@ -570,6 +762,21 @@ sub get_cab_path
 }
 
 #################################################################
+# Setting the path, where the diff can happen.
+#################################################################
+
+sub get_diff_path
+{
+    my ($temppath) = @_;
+
+    my $diffpath = "diff_" . $$;
+    $diffpath = $temppath . $installer::globals::separator . $diffpath;
+    if ( ! -d $diffpath ) { installer::systemactions::create_directory($diffpath); }
+
+    return $diffpath;
+}
+
+#################################################################
 # Exclude all cab files from the msi database.
 #################################################################
 
@@ -722,7 +929,7 @@ sub get_ddf_file_header
     push(@{$ddffileref} ,$oneline);
     $oneline = ".Set ReservePerCabinetSize=128\n";  # This reserves space for a digital signature.
     push(@{$ddffileref} ,$oneline);
-    $oneline = ".Set MaxDiskSize=CDROM\n";          # This allows the .cab file to be as large as needed.
+    $oneline = ".Set MaxDiskSize=2147483648\n";     # This allows the .cab file to get a size of 2 GB.
     push(@{$ddffileref} ,$oneline);
     $oneline = ".Set CompressionType=LZX\n";
     push(@{$ddffileref} ,$oneline);
@@ -888,7 +1095,7 @@ sub sign_files_in_cabinet_files
                 $allfileshash{$onefile} = 1;
             }
         }
-         $success = sign_files($followmeinfohash, \%allfileshash, $pw, 1);
+         $success = sign_files($followmeinfohash, \%allfileshash, $pw, 1, 0, 0, $temppath);
         if ( ! $success ) { $complete_success = 0; }
 
         chdir($from);
@@ -901,6 +1108,44 @@ sub sign_files_in_cabinet_files
 }
 
 ########################################################
+# Comparing the content of two directories.
+# Only filesize is compared.
+########################################################
+
+sub compare_directories
+{
+    my ( $dir1, $dir2, $files ) = @_;
+
+    $dir1 =~ s/\\\s*//;
+    $dir2 =~ s/\\\s*//;
+    $dir1 =~ s/\/\s*//;
+    $dir2 =~ s/\/\s*//;
+
+    my $infoline = "Comparing directories: $dir1 and $dir2\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    foreach my $onefile ( @{$files} )
+    {
+        my $file1 = $dir1 . $installer::globals::separator . $onefile;
+        my $file2 = $dir2 . $installer::globals::separator . $onefile;
+
+        if ( ! -f $file1 ) { installer::exiter::exit_program("ERROR: Missing file : $file1!", "compare_directories"); }
+        if ( ! -f $file2 ) { installer::exiter::exit_program("ERROR: Missing file : $file2!", "compare_directories"); }
+
+        my $size1 = -s $file1;
+        my $size2 = -s $file2;
+
+        $infoline = "Comparing files: $file1 ($size1) and $file2 ($size2)\n";
+        push( @installer::globals::logfileinfo, $infoline);
+
+        if ( $size1 != $size2 )
+        {
+            installer::exiter::exit_program("ERROR: File defect after copy (different size) $file1 ($size1 bytes) and $file2 ($size2 bytes)!", "compare_directories");
+        }
+    }
+}
+
+########################################################
 # Signing an existing Windows installation set.
 ########################################################
 
@@ -929,7 +1174,9 @@ sub sign_install_set
     else { $installsetpath = rename_install_set($installsetpath); }
 
     # collecting all files in the installation set
-    my ($allcabfiles, $allfiles, $msidatabase, $contains_external_cabfiles, $contains_msidatabase) = analyze_installset_content($installsetpath);
+    my ($allcabfiles, $allfiles, $msidatabase, $contains_external_cabfiles, $contains_msidatabase, $sourcefiles) = analyze_installset_content($installsetpath);
+
+    if ( $make_copy ) { compare_directories($installsetpath, $followmeinfohash->{'finalinstalldir'}, $sourcefiles); }
 
     # changing into installation set
     my $from = cwd();
@@ -947,7 +1194,7 @@ sub sign_install_set
     if ( $contains_msidatabase )
     {
         # exclude media table from msi database and get all diskids.
-        my $cabfilehash = collect_diskid_from_media_table($msidatabase, $followmeinfohash->{'languagestring'});
+        my ( $cabfilehash, $filenamehash, $lastsequencehash ) = collect_diskid_from_media_table($msidatabase, $followmeinfohash->{'languagestring'});
 
         # Check, if there are internal cab files
         my ( $contains_internal_cabfiles, $all_internal_cab_files) = check_for_internal_cabfiles($cabfilehash);
@@ -963,7 +1210,7 @@ sub sign_install_set
 
             if ( $installer::globals::internal_cabinet_signing ) { sign_files_in_cabinet_files($followmeinfohash, $all_internal_cab_files, $pw, $temppath); }
 
-            $success = sign_files($followmeinfohash, $all_internal_cab_files, $pw, 0);
+            $success = sign_files($followmeinfohash, $all_internal_cab_files, $pw, 0, $filenamehash, $lastsequencehash, $temppath);
             if ( ! $success ) { $complete_success = 0; }
             $success = msicert_database($fullmsidatabase, $all_internal_cab_files, $cabfilehash, 1);
             if ( ! $success ) { $complete_success = 0; }
@@ -980,7 +1227,7 @@ sub sign_install_set
         {
             if ( $installer::globals::internal_cabinet_signing ) { sign_files_in_cabinet_files($followmeinfohash, $allcabfiles, $pw, $temppath); }
 
-            $success = sign_files($followmeinfohash, $allcabfiles, $pw, 0);
+            $success = sign_files($followmeinfohash, $allcabfiles, $pw, 0, $filenamehash, $lastsequencehash, $temppath);
             if ( ! $success ) { $complete_success = 0; }
             $success = msicert_database($msidatabase, $allcabfiles, $cabfilehash, 0);
             if ( ! $success ) { $complete_success = 0; }
@@ -988,7 +1235,7 @@ sub sign_install_set
     }
 
     # finally all other files can be signed
-    $success = sign_files($followmeinfohash, $allfiles, $pw, 0);
+    $success = sign_files($followmeinfohash, $allfiles, $pw, 0, 0, 0, $temppath);
     if ( ! $success ) { $complete_success = 0; }
 
     # and changing back
diff --git a/solenv/bin/modules/installer/windows/strip.pm b/solenv/bin/modules/installer/windows/strip.pm
index c7e5e883596c..79b1046c1e8f 100644
--- a/solenv/bin/modules/installer/windows/strip.pm
+++ b/solenv/bin/modules/installer/windows/strip.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: strip.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/update.pm b/solenv/bin/modules/installer/windows/update.pm
index 4c1081fa8458..efe6949b6fc4 100644
--- a/solenv/bin/modules/installer/windows/update.pm
+++ b/solenv/bin/modules/installer/windows/update.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: update.pm,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm b/solenv/bin/modules/installer/windows/upgrade.pm
index 5e3d5379579a..49479b26bf49 100644
--- a/solenv/bin/modules/installer/windows/upgrade.pm
+++ b/solenv/bin/modules/installer/windows/upgrade.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: upgrade.pm,v $
-#
-# $Revision: 1.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,7 +47,7 @@ sub create_upgrade_table
     # fix for problematic OOo 1.9 versions
     my $include_ooo_fix = 0;
     my $ooomaxnew = "";
-    if (($installer::globals::product =~ /OpenOffice/i ) && ( ! ( $installer::globals::product =~ /SDK/i )) && ( ! $installer::globals::languagepack ))
+    if (($installer::globals::product =~ /^\s*OpenOffice/i ) && ( ! ( $installer::globals::product =~ /SDK/i )) && ( ! $installer::globals::languagepack ))
     {
         $include_ooo_fix = 1;
         $ooomaxnew = "34.0.0";
diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm
index d64ac15ff73a..ff1d172c9b8f 100644
--- a/solenv/bin/modules/installer/worker.pm
+++ b/solenv/bin/modules/installer/worker.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: worker.pm,v $
-#
-# $Revision: 1.65.56.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -2656,15 +2652,13 @@ sub set_time_stamp
     }
 }
 
-##############################################
-# Include only files from install directory
-# in pkgmap file.
-##############################################
-########################################
-# Generating pathes for cygwin.
-########################################
+############################################################
+# Generating pathes for cygwin (first version)
+# This function has problems with cygwin, if $tmpfilename
+# contains many thousand files (OpenOffice SDK).
+############################################################
 
-sub generate_cygwin_pathes
+sub generate_cygwin_pathes_old
 {
     my ($filesref) = @_;
 
@@ -2682,8 +2676,100 @@ sub generate_cygwin_pathes
     {
         ${$filesref}[$i]->{'cyg_sourcepath'} = $cyg_sourcepathlist[$i];
     }
+
 }
 
+#################################################
+# Generating pathes for cygwin (second version)
+# This function generates smaller files for
+#################################################
+
+sub generate_cygwin_pathes
+{
+    my ($filesref) = @_;
+
+    installer::logger::include_timestamp_into_logfile("Starting generating cygwin pathes");
+
+    my $infoline = "Generating cygwin pathes (generate_cygwin_pathes)\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    my $max = 5000;  # number of pathes in one file
+
+    my @pathcollector = ();
+    my $startnumber = 0;
+    my $counter = 0;
+
+    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
+    {
+        my $line = ${$filesref}[$i]->{'sourcepath'} . "\n";
+        push(@pathcollector, $line);
+        $counter++;
+
+        if (( $i == $#{$filesref} ) || ((( $counter % $max ) == 0 ) && ( $i > 0 )))
+        {
+            my $tmpfilename = "cygwinhelper_" . $i . ".txt";
+            my $temppath = $installer::globals::temppath;
+            $temppath =~ s/\Q$installer::globals::separator\E\s*$//;
+            $tmpfilename = $temppath . $installer::globals::separator . $tmpfilename;
+            $infoline = "Creating temporary file for cygwin conversion: $tmpfilename (contains $counter pathes)\n";
+            push( @installer::globals::logfileinfo, $infoline);
+            if ( -f $tmpfilename ) { unlink $tmpfilename; }
+
+            installer::files::save_file($tmpfilename, \@pathcollector);
+
+            my $success = 0;
+            my @cyg_sourcepathlist = qx{cygpath -w -f "$tmpfilename"};
+            chomp @cyg_sourcepathlist;
+
+            # Validating the array, it has to contain the correct number of values
+            my $new_pathes = $#cyg_sourcepathlist + 1;
+            if ( $new_pathes == $counter ) { $success = 1; }
+
+            if ($success)
+            {
+                $infoline = "Success: Successfully converted to cygwin pathes!\n";
+                push( @installer::globals::logfileinfo, $infoline);
+            }
+            else
+            {
+                $infoline = "ERROR: Failed to convert to cygwin pathes!\n";
+                push( @installer::globals::logfileinfo, $infoline);
+                installer::exiter::exit_program("ERROR: Failed to convert to cygwin pathes!", "generate_cygwin_pathes");
+            }
+
+            for ( my $j = 0; $j <= $#cyg_sourcepathlist; $j++ )
+            {
+                my $number = $startnumber + $j;
+                ${$filesref}[$number]->{'cyg_sourcepath'} = $cyg_sourcepathlist[$j];
+            }
+
+            if ( -f $tmpfilename ) { unlink $tmpfilename; }
+
+            @pathcollector = ();
+            $startnumber = $startnumber + $max;
+            $counter = 0;
+        }
+    }
+
+    # Checking existence fo cyg_sourcepath for every file
+    for ( my $i = 0; $i <= $#{$filesref}; $i++ )
+    {
+        if (( ! exists(${$filesref}[$i]->{'cyg_sourcepath'}) ) || ( ${$filesref}[$i]->{'cyg_sourcepath'} eq "" ))
+        {
+            $infoline = "ERROR: No cygwin sourcepath defined for file ${$filesref}[$i]->{'sourcepath'}\n";
+            push( @installer::globals::logfileinfo, $infoline);
+            installer::exiter::exit_program("ERROR: No cygwin sourcepath defined for file ${$filesref}[$i]->{'sourcepath'}!", "generate_cygwin_pathes");
+        }
+    }
+
+    installer::logger::include_timestamp_into_logfile("Ending generating cygwin pathes");
+}
+
+##############################################
+# Include only files from install directory
+# in pkgmap file.
+##############################################
+
 sub filter_pkgmapfile
 {
     my ($pkgmapfile) = @_;
@@ -2936,6 +3022,24 @@ sub key_in_a_is_also_key_in_b
     return $returnvalue;
 }
 
+######################################################
+# Getting the first entry from a list of languages
+######################################################
+
+sub get_first_from_list
+{
+    my ( $list ) = @_;
+
+    my $first = $list;
+
+    if ( $list =~ /^\s*(.+?),(.+)\s*$/) # "?" for minimal matching
+    {
+        $first = $1;
+    }
+
+    return $first;
+}
+
 ################################################
 # Setting all spellchecker languages
 ################################################
@@ -2968,16 +3072,29 @@ sub set_spellcheckerlanguages
         {
             my $onelang = $1;
             my $languagelist = $2;
-            $spellcheckhash{$onelang} = $languagelist;
 
-            # Special handling for language packs. Do only include that one language of the language pack, no further language.
-            # And this only, if the language of the language pack is also already part of the language list
+            # Special handling for language packs. Only include the first language of the language list.
+            # If no spellchecker shall be included, the keyword "EMPTY" can be used.
 
             if ( $installer::globals::languagepack )
             {
-                if ( $languagelist =~ /\b$onelang\b/ ) { $spellcheckhash{$onelang} = $onelang; }
-                else { $spellcheckhash{$onelang} = ""; }
+                my $first = get_first_from_list($languagelist);
+
+                if ( $first eq "EMPTY" )     # no spellchecker into language pack
+                {
+                    $languagelist = "";
+                }
+                else
+                {
+                    $languagelist = $first;
+                }
             }
+            else  # no language pack, so EMPTY is not required
+            {
+                $languagelist =~ s/^\s*EMPTY\s*,//; # removing the entry EMPTY
+            }
+
+            $spellcheckhash{$onelang} = $languagelist;
         }
     }
 
diff --git a/solenv/bin/modules/installer/xpdinstaller.pm b/solenv/bin/modules/installer/xpdinstaller.pm
index e81380807a87..c6938292b313 100644
--- a/solenv/bin/modules/installer/xpdinstaller.pm
+++ b/solenv/bin/modules/installer/xpdinstaller.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: xpdinstaller.pm,v $
-#
-# $Revision: 1.19 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index 3232daf2138f..00de1709473b 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: ziplist.pm,v $
-#
-# $Revision: 1.22 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -648,7 +644,8 @@ sub set_manufacturer
     my ($allvariables) = @_;
 
     my $openofficeproductname = "OpenOffice.org";
-    my $sunname = "Sun Microsystems";
+    my $sunname = "";
+
 
     if ( $allvariables->{'OPENSOURCE'} && $allvariables->{'OPENSOURCE'} == 1 )
     {
@@ -659,6 +656,8 @@ sub set_manufacturer
     else
     {
         $installer::globals::isopensourceproduct = 0;
+        if (( $allvariables->{'DEFINEDMANUFACTURER'} ) && ( $allvariables->{'DEFINEDMANUFACTURER'} ne "" )) { $sunname = $allvariables->{'DEFINEDMANUFACTURER'}; }
+        else { installer::exiter::exit_program("ERROR: Property DEFINEDMANUFACTURER has to be set for this product!", "set_manufacturer"); }
         $installer::globals::manufacturer = $sunname;
         $installer::globals::longmanufacturer = $sunname . ", Inc.";
     }
diff --git a/solenv/bin/modules/macosxotoolhelper.pm b/solenv/bin/modules/macosxotoolhelper.pm
index c8d30c52e473..96ad8b2ed6f4 100644
--- a/solenv/bin/modules/macosxotoolhelper.pm
+++ b/solenv/bin/modules/macosxotoolhelper.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: macosxotoolhelper.pm,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/packager/check.pm b/solenv/bin/modules/packager/check.pm
index 1b1aaedab46f..8811451cd27c 100644
--- a/solenv/bin/modules/packager/check.pm
+++ b/solenv/bin/modules/packager/check.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: check.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/packager/existence.pm b/solenv/bin/modules/packager/existence.pm
index e3b3d99d4e35..81f13395befc 100644
--- a/solenv/bin/modules/packager/existence.pm
+++ b/solenv/bin/modules/packager/existence.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: existence.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/packager/exiter.pm b/solenv/bin/modules/packager/exiter.pm
index fbbbbbc719ec..d81d5f148f15 100644
--- a/solenv/bin/modules/packager/exiter.pm
+++ b/solenv/bin/modules/packager/exiter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: exiter.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/packager/files.pm b/solenv/bin/modules/packager/files.pm
index d2054838fa12..295f55fade45 100644
--- a/solenv/bin/modules/packager/files.pm
+++ b/solenv/bin/modules/packager/files.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: files.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/packager/globals.pm b/solenv/bin/modules/packager/globals.pm
index 85bd58fef690..955a1598adc8 100644
--- a/solenv/bin/modules/packager/globals.pm
+++ b/solenv/bin/modules/packager/globals.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: globals.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/packager/work.pm b/solenv/bin/modules/packager/work.pm
index 43a1ae2abe77..ae0c743a635f 100644
--- a/solenv/bin/modules/packager/work.pm
+++ b/solenv/bin/modules/packager/work.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: work.pm,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/check.pm b/solenv/bin/modules/par2script/check.pm
index 70b557f94d25..7a975f530445 100644
--- a/solenv/bin/modules/par2script/check.pm
+++ b/solenv/bin/modules/par2script/check.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: check.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/converter.pm b/solenv/bin/modules/par2script/converter.pm
index 1adff9b2bf0b..49f0d62d4c64 100644
--- a/solenv/bin/modules/par2script/converter.pm
+++ b/solenv/bin/modules/par2script/converter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: converter.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/existence.pm b/solenv/bin/modules/par2script/existence.pm
index a557020647ee..08fb8eda4c7c 100644
--- a/solenv/bin/modules/par2script/existence.pm
+++ b/solenv/bin/modules/par2script/existence.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: existence.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/exiter.pm b/solenv/bin/modules/par2script/exiter.pm
index ddfe5a9d499b..24399422dc73 100644
--- a/solenv/bin/modules/par2script/exiter.pm
+++ b/solenv/bin/modules/par2script/exiter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: exiter.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/files.pm b/solenv/bin/modules/par2script/files.pm
index c781b6f9a3bc..3b7e70d2d4a9 100644
--- a/solenv/bin/modules/par2script/files.pm
+++ b/solenv/bin/modules/par2script/files.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: files.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/globals.pm b/solenv/bin/modules/par2script/globals.pm
index 1968b1907bda..9a3c06f23879 100644
--- a/solenv/bin/modules/par2script/globals.pm
+++ b/solenv/bin/modules/par2script/globals.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: globals.pm,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/module.pm b/solenv/bin/modules/par2script/module.pm
index f58022564f09..00b341306db2 100644
--- a/solenv/bin/modules/par2script/module.pm
+++ b/solenv/bin/modules/par2script/module.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: module.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/parameter.pm b/solenv/bin/modules/par2script/parameter.pm
index d24b2ea9e641..9c8abec78a0c 100644
--- a/solenv/bin/modules/par2script/parameter.pm
+++ b/solenv/bin/modules/par2script/parameter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: parameter.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/remover.pm b/solenv/bin/modules/par2script/remover.pm
index b6b94d124403..ba981f914881 100644
--- a/solenv/bin/modules/par2script/remover.pm
+++ b/solenv/bin/modules/par2script/remover.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: remover.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/shortcut.pm b/solenv/bin/modules/par2script/shortcut.pm
index 49063c3162f5..ecaa1506beb1 100644
--- a/solenv/bin/modules/par2script/shortcut.pm
+++ b/solenv/bin/modules/par2script/shortcut.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: shortcut.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/systemactions.pm b/solenv/bin/modules/par2script/systemactions.pm
index e51565a01f02..f5a8db9979a7 100644
--- a/solenv/bin/modules/par2script/systemactions.pm
+++ b/solenv/bin/modules/par2script/systemactions.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: systemactions.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/undefine.pm b/solenv/bin/modules/par2script/undefine.pm
index e6c1c586502f..5fc1d18ebd3d 100644
--- a/solenv/bin/modules/par2script/undefine.pm
+++ b/solenv/bin/modules/par2script/undefine.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: undefine.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/par2script/work.pm b/solenv/bin/modules/par2script/work.pm
index e37ce9c6dcdd..fd266e306d04 100644
--- a/solenv/bin/modules/par2script/work.pm
+++ b/solenv/bin/modules/par2script/work.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: work.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/directory.pm b/solenv/bin/modules/pre2par/directory.pm
index e09223d037f6..2253c54bc47a 100644
--- a/solenv/bin/modules/pre2par/directory.pm
+++ b/solenv/bin/modules/pre2par/directory.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: directory.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/existence.pm b/solenv/bin/modules/pre2par/existence.pm
index 6ae1f6500fcf..1775f1d9394c 100644
--- a/solenv/bin/modules/pre2par/existence.pm
+++ b/solenv/bin/modules/pre2par/existence.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: existence.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/exiter.pm b/solenv/bin/modules/pre2par/exiter.pm
index 2c6c755494b7..fe992aad4253 100644
--- a/solenv/bin/modules/pre2par/exiter.pm
+++ b/solenv/bin/modules/pre2par/exiter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: exiter.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/files.pm b/solenv/bin/modules/pre2par/files.pm
index e01c25fd4af9..e3de88b6dd4e 100644
--- a/solenv/bin/modules/pre2par/files.pm
+++ b/solenv/bin/modules/pre2par/files.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: files.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/globals.pm b/solenv/bin/modules/pre2par/globals.pm
index 9f9e498ce227..55da94a211d2 100644
--- a/solenv/bin/modules/pre2par/globals.pm
+++ b/solenv/bin/modules/pre2par/globals.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: globals.pm,v $
-#
-# $Revision: 1.13 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/language.pm b/solenv/bin/modules/pre2par/language.pm
index 2686dbb3fdee..b5dc336ba847 100644
--- a/solenv/bin/modules/pre2par/language.pm
+++ b/solenv/bin/modules/pre2par/language.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: language.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/parameter.pm b/solenv/bin/modules/pre2par/parameter.pm
index 9d9f9cbd3572..763f1963051c 100644
--- a/solenv/bin/modules/pre2par/parameter.pm
+++ b/solenv/bin/modules/pre2par/parameter.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: parameter.pm,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/pathanalyzer.pm b/solenv/bin/modules/pre2par/pathanalyzer.pm
index 116adb6dde76..f45a0808d53a 100644
--- a/solenv/bin/modules/pre2par/pathanalyzer.pm
+++ b/solenv/bin/modules/pre2par/pathanalyzer.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: pathanalyzer.pm,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/remover.pm b/solenv/bin/modules/pre2par/remover.pm
index 5c71c964bd6d..4efe6ea0610c 100644
--- a/solenv/bin/modules/pre2par/remover.pm
+++ b/solenv/bin/modules/pre2par/remover.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: remover.pm,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/systemactions.pm b/solenv/bin/modules/pre2par/systemactions.pm
index c92bfd805a3e..e084d7753f48 100644
--- a/solenv/bin/modules/pre2par/systemactions.pm
+++ b/solenv/bin/modules/pre2par/systemactions.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: systemactions.pm,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/modules/pre2par/work.pm b/solenv/bin/modules/pre2par/work.pm
index c08313cc3b7f..d70f75e80b2e 100644
--- a/solenv/bin/modules/pre2par/work.pm
+++ b/solenv/bin/modules/pre2par/work.pm
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: work.pm,v $
-#
-# $Revision: 1.13 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/oochkpatch.pl b/solenv/bin/oochkpatch.pl
index a15a6ba6fcc7..0234c6d5cf92 100644
--- a/solenv/bin/oochkpatch.pl
+++ b/solenv/bin/oochkpatch.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: oochkpatch.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/packager.pl b/solenv/bin/packager.pl
index aca8a48cc9b6..75d929ab86d6 100644
--- a/solenv/bin/packager.pl
+++ b/solenv/bin/packager.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: packager.pl,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/packimages.pl b/solenv/bin/packimages.pl
index 16cf2a113e8a..9466110124d2 100755
--- a/solenv/bin/packimages.pl
+++ b/solenv/bin/packimages.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: packimages.pl,v $
-#
-# $Revision: 1.17 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/packregistry.xslt b/solenv/bin/packregistry.xslt
new file mode 100644
index 000000000000..55558d55450c
--- /dev/null
+++ b/solenv/bin/packregistry.xslt
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* 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.
+*
+**********************************************************************-->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+   xmlns:oor="http://openoffice.org/2001/registry">
+  <xsl:strip-space elements="*"/>
+  <xsl:preserve-space elements="value"/>
+  <xsl:template match="/">
+    <oor:data xmlns:xs="http://www.w3.org/2001/XMLSchema"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+      <xsl:copy-of select="list/dependency"/>
+<!--
+      <xsl:copy-of select="document(list/filename)/oor:component-schema"/>
+      <xsl:copy-of select="document(list/filename)/oor:component-data"/>
+
+      instead of the below for-each would only issue warnings, not errors, for
+      non-existing or otherwise bad input files; it is important that the input
+      filename list is already sorted in an order suitable for the configmgr
+      (e.g., xcs files preceeding xcu files).
+-->
+      <xsl:for-each select="list/filename">
+        <xsl:choose>
+          <xsl:when test="count(document(.)/oor:component-schema) = 1">
+            <xsl:apply-templates select="document(.)/oor:component-schema"/>
+          </xsl:when>
+          <xsl:when test="count(document(.)/oor:component-data) = 1">
+            <xsl:apply-templates select="document(.)/oor:component-data"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:message terminate="yes">
+              <xsl:text>cannot process </xsl:text>
+              <xsl:value-of select="."/>
+            </xsl:message>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:for-each>
+    </oor:data>
+  </xsl:template>
+  <xsl:template
+     match="oor:component-schema|oor:component-data|templates|component|group|
+            set|node-ref|prop|item|value|node">
+    <xsl:copy copy-namespaces="no">
+      <!-- prune oor:component-data xmlns:install="..." namespaces (would only
+           work in XSLT 2.0, however) -->
+      <xsl:for-each select="@*">
+        <xsl:attribute name="{name()}">
+          <xsl:value-of select="."/>
+        </xsl:attribute>
+      </xsl:for-each>
+      <xsl:apply-templates/>
+    </xsl:copy>
+  </xsl:template>
+  <xsl:template match="info|import|uses|constraints"/>
+    <!-- TODO: no longer strip elements when they are eventually read by
+         configmgr implementation -->
+</xsl:stylesheet>
diff --git a/solenv/bin/par2script.pl b/solenv/bin/par2script.pl
index e7d89964df5e..0789c460d510 100644
--- a/solenv/bin/par2script.pl
+++ b/solenv/bin/par2script.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: par2script.pl,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/patch_sanitizer.pl b/solenv/bin/patch_sanitizer.pl
index d7297f772497..25260f9274c1 100755
--- a/solenv/bin/patch_sanitizer.pl
+++ b/solenv/bin/patch_sanitizer.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: patch_sanitizer.pl,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/pre2par.pl b/solenv/bin/pre2par.pl
index 2c243ce7bb48..f279ae106797 100644
--- a/solenv/bin/pre2par.pl
+++ b/solenv/bin/pre2par.pl
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: pre2par.pl,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/relocate b/solenv/bin/relocate
index 4b19a578636e..2158d5d7314c 100755
--- a/solenv/bin/relocate
+++ b/solenv/bin/relocate
@@ -13,14 +13,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: relocate,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/reportErrorCheckAPI.btm b/solenv/bin/reportErrorCheckAPI.btm
deleted file mode 100755
index 4340ad347259..000000000000
--- a/solenv/bin/reportErrorCheckAPI.btm
+++ /dev/null
@@ -1,17 +0,0 @@
-set ERRORCODE=%1%
-iff exist %SOLARENV%/bin/cwstestresult.pl then
-    iff %ERRORCODE% EQ 0 then
-        set PT_STATUS=%2%
-    else
-        iff %ERRORCODE% EQ 1 then
-            set PT_STATUS=failed
-        else       
-            set PT_STATUS=incomplete
-        endiff
-    endiff
-
-    set CWSENV=Windows
-    call perl5 %SOLARENV%/bin/cwstestresult.pl -c %CWS_WORK_STAMP% -n CWSCheckAPI -p %CWSENV% %PT_STATUS%
-else
-    echo "No cwstestresult.pl found."
-endiff
diff --git a/solenv/bin/rmdir.pl b/solenv/bin/rmdir.pl
index 01b817eb9e59..8feb1603fb44 100644
--- a/solenv/bin/rmdir.pl
+++ b/solenv/bin/rmdir.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: rmdir.pl,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/rpm-wrapper b/solenv/bin/rpm-wrapper
index 1c94bc0a9f10..1a285ddaa3e6 100755
--- a/solenv/bin/rpm-wrapper
+++ b/solenv/bin/rpm-wrapper
@@ -1,15 +1,12 @@
 #!/bin/bash
 #*************************************************************************
+#
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,6 +23,7 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 # At least on v20z-so3, when /so/env/bt_linux_libc2.11/DEV300/bin/rpm is called
diff --git a/solenv/bin/slfl.pl b/solenv/bin/slfl.pl
index b5d8987af4f3..638e15140718 100755
--- a/solenv/bin/slfl.pl
+++ b/solenv/bin/slfl.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: slfl.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/soirpm.sh b/solenv/bin/soirpm.sh
index f886f0fb88d1..1aa34f2a4a45 100755
--- a/solenv/bin/soirpm.sh
+++ b/solenv/bin/soirpm.sh
@@ -2,14 +2,10 @@
 #*************************************************************************
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -26,6 +22,7 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 LIBRPMBUILD=$(find ${COMPATH} -name 'librpmbuild-4.1*' -print)
diff --git a/solenv/bin/sort.pl b/solenv/bin/sort.pl
index 9e88552651f5..b157ed119aa2 100644
--- a/solenv/bin/sort.pl
+++ b/solenv/bin/sort.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: sort.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/subsequenttests b/solenv/bin/subsequenttests
new file mode 100755
index 000000000000..f0d86db89101
--- /dev/null
+++ b/solenv/bin/subsequenttests
@@ -0,0 +1,131 @@
+eval 'exec "$PERL" -Sw "$0" "$@"'
+    if 0;
+#*************************************************************************
+#
+# 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.
+#
+#***********************************************************************/
+
+use lib("$ENV{SOLARENV}/bin/modules");
+use SourceConfig;
+
+my $max_running = 1;
+while (@ARGV) {
+    my $arg = shift(@ARGV);
+    if ($arg =~ /^-P([1-9]\d*)$/) {
+        $max_running = $1;
+    } elsif ($arg eq '--') {
+        last;
+    } else {
+        print STDERR "unknown argument \"$arg\"\n";
+        print STDERR "usage: $0 [-P<n>] [-- <args>]\n";
+        print STDERR " -P<n>  number of parallel dmake invocations\n";
+        print STDERR " <args> are passed to dmake invocations\n";
+        exit(1);
+    }
+}
+
+my @testpaths = ();
+my $sc = SourceConfig->new();
+my $module;
+foreach $module ($sc->get_active_modules()) {
+    my $buildlst = $sc->get_module_build_list($module);
+    next unless defined($buildlst);
+    my %deps = ();
+    open(BUILDLST, $buildlst) or die("cannot open $buildlst");
+    while (<BUILDLST>) {
+        next unless
+            /^\s*\w+\s+(\S+)\s+nmake\s+-\s+all\s+(\S+)(\s+(:?\S+\s+)*)NULL\s*$/;
+        my ($dir, $id, $ids) = ($1, $2, $3);
+        $dir =~ s|\\|/|g;
+        $dir =~ s|^[^/]+||;
+        my $path = $sc->get_module_path($module) . $dir;
+        my $makefile = $path . '/makefile.mk';
+        open(MAKEFILE, $makefile) or die("cannot open $makefile");
+        while (<MAKEFILE>) {
+            if (/\bOOO_SUBSEQUENT_TESTS\b/) {
+                push(@testpaths, $path);
+                $deps{$id} = $ids;
+                last;
+            }
+        }
+        close(MAKEFILE);
+    }
+    close(BUILDLST);
+    my $id1;
+    foreach $id1 (keys(%deps)) {
+        my ($id2, $ids);
+        while (($id2, $ids) = each(%deps)) {
+            $ids !~ /\s\Q$id1\E\s/ or die("$module: $id2 depends on $id1");
+        }
+    }
+}
+
+my $cmd = 'dmake';
+foreach (@ARGV) {
+    s/'/'\''/g;
+    $cmd .= " '" . $_ . "'";
+}
+$cmd .= ' 2>&1 |';
+
+my %pids = ();
+my @failedpaths = ();
+my $running = 0;
+my $counter = 0;
+while (@testpaths || $running > 0) {
+    while (@testpaths && $running < $max_running) {
+        my $testpath = shift(@testpaths);
+        ++$counter;
+        print("$counter: make $testpath\n");
+        my $pid = fork();
+        defined($pid) or die("$counter: $!");
+        if ($pid == 0) {
+            chdir($testpath) or die("$counter: $!");
+            $ENV{'OOO_SUBSEQUENT_TESTS'} = 'x';
+            open(OUTPUT, $cmd) or die("$counter: $!");
+            while (<OUTPUT>) {
+                s/\r?\n$//;
+                print("$counter: $_\n");
+            }
+            close(OUTPUT);
+            exit($? == 0 ? 0 : 1);
+        }
+        $pids{$pid} = $testpath;
+        ++$running;
+    }
+    my $pid = wait();
+    $pid != -1 or die($!);
+    my $testpath = delete($pids{$pid});
+    defined($testpath) or die("unmatched PID $pid");
+    if ($? != 0) {
+        @testpaths = ();
+        push(@failedpaths, $testpath);
+    }
+    --$running;
+}
+my $failedpath;
+foreach $failedpath (@failedpaths) {
+    print STDERR "failed in $failedpath\n";
+}
+exit(scalar(@failedpaths) == 0 ? 0 : 1);
diff --git a/solenv/bin/touch.pl b/solenv/bin/touch.pl
index 2747dd822cea..4c7719cbbbc4 100644
--- a/solenv/bin/touch.pl
+++ b/solenv/bin/touch.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: touch.pl,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/transform_description.pl b/solenv/bin/transform_description.pl
new file mode 100644
index 000000000000..0d6ab34583b3
--- /dev/null
+++ b/solenv/bin/transform_description.pl
@@ -0,0 +1,138 @@
+#!/usr/bin/perl
+#*************************************************************************
+#*
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2009 by Sun Microsystems, Inc.
+#
+# 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.
+#
+#************************************************************************/
+
+parse_args();
+execute_args();
+exit(0);
+
+my $source = undef;
+my $dest = undef;
+my @languages = undef;
+
+sub parse_args
+{
+    # at most two arguments
+    explain(), exit(100) if ( $#ARGV > 1 );
+
+    # destination file is the second argument, if present
+    $dest = $ARGV[1] if ( $#ARGV > 0 );
+
+    # source file is the first argument if present
+    if ( $#ARGV > -1 )
+    {
+        $source = $ARGV[0];
+        if ( ! -f $source )
+        {
+            print STDERR "$source is not a valid file, aborting";
+            exit(101);
+        }
+    }
+
+    # check which languages to use
+    my $languages = $ENV{WITH_LANG};
+    if ( ! defined $languages )
+    {
+        print STDERR "$0: WITH_LANG not set, defaulting to 'en-US'\n";
+        $languages = "en-US";
+    }
+    @languages = split ( ' ', $languages );
+}
+
+sub execute_args
+{
+    my @description = ();
+    if ( defined $source )
+    {
+        open SOURCE, "$source" || die "could not open $source: $?\n";
+        @description = <SOURCE>;
+        close SOURCE;
+    }
+    else
+    {
+        @description = <STDIN>;
+    }
+
+    if ( defined $dest )
+    {
+        open DEST, ">$dest" || die "could not open $dest for writing: $?\n";
+    }
+
+    foreach (@description)
+    {
+        chomp; s/\r//;
+
+        if ( /\#LANG\#/ )
+        {
+            foreach $lang ( @languages )
+            {
+                my $transformed = $_;
+                $transformed =~ s/\#LANG#/$lang/g;
+                if ( defined $dest )
+                {
+                    print DEST "$transformed\n";
+                }
+                else
+                {
+                    print STDOUT "$transformed\n";
+                }
+            }
+        }
+        else
+        {
+            if ( defined $dest )
+            {
+                print DEST "$_\n";
+            }
+            else
+            {
+                print STDOUT "$_\n";
+            }
+        }
+    }
+
+    close DEST if ( defined $dest );
+}
+
+# explains the program's usage
+sub explain
+{
+    print STDOUT "usage:\n";
+    print STDOUT "  $0 [<description_file> [<output_file>]]\n";
+    print STDOUT "  transforms the given extension description file\n";
+    print STDOUT "\n";
+    print STDOUT "  If <output_file> is not given, STDOUT is used.\n";
+    print STDOUT "  If <description_file> is not given, STDIN is used.\n";
+    print STDOUT "\n";
+    print STDOUT "  The following transformations are done at the moment:\n";
+    print STDOUT "  - duplicate all lines containing #LANG#, for ever token of \$WITH_LANG\n";
+    print STDOUT "    replacing every occurance of \$LANG with a token\n";
+    print STDOUT "\n";
+    print STDOUT "  And yes, the functionality of this script should be\n";
+    print STDOUT "  - moved to solenv/inc/tg_ext.mk\n";
+    print STDOUT "  - implemented as XSLT, to be much less error-prone\n";
+}
diff --git a/solenv/bin/unxmap-to-macosx-explist.awk b/solenv/bin/unxmap-to-macosx-explist.awk
index 4f8bd93035a9..b791d46a291c 100644
--- a/solenv/bin/unxmap-to-macosx-explist.awk
+++ b/solenv/bin/unxmap-to-macosx-explist.awk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxmap-to-macosx-explist.awk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/update_module_ignore_lists.pl b/solenv/bin/update_module_ignore_lists.pl
index e4e4c2abe4e3..88d73a0217d6 100644
--- a/solenv/bin/update_module_ignore_lists.pl
+++ b/solenv/bin/update_module_ignore_lists.pl
@@ -5,14 +5,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: hicontrast-to-theme.pl,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/bin/zipdep.pl b/solenv/bin/zipdep.pl
index c83f4d32ef73..f19f79f00e52 100755
--- a/solenv/bin/zipdep.pl
+++ b/solenv/bin/zipdep.pl
@@ -5,14 +5,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: header.hxx,v $
-#
-# $Revision: 1.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index efc7055bd8fc..181df6213c8c 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -8,7 +8,7 @@ common
 			BIG_SVX TRUE
 			BMP_WRITES_FLAG TRUE
 			BUILD_SPECIAL TRUE
-			BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE
+			BUILD_TYPE SO OOo EXT BINFILTER BITSTREAM_VERA_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM QADEVOOO ODK MSFONTEXTRACT MATHMLDTD BOOST EXPAT CRASHREP BERKELEYDB LIBXSLT SUN AGG GTK ICU SYSTRAY_GTK JAVAINSTALLER2 VIGRA OPENSSL JFREEREPORT APACHE_COMMONS TOMCAT REPORTBUILDER SDEXT SWEXT XPDF LUCENE REDLAND SAXON WRITER2LATEX NSS L10N GRAPHITE MYSQLCPPCONN MYSQLC CPPUNIT
 			common_build TRUE
 			COMMON_OUTDIR common
 			CONFIG_PROJECT config_office
@@ -23,6 +23,7 @@ common
 			ENABLE_GTK TRUE
 			ENABLE_MEDIAWIKI YES
 			ENABLE_MINIMIZER YES
+ 			ENABLE_MYSQLC YES
 			ENABLE_NSS_MODULE YES
 			ENABLE_RANDR TRUE
 			ENABLE_REPORTBUILDER YES
@@ -69,7 +70,7 @@ common
 		}
 		crashdump
 		{
-			ENABLE_CRASHDUMP STATIC
+			ENABLE_CRASHDUMP TRUE
 		}
 		hg
 		{
@@ -196,15 +197,18 @@ finish
 		}
 		common_1
 		{
-			BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy
-			BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple
+        BISON_HAIRY %SOLARROOT%$/btools$/bison.hairy
+        BISON_SIMPLE %SOLARROOT%$/btools$/bison.simple
 			DPKG %BUILD_TOOLS%$/dpkg
+            OOO_JUNIT_JAR %SOLARROOT%$/btools$/junit-4.8.1.jar
 			PATH .$:$cp(%SOLARENV%$/bin)$:$cp(%COMMON_BUILD_TOOLS%)$:$cp(%BUILD_TOOLS%$/dmake412)$:$cp(%BUILD_TOOLS%)$:$cp(%COMMON_ENV_TOOLS%)$:$cp(%ENV_TOOLS%)$:$cp(%COMPATH%$/bin)$:$cp(%JDKPATH%)$:$cp(%PATHEXTRA%)$:%PATH%
 			PATH_SEPERATOR $;
 			SOLARINC -I%SOLAR_STLPATH% -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT%$/external %SOLARINCLUDES%
 			SOLARLIB -L%SOLARVER%/%INPATH%/lib%UPDMINOREXT% %JDKLIBS% %SOLAREXTRALIB%
 			SOLARSRC %SRC_ROOT%
 			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
+			ANT_HOME %COMMON_BUILD_TOOLS%$/apache-ant-1.7.1
+            DBGSV_INIT %SOLARENV%/bin/dbgsv.ini
 		}
 		common_2:0 IF X%CWS_WORK_STAMP%X == XX
 		{
@@ -644,6 +648,7 @@ unxlngi6
 			JDK14PATH %SOLAR_JDK14PATH%
 			JDK15PATH %SOLAR_JDK15PATH%
 			KDE_ROOT /so/env/kde/linux/kde-3.2.2
+            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngi6
 			NO_BSYMBOLIC True
 			OJDK16PATH %SOLAR_OJDK16PATH%
 			OS LINUX
@@ -915,6 +920,7 @@ unxlngx6
 			JDK14PATH %SOLAR_JDK14PATH%
 			JDK15PATH %SOLAR_JDK15PATH%
 			KDE_ROOT /so/env/kde/linux/kde-3.2.2
+            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngx6
 			NO_BSYMBOLIC True
 			OJDK16PATH %SOLAR_OJDK16PATH%
 			OS LINUX
@@ -1206,6 +1212,7 @@ unxmacxi
 			JDK13PATH %SOLAR_JDK13PATH%
 			JDK14PATH %SOLAR_JDK15PATH%
 			JDK15PATH %SOLAR_JDK15PATH%
+            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxmacxi
 			NO_BSYMBOLIC True
 			OS MACOSX
 			OUTPATH unxmacxi
@@ -1450,6 +1457,7 @@ unxsoli4
 			JDK13PATH %SOLAR_JDK13PATH%
 			JDK14PATH %SOLAR_JDK14PATH%
 			JDK15PATH %SOLAR_JDK15PATH%
+            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsoli4
 			OJDK16PATH %SOLAR_OJDK16PATH%
 			OS SOLARIS
 			OUTPATH unxsoli4
@@ -1705,6 +1713,7 @@ unxsols4
 			JDK13PATH %SOLAR_JDK13PATH%
 			JDK14PATH %SOLAR_JDK14PATH%
 			JDK15PATH %SOLAR_JDK15PATH%
+            LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxsols4
 			LM_LICENSE_FILE %SOLAR_LICENSE_FILE%
 			OJDK16PATH %SOLAR_OJDK16PATH%
 			OS SOLARIS
@@ -2346,7 +2355,7 @@ wntgcci1
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
-			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
 			PSDK %SOL_TMP%$/r$/MinGW$/w32api
@@ -2362,7 +2371,7 @@ wntgcci1
 			COMPATH %SOL_TMP%$/r$/MinGW
 			COPYALL FALSE
 			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
-			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
 			PSDK %SOL_TMP%$/r$/MinGW$/w32api
@@ -2650,7 +2659,6 @@ wntmsci11
 			*s cdd %SOLARVERSION%
 			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
 			BIG_SVX
-			BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
 			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
 			DMAKEROOT %SOLARENV%$/inc$/startup
@@ -2860,10 +2868,10 @@ wntmsci12
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
+			ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
 			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
@@ -2878,15 +2886,15 @@ wntmsci12
 		}
 		cax
 		{
-			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
+			BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
 			COMPATH %SOL_TMP%$/r$/msvc9p
 			COMPROOT %SOL_TMP%$/r$/msvc9p
 			COPYALL FALSE
 			DSDK %COMPATH%$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
+			ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
 			FSDK %COMPATH%$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %COMPATH%$/PlatformSDK$/V6.1
@@ -2912,7 +2920,6 @@ wntmsci12
 			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
 			*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
 			BIG_SVX
-			BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
 			CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
 			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
@@ -2998,6 +3005,7 @@ wntmsci12
 			GUIBASE WIN
 			GVER NT351
 			INPATH wntmsci12%PROEXT%
+            LIBMYSQL_PATH %SOLAR_ENV_ROOT%$/mysql-connector-c-6.0.2$/wntmsci12
 			MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
 			OS WNT
 			OUTPATH wntmsci12
@@ -3194,17 +3202,17 @@ wntmsci13
 		}
 		cap
 		{
-			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
+			BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
 			COMPATH %SOL_TMP%$/r$/msvc9p
 			COMPROOT %SOL_TMP%$/r$/msvc9p
 			COPYALL TRUE
 			COPY_PACKED TRUE
 			DEVROOT %SOL_TMP%$/r
 			DSDK %SOL_TMP%$/r$/msvc9p$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
+			ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
 			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOLARROOT%$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %SOL_TMP%$/r$/msvc9p$/PlatformSDK$/V6.1
@@ -3219,15 +3227,15 @@ wntmsci13
 		}
 		cax
 		{
-			BUILD_TOOLS %SOL_TMP%$/btw$/%BTOOLDIR%
+			BUILD_TOOLS %SOL_TMP%$/r$/btw$/%BTOOLDIR%
 			COMPATH %SOL_TMP%$/r$/msvc9p
 			COMPROOT %SOL_TMP%$/r$/msvc9p
 			COPYALL FALSE
 			DSDK %COMPATH%$/DirectXSDK
-			ENV_TOOLS %SOL_TMP%$/etw$/%WORK_STAMP%
+			ENV_TOOLS %SOL_TMP%$/r$/etw$/%WORK_STAMP%
 			FSDK %COMPATH%$/Sdk$/v3.5
 			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOL_TMP%$/NSIS_242_unicode
+			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
 			PCLEAN_PATH %SOL_TMP%$/r$/etw
 			PERL %SOL_TMP%$/r$/%PERLDIR%
 			PSDK %COMPATH%$/PlatformSDK$/V6.1
@@ -3253,7 +3261,6 @@ wntmsci13
 			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
 			*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
 			BIG_SVX
-			BISON_PKGDATADIR %BUILD_TOOLS%$/share$/bison
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
 			CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
 			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index f783527391f6..0f9edf93b805 100644
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@@ -43,6 +43,7 @@ common
 		BUILD_TOOLS
         BUILD_TYPE
 		BUILD_SPECIAL
+        BUILD_X64
 		CLASSPATH
 		CALL_CDECL
 		COMEX
@@ -69,6 +70,7 @@ common
 		DIC_ALL
 		DPKG
 		DYLD_LIBRARY_PATH
+		LD_LIBRARY_PATH
 		DMAKE_INC
 		DMAKE
 		DRIVE_O
@@ -90,7 +92,7 @@ common
         ENABLE_PASF
         ENABLE_RANDR
         ENABLE_REPORTBUILDER
-        ENABLE_REPORTDESIGN
+		ENABLE_REPORTDESIGN
         ENABLE_SVCTAGS
 		ENABLE_VBA
 		FORCE2ARCHIVE
@@ -98,6 +100,7 @@ common
         ENABLE_NAS
 		ENABLE_PCH
 		SYSTEM_CURL
+        SYSTEM_CPPUNIT
         SYSTEM_FREETYPE
         FREETYPE_CFLAGS
         FREETYPE_LIBS
@@ -117,6 +120,7 @@ common
 		GCRINC
 		GCRLIB
 		GCRPATH
+		GLIBC
 		GNUCOPY
 		GXX_INCLUDE_PATH
 		HBTOOLKIT
@@ -157,6 +161,7 @@ common
 		ODBCPATH
 		ODBCVER
 		OLD_CHAOS
+        OOO_JUNIT_JAR
         OOO_SHELL
 		PACKMS
 		PCLEAN_PATH
@@ -212,6 +217,7 @@ common
         SOLARUPD
 		SOLARVERSION
         SOURCE_ROOT_USED
+        SOURCE_ROOT_DIR
 		STAR_REGISTRY
         STAR_RESOURCEPATH
 		STLPORT4
@@ -247,6 +253,7 @@ common
         XAU_LIBS
 		WINDOWS_VISTA_PSDK
         WITH_LDAP
+        WITH_VC_REDIST
 		WST
 		XCLASSPATH
         XSLTPROC
@@ -266,10 +273,13 @@ common
         HAVE_LD_HASH_STYLE
         JAVACOMPILER
         JAVADOC
+        JAVAIFLAGS
         JDK
         NO_HIDS
         PAM_LINK
         PAM
+        PSPRINT
+        PYTHONHOME
         PYTHONPATH
         SOLAR_PLUGIN
         URE_BOOTSTRAP
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index 19f6e30ad175..3d91783988b9 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -143,7 +143,9 @@ SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
 $(USE_SHL1VERSIONMAP): $(SHL1OBJS) $(SHL1LIBS)
 .ENDIF
 
-$(USE_SHL1VERSIONMAP): $(SHL1VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL1VERSIONMAP) .ERRREMOVE: $(SHL1VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -289,16 +291,20 @@ $(SHL1TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL1ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL1DEF) \
-        --dllname $(SHL1TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL1TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_1.cmd
     @noop $(assign ALL1OBJLIST:=$(STDOBJ) $(SHL1OBJS) $(SHL1LINKRESO) $(shell $(TYPE) /dev/null $(SHL1LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB1NAME)"!=""	# do not have to include objs
     @noop $(assign DEF1OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB1NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF1OBJLIST) $(assign ALL1OBJLIST:=$(ALL1OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB1NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL1OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_1.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_1.cmd
+.IF "$(SHL1DEF)"!=""
+    @echo	--input-def $(SHL1DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_1.cmd
+.ELSE
+    @echo	$(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_1.cmd
+.ENDIF
+    @echo	$(ALL1OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_1.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL1VERSIONOBJ) $(SHL1DESCRIPTIONOBJ) $(SHL1OBJS) $(SHL1LINKRESO) \
         `$(TYPE) /dev/null $(SHL1LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
@@ -689,7 +695,9 @@ SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
 $(USE_SHL2VERSIONMAP): $(SHL2OBJS) $(SHL2LIBS)
 .ENDIF
 
-$(USE_SHL2VERSIONMAP): $(SHL2VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL2VERSIONMAP) .ERRREMOVE: $(SHL2VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -835,16 +843,20 @@ $(SHL2TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL2ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL2DEF) \
-        --dllname $(SHL2TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL2TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_2.cmd
     @noop $(assign ALL2OBJLIST:=$(STDOBJ) $(SHL2OBJS) $(SHL2LINKRESO) $(shell $(TYPE) /dev/null $(SHL2LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB2NAME)"!=""	# do not have to include objs
     @noop $(assign DEF2OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB2NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF2OBJLIST) $(assign ALL2OBJLIST:=$(ALL2OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB2NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL2OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_2.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_2.cmd
+.IF "$(SHL2DEF)"!=""
+    @echo	--input-def $(SHL2DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_2.cmd
+.ELSE
+    @echo	$(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_2.cmd
+.ENDIF
+    @echo	$(ALL2OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_2.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL2VERSIONOBJ) $(SHL2DESCRIPTIONOBJ) $(SHL2OBJS) $(SHL2LINKRESO) \
         `$(TYPE) /dev/null $(SHL2LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
@@ -1235,7 +1247,9 @@ SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
 $(USE_SHL3VERSIONMAP): $(SHL3OBJS) $(SHL3LIBS)
 .ENDIF
 
-$(USE_SHL3VERSIONMAP): $(SHL3VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL3VERSIONMAP) .ERRREMOVE: $(SHL3VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -1381,16 +1395,20 @@ $(SHL3TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL3ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL3DEF) \
-        --dllname $(SHL3TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL3TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_3.cmd
     @noop $(assign ALL3OBJLIST:=$(STDOBJ) $(SHL3OBJS) $(SHL3LINKRESO) $(shell $(TYPE) /dev/null $(SHL3LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB3NAME)"!=""	# do not have to include objs
     @noop $(assign DEF3OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB3NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF3OBJLIST) $(assign ALL3OBJLIST:=$(ALL3OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB3NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL3OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_3.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_3.cmd
+.IF "$(SHL3DEF)"!=""
+    @echo	--input-def $(SHL3DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_3.cmd
+.ELSE
+    @echo	$(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_3.cmd
+.ENDIF
+    @echo	$(ALL3OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_3.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL3VERSIONOBJ) $(SHL3DESCRIPTIONOBJ) $(SHL3OBJS) $(SHL3LINKRESO) \
         `$(TYPE) /dev/null $(SHL3LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
@@ -1781,7 +1799,9 @@ SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
 $(USE_SHL4VERSIONMAP): $(SHL4OBJS) $(SHL4LIBS)
 .ENDIF
 
-$(USE_SHL4VERSIONMAP): $(SHL4VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL4VERSIONMAP) .ERRREMOVE: $(SHL4VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -1927,16 +1947,20 @@ $(SHL4TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL4ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL4DEF) \
-        --dllname $(SHL4TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL4TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_4.cmd
     @noop $(assign ALL4OBJLIST:=$(STDOBJ) $(SHL4OBJS) $(SHL4LINKRESO) $(shell $(TYPE) /dev/null $(SHL4LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB4NAME)"!=""	# do not have to include objs
     @noop $(assign DEF4OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB4NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF4OBJLIST) $(assign ALL4OBJLIST:=$(ALL4OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB4NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL4OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_4.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_4.cmd
+.IF "$(SHL4DEF)"!=""
+    @echo	--input-def $(SHL4DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_4.cmd
+.ELSE
+    @echo	$(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_4.cmd
+.ENDIF
+    @echo	$(ALL4OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_4.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL4VERSIONOBJ) $(SHL4DESCRIPTIONOBJ) $(SHL4OBJS) $(SHL4LINKRESO) \
         `$(TYPE) /dev/null $(SHL4LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
@@ -2327,7 +2351,9 @@ SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
 $(USE_SHL5VERSIONMAP): $(SHL5OBJS) $(SHL5LIBS)
 .ENDIF
 
-$(USE_SHL5VERSIONMAP): $(SHL5VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL5VERSIONMAP) .ERRREMOVE: $(SHL5VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -2473,16 +2499,20 @@ $(SHL5TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL5ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL5DEF) \
-        --dllname $(SHL5TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL5TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_5.cmd
     @noop $(assign ALL5OBJLIST:=$(STDOBJ) $(SHL5OBJS) $(SHL5LINKRESO) $(shell $(TYPE) /dev/null $(SHL5LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB5NAME)"!=""	# do not have to include objs
     @noop $(assign DEF5OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB5NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF5OBJLIST) $(assign ALL5OBJLIST:=$(ALL5OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB5NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL5OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_5.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_5.cmd
+.IF "$(SHL5DEF)"!=""
+    @echo	--input-def $(SHL5DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_5.cmd
+.ELSE
+    @echo	$(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_5.cmd
+.ENDIF
+    @echo	$(ALL5OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_5.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL5VERSIONOBJ) $(SHL5DESCRIPTIONOBJ) $(SHL5OBJS) $(SHL5LINKRESO) \
         `$(TYPE) /dev/null $(SHL5LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
@@ -2873,7 +2903,9 @@ SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
 $(USE_SHL6VERSIONMAP): $(SHL6OBJS) $(SHL6LIBS)
 .ENDIF
 
-$(USE_SHL6VERSIONMAP): $(SHL6VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL6VERSIONMAP) .ERRREMOVE: $(SHL6VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -3019,16 +3051,20 @@ $(SHL6TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL6ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL6DEF) \
-        --dllname $(SHL6TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL6TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_6.cmd
     @noop $(assign ALL6OBJLIST:=$(STDOBJ) $(SHL6OBJS) $(SHL6LINKRESO) $(shell $(TYPE) /dev/null $(SHL6LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB6NAME)"!=""	# do not have to include objs
     @noop $(assign DEF6OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB6NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF6OBJLIST) $(assign ALL6OBJLIST:=$(ALL6OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB6NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL6OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_6.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_6.cmd
+.IF "$(SHL6DEF)"!=""
+    @echo	--input-def $(SHL6DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_6.cmd
+.ELSE
+    @echo	$(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_6.cmd
+.ENDIF
+    @echo	$(ALL6OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_6.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL6VERSIONOBJ) $(SHL6DESCRIPTIONOBJ) $(SHL6OBJS) $(SHL6LINKRESO) \
         `$(TYPE) /dev/null $(SHL6LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
@@ -3419,7 +3455,9 @@ SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
 $(USE_SHL7VERSIONMAP): $(SHL7OBJS) $(SHL7LIBS)
 .ENDIF
 
-$(USE_SHL7VERSIONMAP): $(SHL7VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL7VERSIONMAP) .ERRREMOVE: $(SHL7VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -3565,16 +3603,20 @@ $(SHL7TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL7ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL7DEF) \
-        --dllname $(SHL7TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL7TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_7.cmd
     @noop $(assign ALL7OBJLIST:=$(STDOBJ) $(SHL7OBJS) $(SHL7LINKRESO) $(shell $(TYPE) /dev/null $(SHL7LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB7NAME)"!=""	# do not have to include objs
     @noop $(assign DEF7OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB7NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF7OBJLIST) $(assign ALL7OBJLIST:=$(ALL7OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB7NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL7OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_7.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_7.cmd
+.IF "$(SHL7DEF)"!=""
+    @echo	--input-def $(SHL7DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_7.cmd
+.ELSE
+    @echo	$(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_7.cmd
+.ENDIF
+    @echo	$(ALL7OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_7.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL7VERSIONOBJ) $(SHL7DESCRIPTIONOBJ) $(SHL7OBJS) $(SHL7LINKRESO) \
         `$(TYPE) /dev/null $(SHL7LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
@@ -3965,7 +4007,9 @@ SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
 $(USE_SHL8VERSIONMAP): $(SHL8OBJS) $(SHL8LIBS)
 .ENDIF
 
-$(USE_SHL8VERSIONMAP): $(SHL8VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL8VERSIONMAP) .ERRREMOVE: $(SHL8VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -4111,16 +4155,20 @@ $(SHL8TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL8ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL8DEF) \
-        --dllname $(SHL8TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL8TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_8.cmd
     @noop $(assign ALL8OBJLIST:=$(STDOBJ) $(SHL8OBJS) $(SHL8LINKRESO) $(shell $(TYPE) /dev/null $(SHL8LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB8NAME)"!=""	# do not have to include objs
     @noop $(assign DEF8OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB8NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF8OBJLIST) $(assign ALL8OBJLIST:=$(ALL8OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB8NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL8OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_8.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_8.cmd
+.IF "$(SHL8DEF)"!=""
+    @echo	--input-def $(SHL8DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_8.cmd
+.ELSE
+    @echo	$(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_8.cmd
+.ENDIF
+    @echo	$(ALL8OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_8.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL8VERSIONOBJ) $(SHL8DESCRIPTIONOBJ) $(SHL8OBJS) $(SHL8LINKRESO) \
         `$(TYPE) /dev/null $(SHL8LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
@@ -4511,7 +4559,9 @@ SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
 $(USE_SHL9VERSIONMAP): $(SHL9OBJS) $(SHL9LIBS)
 .ENDIF
 
-$(USE_SHL9VERSIONMAP): $(SHL9VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL9VERSIONMAP) .ERRREMOVE: $(SHL9VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -4657,16 +4707,20 @@ $(SHL9TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL9ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL9DEF) \
-        --dllname $(SHL9TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL9TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_9.cmd
     @noop $(assign ALL9OBJLIST:=$(STDOBJ) $(SHL9OBJS) $(SHL9LINKRESO) $(shell $(TYPE) /dev/null $(SHL9LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB9NAME)"!=""	# do not have to include objs
     @noop $(assign DEF9OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB9NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF9OBJLIST) $(assign ALL9OBJLIST:=$(ALL9OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB9NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL9OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_9.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_9.cmd
+.IF "$(SHL9DEF)"!=""
+    @echo	--input-def $(SHL9DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_9.cmd
+.ELSE
+    @echo	$(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_9.cmd
+.ENDIF
+    @echo	$(ALL9OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_9.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL9VERSIONOBJ) $(SHL9DESCRIPTIONOBJ) $(SHL9OBJS) $(SHL9LINKRESO) \
         `$(TYPE) /dev/null $(SHL9LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
@@ -5057,7 +5111,9 @@ SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
 $(USE_SHL10VERSIONMAP): $(SHL10OBJS) $(SHL10LIBS)
 .ENDIF
 
-$(USE_SHL10VERSIONMAP): $(SHL10VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL10VERSIONMAP) .ERRREMOVE: $(SHL10VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -5203,16 +5259,20 @@ $(SHL10TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL10ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL10DEF) \
-        --dllname $(SHL10TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL10TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_10.cmd
     @noop $(assign ALL10OBJLIST:=$(STDOBJ) $(SHL10OBJS) $(SHL10LINKRESO) $(shell $(TYPE) /dev/null $(SHL10LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB10NAME)"!=""	# do not have to include objs
     @noop $(assign DEF10OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB10NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF10OBJLIST) $(assign ALL10OBJLIST:=$(ALL10OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB10NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL10OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_10.cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_10.cmd
+.IF "$(SHL10DEF)"!=""
+    @echo	--input-def $(SHL10DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_10.cmd
+.ELSE
+    @echo	$(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_10.cmd
+.ENDIF
+    @echo	$(ALL10OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_10.cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL10VERSIONOBJ) $(SHL10DESCRIPTIONOBJ) $(SHL10OBJS) $(SHL10LINKRESO) \
         `$(TYPE) /dev/null $(SHL10LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
diff --git a/solenv/inc/ant.mk b/solenv/inc/ant.mk
index ce62599a11b7..2d182a66a437 100644
--- a/solenv/inc/ant.mk
+++ b/solenv/inc/ant.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: ant.mk,v $
-#
-# $Revision: 1.36 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/antsettings.mk b/solenv/inc/antsettings.mk
index 26ccfa6fe3bc..5a28b242967d 100644
--- a/solenv/inc/antsettings.mk
+++ b/solenv/inc/antsettings.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: antsettings.mk,v $
-#
-# $Revision: 1.7.166.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,10 +28,6 @@
 
 .IF "$(SOLAR_JAVA)"!=""
 
-.IF "$(ANT_HOME)" == ""
-ANT_HOME*:=$(COMMON_BUILD_TOOLS)/apache-ant-1.7.0
-.EXPORT : ANT_HOME
-.ENDIF
 ANT_LIB*:=$(ANT_HOME)/lib
 
 ANT_CLASSPATH:=$(ANT_LIB)/xercesImpl.jar$(PATH_SEPERATOR)$(ANT_LIB)/xml-apis.jar$(PATH_SEPERATOR)$(ANT_LIB)/ant.jar
diff --git a/solenv/inc/cppunit.mk b/solenv/inc/cppunit.mk
index 7ba7e08a93ec..2173f1a9ff9a 100644
--- a/solenv/inc/cppunit.mk
+++ b/solenv/inc/cppunit.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: cppunit.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index 07968efada54..47b62d20dd12 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: extension_post.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,6 +25,8 @@
 #
 #*************************************************************************
 
+EXTENSION_TARGET:=$(ZIP9TARGETN)
+
 .SOURCE.xcu : $(MISC)/$(EXTNAME)/merge $(MISC)/$(EXTNAME)/registry/data $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/merge $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/registry/data $(COMPONENT_CONFIGDIR) .
 .SOURCE.xcs : $(MISC)/$(EXTNAME)/registry $(MISC)/$(EXTNAME)/registry/schema .
 
@@ -129,12 +127,18 @@ PHONYDESC=.PHONY
 .IF "$(DESCRIPTION)"!=""
 $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
     @@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.$(EXTNAME)
     @echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)/$(TARGET)_lang_track.mk
-    $(COMMAND_ECHO)$(TYPE) $@.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $(MISC)/desc.tmp.$(EXTNAME)
-    @@-$(RM) $@.$(EXTNAME)
-    $(COMMAND_ECHO)$(TYPE) $(MISC)/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
-    @@-$(RM) $(MISC)/desc.tmp.$(EXTNAME)
+
+    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/licinserter.pl $(DESCRIPTION_SRC) $(COMPONENT_LIC_TEMPL) $@.1.$(EXTNAME)
+
+    $(COMMAND_ECHO)$(PERL) $(SOLARENV)/bin/transform_description.pl $@.1.$(EXTNAME) $@.2.$(EXTNAME)
+    @@-$(RM) $@.1.$(EXTNAME)
+
+    $(COMMAND_ECHO)$(TYPE) $@.2.$(EXTNAME) | sed s/UPDATED_IDENTIFIER/$(IMPLEMENTATION_IDENTIFIER)/ >  $@.3.$(EXTNAME)
+    @@-$(RM) $@.2.$(EXTNAME)
+
+    $(COMMAND_ECHO)$(TYPE) $@.3.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
+    @@-$(RM) $@.3.$(EXTNAME)
 
 .ENDIF			# "$(DESCRIPTION)"!=""
 # default OOo license text!!!
diff --git a/solenv/inc/extension_pre.mk b/solenv/inc/extension_pre.mk
index 84a9d48fd804..abef2e7f8b73 100644
--- a/solenv/inc/extension_pre.mk
+++ b/solenv/inc/extension_pre.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: extension_pre.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/installationtest.mk b/solenv/inc/installationtest.mk
new file mode 100644
index 000000000000..6aef79c1cd0f
--- /dev/null
+++ b/solenv/inc/installationtest.mk
@@ -0,0 +1,121 @@
+#*************************************************************************
+# 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.
+#***********************************************************************/
+
+.IF "$(OS)" == "WNT"
+my_file = file:///
+.ELSE
+my_file = file://
+.END
+
+# The following conditional is an approximation of: UPDATER set to YES and
+# SHIPDRIVE set and CWS_WORK_STAMP not set and either SOL_TMP not set or
+# SOLARENV set to a pathname of which SOL_TMP is not a prefix:
+.IF "$(UPDATER)" == "YES" && "$(SHIPDRIVE)" != "" && \
+    "$(CWS_WORK_STAMP)" == "" && "$(SOLARENV:s/$(SOL_TMP)//" == "$(SOLARENV)"
+my_instsets = $(shell ls -dt \
+    $(SHIPDRIVE)/$(INPATH)/OpenOffice/archive/$(WORK_STAMP)_$(UPDMINOR)_native_packed-*_$(defaultlangiso).$(BUILD))
+installationtest_instset = $(installationtest_instsets:1)
+.ELSE
+installationtest_instset = \
+    $(SOLARSRC)/instsetoo_native/$(INPATH)/OpenOffice/archive/install/$(defaultlangiso)
+.END
+
+.IF "$(OS)" == "WNT"
+installationtest_instpath = `cat $(MISC)/$(TARGET)/installation.flag`
+.ELSE
+installationtest_instpath = $(SOLARVERSION)/$(INPATH)/installation$(UPDMINOREXT)
+.END
+
+.IF "$(OS)" == "MACOSX"
+my_soffice = $(installationtest_instpath)/opt/OpenOffice.org.app/Contents/MacOS/soffice
+.ELIF "$(OS)" == "WNT"
+my_soffice = \
+    $(installationtest_instpath)'/opt/OpenOffice.org 3/program/soffice.exe'
+.ELSE
+my_soffice = $(installationtest_instpath)/opt/openoffice.org3/program/soffice
+.END
+
+.IF "$(OOO_LIBRARY_PATH_VAR)" != ""
+my_cppenv = \
+    -env:arg-env=$(OOO_LIBRARY_PATH_VAR)"$${{$(OOO_LIBRARY_PATH_VAR)+=$$$(OOO_LIBRARY_PATH_VAR)}}"
+my_javaenv = \
+    -Dorg.openoffice.test.arg.env=$(OOO_LIBRARY_PATH_VAR)"$${{$(OOO_LIBRARY_PATH_VAR)+=$$$(OOO_LIBRARY_PATH_VAR)}}"
+.END
+
+# Work around Windows problems with long pathnames (see issue 50885) by
+# installing into the temp directory instead of the module output tree (in which
+# case $(TARGET).installation.flag contains the path to the temp installation,
+# which is removed after smoketest); can be removed once issue 50885 is fixed;
+# on other platforms, a single installation to solver is created in
+# smoketestoo_native:
+.IF "$(OS)" == "WNT"
+$(MISC)/$(TARGET)/installation.flag : \
+        $(shell ls $(installationtest_instset)/OOo_*_install.zip)
+    $(MKDIRHIER) $(@:d)
+    my_tmp=$$(cygpath -m $$(mktemp -dt ooosmoke.XXXXXX)) && \
+    unzip $(installationtest_instset)/OOo_*_install.zip -d "$$my_tmp" && \
+    mv "$$my_tmp"/OOo_*_install "$$my_tmp"/opt && \
+    echo "$$my_tmp" > $@
+.END
+
+cpptest .PHONY : $(MISC)/$(TARGET)/services.rdb
+    $(RM) -r $(MISC)/$(TARGET)/user
+    $(MKDIRHIER) $(MISC)/$(TARGET)/user
+    $(CPPUNITTESTER) \
+        -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \
+        -env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/types.rdb \
+        -env:arg-path=$(my_soffice) -env:arg-user=$(MISC)/$(TARGET)/user \
+        $(my_cppenv) $(OOO_CPPTEST_ARGS)
+    $(RM) -r $(MISC)/$(TARGET)/user
+.IF "$(OS)" == "WNT"
+    $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
+cpptest : $(MISC)/$(TARGET)/installation.flag
+.END
+
+$(MISC)/$(TARGET)/services.rdb :
+    $(MKDIRHIER) $(@:d)
+    $(RM) $@
+    $(REGCOMP) -register -r $@ -wop -c bridgefac.uno -c connector.uno \
+        -c remotebridge.uno -c uuresolver.uno
+
+.IF "$(SOLAR_JAVA)" == "TRUE" && "$(OOO_JUNIT_JAR)" != ""
+javatest .PHONY : $(JAVATARGET)
+    $(RM) -r $(MISC)/$(TARGET)/user
+    $(MKDIRHIER) $(MISC)/$(TARGET)/user
+    $(JAVAI) $(JAVAIFLAGS) $(JAVACPS) \
+        '$(OOO_JUNIT_JAR)$(PATH_SEPERATOR)$(CLASSPATH)' \
+        -Dorg.openoffice.test.arg.path=$(my_soffice) \
+        -Dorg.openoffice.test.arg.user=$(my_file)$(PWD)/$(MISC)/$(TARGET)/user \
+        $(my_javaenv) org.junit.runner.JUnitCore \
+        $(foreach,i,$(JAVATESTFILES) $(subst,/,. $(PACKAGE)).$(i:s/.java//))
+    $(RM) -r $(MISC)/$(TARGET)/user
+.IF "$(OS)" == "WNT"
+    $(RM) -r $(installationtest_instpath) $(MISC)/$(TARGET)/installation.flag
+javatest : $(MISC)/$(TARGET)/installation.flag
+.END
+.ELSE
+javatest .PHONY :
+    echo 'javatest needs SOLAR_JAVA=TRUE and OOO_JUNIT_JAR'
+.END
diff --git a/solenv/inc/javaunittest.mk b/solenv/inc/javaunittest.mk
index 6d34ced82a61..e129052a445e 100644
--- a/solenv/inc/javaunittest.mk
+++ b/solenv/inc/javaunittest.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: javaunittest.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -84,8 +80,9 @@ $(TESTS): $(JAVACLASSFILES)
 .ENDIF
 
 %.test .PHONY: %.java
-    $(JAVAI) $(JAVACPS) $(CLASSPATH) org.openoffice.Runner -TestBase java_complex \
-        -NoOffice yes -o $(subst,/,. $(subst,.test, $(PACKAGE).$@))
+    $(JAVAI) $(JAVAIFLAGS) $(JAVACPS) $(CLASSPATH) org.openoffice.Runner \
+        -TestBase java_complex -NoOffice yes \
+        -o $(subst,/,. $(subst,.test, $(PACKAGE).$@))
 
 .IF "$(IDLTESTFILES)" != ""
 
diff --git a/solenv/inc/lang.mk b/solenv/inc/lang.mk
index b013c0a68b67..fc5321653fbc 100644
--- a/solenv/inc/lang.mk
+++ b/solenv/inc/lang.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: lang.mk,v $
-#
-# $Revision: 1.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 5ad14d4d87c7..b835f526997f 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: libs.mk,v $
-#
-# $Revision: 1.134.2.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -182,7 +178,6 @@ BTCOMMUNILIB=-lbtcommuni$(DLLPOSTFIX)
 AUTOMATIONLIB=-lsts$(DLLPOSTFIX)
 SVLLIB=-lsvl$(DLLPOSTFIX)
 TKTLIB=-ltkt$(DLLPOSTFIX)
-GOODIESLIB=-lgo$(DLLPOSTFIX)
 SAXLIB=-lsax$(DLLPOSTFIX)
 MAILLIB=-lmail
 DOCMGRLIB=-ldmg$(DLLPOSTFIX)
@@ -210,7 +205,7 @@ ZLIB3RDLIB=-lzlib
 #i34482# Blackdown/Sun jdk is in the libsearch patch and has a libjpeg :-(
 .IF "$(OS)" == "FREEBSD"
 JPEG3RDLIB=/usr/local/lib/libjpeg.so
-.ELIF "$(CPUNAME)" == "X86_64"
+.ELIF "$(CPUNAME)" == "X86_64" || "$(CPUNAME)" == "S390X" || "$(CPUNAME)" == "POWERPC64"
 JPEG3RDLIB=/usr/lib64/libjpeg.so
 .ELSE
 JPEG3RDLIB=/usr/lib/libjpeg.so
@@ -245,6 +240,7 @@ FWILIB=-lfwi$(DLLPOSTFIX)
 SVXCORELIB=-lsvxcore$(DLLPOSTFIX)
 MSFILTERLIB=-lmsfilter$(DLLPOSTFIX)
 SVXLIB=-lsvx$(DLLPOSTFIX)
+EDITENGLIB=-lediteng$(DLLPOSTFIX)
 BASCTLLIB=-lbasctl$(DLLPOSTFIX)
 BASICIDELIB=-lybctl
 SVXLLIB=-lsvxl
@@ -273,8 +269,12 @@ JVMACCESSLIB = -ljvmaccess$(COMID)
 .IF "$(OS)" == "WNT"
 CPPUNITLIB = -lcygcppunit-1-12-1
 .ELSE
+.IF "$(SYSTEM_CPPUNIT)"=="YES"
+CPPUNITLIB = $(CPPUNIT_LIBS)
+.ELSE
 CPPUNITLIB = -lcppunit
 .ENDIF
+.ENDIF
 .IF "$(SYSTEM_LIBXSLT)"=="YES"
 XSLTLIB=$(LIBXSLT_LIBS)
 .ELSE
@@ -347,6 +347,8 @@ PYUNOLIB=-lpyuno
 LPSOLVELIB=-llpsolve55
 SOFFICELIB=-lsofficeapp
 UNOPKGAPPLIB=-lunopkgapp
+CONFIGMGRLIB=-lconfigmgr
+TESTLIB=-ltest
 
 .ELSE				# ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
 
@@ -424,7 +426,6 @@ BTCOMMUNILIB=ibtcommuni.lib
 AUTOMATIONLIB=ists.lib
 SVLLIB=isvl.lib
 PLUGAPPLIB=plugapp.lib
-GOODIESLIB=igo.lib
 SAXLIB=isax.lib
 MAILLIB=mail.lib
 DOCMGRLIB=docmgr.lib
@@ -435,6 +436,7 @@ SJLIB=sj.lib
 SVXCORELIB=isvxcore.lib
 MSFILTERLIB=imsfilter.lib
 SVXLIB=isvx.lib
+EDITENGLIB=iediteng.lib
 BASCTLLIB=basctl.lib
 BASICIDELIB=ybctl.lib
 SVXLLIB=svxl.lib
@@ -527,5 +529,7 @@ PYUNOLIB=ipyuno.lib
 LPSOLVELIB=lpsolve55.lib
 SOFFICELIB=isofficeapp.lib
 UNOPKGAPPLIB=iunopkgapp.lib
+CONFIGMGRLIB=iconfigmgr.lib
+TESTLIB=itest.lib
 
 .ENDIF              # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index c81283b50ebb..fdb9f8e48def 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m70(Build:9478)
-BUILD=9478
-LAST_MINOR=m70
+RSCREVISION=300m76(Build:9491)
+BUILD=9491
+LAST_MINOR=m76
 SOURCEVERSION=DEV300
diff --git a/solenv/inc/os2.mk b/solenv/inc/os2.mk
index 03ad2f7a35da..981479f184c4 100644
--- a/solenv/inc/os2.mk
+++ b/solenv/inc/os2.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: os2.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/os2gcci.mk b/solenv/inc/os2gcci.mk
index 8305a5d25e56..46dcba24aaa1 100644
--- a/solenv/inc/os2gcci.mk
+++ b/solenv/inc/os2gcci.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: os2.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/pkg_config.mk b/solenv/inc/pkg_config.mk
index 4c04de5b5520..3654083e76ad 100644
--- a/solenv/inc/pkg_config.mk
+++ b/solenv/inc/pkg_config.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: pkg_config.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/postmac.h b/solenv/inc/postmac.h
index 0cb58b86ff20..68f85b6c0f65 100644
--- a/solenv/inc/postmac.h
+++ b/solenv/inc/postmac.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: postmac.h,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index 4a7f6aeae28c..77413849c5f9 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: postset.mk,v $
-#
-# $Revision: 1.47.50.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/preinclude.h b/solenv/inc/preinclude.h
index 3b12d39bccec..dee99bc6d3f4 100644
--- a/solenv/inc/preinclude.h
+++ b/solenv/inc/preinclude.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: preinclude.h,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/premac.h b/solenv/inc/premac.h
index 45d55cde4802..451a33b8ab00 100644
--- a/solenv/inc/premac.h
+++ b/solenv/inc/premac.h
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: premac.h,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk
index 814e37708b6b..74c50ae9616d 100644
--- a/solenv/inc/pstrules.mk
+++ b/solenv/inc/pstrules.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: pstrules.mk,v $
-#
-# $Revision: 1.50 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 991309d6de6e..457041378f85 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: rules.mk,v $
-#
-# $Revision: 1.103.4.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,7 +28,7 @@
 MKFILENAME:=RULES.MK
 
 $(OBJ)/%.obj : %.cxx
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cxx
@@ -56,7 +52,7 @@ $(OBJ)/%.obj : %.cxx
 .ENDIF			# "$(nodep)"==""
 
 $(OBJ)/%.obj : %.cpp
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cpp
@@ -78,7 +74,7 @@ $(OBJ)/%.obj : %.cpp
 .ENDIF			# "$(nodep)"==""
 
 $(OBJ)/%.obj : %.cc
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(CFLAGSINCXX)$(PWD)/$*.cc
@@ -159,7 +155,7 @@ $(SLO)/precompiled_ex.% .PHONY:
 .ENDIF			# "$(ENABLE_PCH)"!=""
 
 $(SLO)/%.obj : %.cxx
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(ENABLE_PCH)"!="" && ( "$(BUILD_SPECIAL)"!="TRUE" )
 # just a helper var	
     @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)))
@@ -198,7 +194,7 @@ $(SLO)/%.obj : %.cxx
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : %.cpp
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(PWD)/$*.cpp
@@ -224,7 +220,7 @@ $(SLO)/%.obj : %.cpp
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : $(MISC)/%.cxx
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)/$*.cxx
@@ -249,7 +245,7 @@ $(SLO)/%.obj : $(MISC)/%.cxx
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : $(MISC)/%.cc
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)/$*.cc
@@ -266,7 +262,7 @@ $(SLO)/%.obj : $(MISC)/%.cc
 .ENDIF
 
 $(OBJ)/%.obj : $(MISC)/%.cxx
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXOBJ) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) -E  $(CFLAGSINCXX)$(MISC)/$*.cxx
@@ -291,7 +287,7 @@ $(OBJ)/%.obj : $(MISC)/%.cxx
 .ENDIF			# "$(nodep)"==""
 
 $(OBJ)/%.obj : %.c
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.c
@@ -321,7 +317,7 @@ $(OBJ)/%.obj : %.c
 .ENDIF			# "$(nodep)"==""
 
 $(OBJ)/%.obj : $(MISC)/%.c
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.c
@@ -343,7 +339,7 @@ $(OBJ)/%.obj : $(MISC)/%.c
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : $(MISC)/%.c
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.c
@@ -366,7 +362,7 @@ $(SLO)/%.obj : $(MISC)/%.c
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : %.c
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(GUI)"=="UNX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(CC) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.c
@@ -389,7 +385,7 @@ $(SLO)/%.obj : %.c
 
 # Objective-C files
 $(OBJ)/%.obj : %.m
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.m
@@ -404,7 +400,7 @@ $(OBJ)/%.obj : %.m
 
 # Objective-C files
 $(OBJ)/%.obj : $(MISC)/%.m
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.m
@@ -415,7 +411,7 @@ $(OBJ)/%.obj : $(MISC)/%.m
 
 # Objective-C files
 $(SLO)/%.obj : $(MISC)/%.m
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.m
@@ -426,7 +422,7 @@ $(SLO)/%.obj : $(MISC)/%.m
 
 # Objective-C files
 $(SLO)/%.obj : %.m
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objc) $(CFLAGS) $(INCLUDE_C) $(CFLAGSCC) $(OBJCFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.m
@@ -442,7 +438,7 @@ not_existing/o_%.dpcc : %.c;@noop $(assign all_local_obj+:=$<)
 
 # Objective-C++ files
 $(OBJ)/%.obj : %.mm
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
 .IF "$(TEST)"!=""
     $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCC) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) -E $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $*.mm
@@ -461,7 +457,7 @@ $(OBJ)/%.obj : %.mm
 
 # Objective-C++ files
 $(OBJ)/%.obj : $(MISC)/%.mm
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSOBJ) $(CDEFS) $(CDEFSOBJ) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(OBJ)/$*.o $(MISC)/$*.mm
@@ -476,7 +472,7 @@ $(OBJ)/%.obj : $(MISC)/%.mm
 
 # Objective-C++ files
 $(SLO)/%.obj : $(MISC)/%.mm
-    @echo Compiling: $(PRJNAME)/$(INPATH)/misc/$(<:f)
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(INPATH)/misc/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $(MISC)/$*.mm
@@ -491,7 +487,7 @@ $(SLO)/%.obj : $(MISC)/%.mm
 
 # Objective-C++ files
 $(SLO)/%.obj : %.mm
-    @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+    @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(OS)"=="MACOSX"
     @$(RM) $@ $(@:s/.obj/.o/)
     $(COMMAND_ECHO)$(objcpp) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(OBJCXXFLAGS) $(CFLAGSSLO) $(CDEFS) $(CDEFSSLO) $(CDEFSMT) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)/$*.o $*.mm
@@ -639,7 +635,7 @@ $(MISC)/%.dpj :
 .ENDIF			# "$(nodep)"==""
 
 $(SLO)/%.obj : %.asm
-       @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+       @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(COM)"=="GCC"
 .IF "$(ASM)"=="ml"
        $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(SLO)/$*.obj $*.asm
@@ -666,7 +662,7 @@ $(SLO)/%.obj : %.asm
 .ENDIF
 
 $(OBJ)/%.obj : %.asm
-       @echo Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$<
+       @echo $(COMPILE_ECHO_SWITCH) Compiling: $(PRJNAME)/$(PATH_IN_MODULE)/$(COMPILE_ECHO_FILE)
 .IF "$(COM)"=="GCC"
 .IF "$(ASM)"=="ml"
        $(COMMAND_ECHO)$(ASM) $(AFLAGS) -D$(COM) /Fo$(OBJ)/$*.obj $*.asm
diff --git a/solenv/inc/sc.mk b/solenv/inc/sc.mk
index 50cef7c5b028..ad2102a92b4f 100644
--- a/solenv/inc/sc.mk
+++ b/solenv/inc/sc.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: sc.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/scpre.mk b/solenv/inc/scpre.mk
index 01ec9c72591b..1b9b7a7dacac 100644
--- a/solenv/inc/scpre.mk
+++ b/solenv/inc/scpre.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: scpre.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/set_ext.mk b/solenv/inc/set_ext.mk
index 1e035ed311cd..8d6d4db5a627 100644
--- a/solenv/inc/set_ext.mk
+++ b/solenv/inc/set_ext.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: set_ext.mk,v $
-#
-# $Revision: 1.7 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
index 23dbee21d2cd..bf2ca9314f33 100644
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: set_wntx64.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -128,6 +124,7 @@ COMCTL32LIB_X64=$(LIBPATH_X64)/comctl32.lib
 CRYPT32LIB_X64=$(LIBPATH_X64)/crypt32.lib
 GDIPLUSLIB_X64=$(LIBPATH_X64)/gdiplus.lib
 DBGHELPLIB_X64=$(LIBPATH_X64)/dbghelp.lib
+PROPSYSLIB_X64=$(LIBPATH_X64)/propsys.lib
 MSILIB_X64=$(LIBPATH_X64)/msi.lib
 DDRAWLIB_X64=$(LIBPATH_X64)/ddraw.lib
 SHLWAPILIB_X64=$(LIBPATH_X64)/shlwapi.lib
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 2977f5f0a1d2..6136e21acc96 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: settings.mk,v $
-#
-# $Revision: 1.214.30.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -935,7 +931,7 @@ MKDEPFLAGS+=$(MKDEPSOLVER)
 MKDEPFLAGS+=$(MKDEPLOCAL)
 #.ENDIF
 
-BISON=bison
+BISON*=bison
 YACCFLAGS*=-d 
 
 SVIDL=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/svidl
@@ -971,6 +967,8 @@ RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc
         ULFEX_VERBOSITY=-QQ
     .ENDIF
 .ENDIF # "$(VERBOSE)" == "TRUE"
+COMPILE_ECHO_SWITCH=
+COMPILE_ECHO_FILE=$(<:f)
 
 #new
 RSCUPDVER=$(RSCREVISION)
@@ -1349,6 +1347,10 @@ $(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/x
 XML_APIS_JAR*=$(SOLARBINDIR)/xml-apis.jar
 XERCES_JAR*=$(SOLARBINDIR)/xercesImpl.jar
 
+.IF "$(SYSTEM_CPPUNIT)" != "YES"
+CPPUNIT_CFLAGS =
+.END
+
 # workaround for strange dmake bug:
 # if the previous block was a rule or a target, "\#" isn't recognized
 # as an escaped "#". if it was an assignment, escaping works...
diff --git a/solenv/inc/shlinfo.rc b/solenv/inc/shlinfo.rc
index c114458617de..3e090272408d 100644
--- a/solenv/inc/shlinfo.rc
+++ b/solenv/inc/shlinfo.rc
@@ -2,7 +2,7 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
@@ -79,7 +79,7 @@ VS_VERSION_INFO versioninfo
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	PPS(ORG_NAME) "\0"
 				value "InternalName", 		PPS(INTERNAL_NAME) "\0"
-				value "LegalCopyright",		S_CRIGHT " Sun Microsystems, Inc.\0"
+				value "LegalCopyright",		S_CRIGHT " Oracle, Inc.\0"
 				ADDITIONAL_VERINFO1
 				ADDITIONAL_VERINFO2
 				ADDITIONAL_VERINFO3
@@ -92,7 +92,7 @@ VS_VERSION_INFO versioninfo
 				value "FileVersion",		PPS(VER_LEVEL) "\0"
 				value "OriginalFilename",	PPS(ORG_NAME) "\0"
 				value "InternalName", 		PPS(INTERNAL_NAME) "\0"
-				value "LegalCopyright", 	S_CRIGHT " Sun Microsystems, Inc.\0"
+				value "LegalCopyright", 	S_CRIGHT " Oracle, Inc.\0"
 				ADDITIONAL_VERINFO1
 				ADDITIONAL_VERINFO2
 				ADDITIONAL_VERINFO3
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 2330aa64e49b..0319e92f3418 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: target.mk,v $
-#
-# $Revision: 1.211.4.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -215,9 +211,7 @@ LOCALJARS:=$(foreach,i,$(shell @@-cd $(JARDIR) && ls -1 $(JARFILES) ) $(JARDIR)/
 NEWCLASS:=$(LOCALJARS)
 NEWCLASS+:=$(foreach,i,$(JARFILES) $(eq,$(LOCALJARS),$(subst,$i, $(LOCALJARS)) $(SOLARBINDIR)/$i $(NULL)))
 .ENDIF			# "$(JARFILES)"!=""
-.IF "$(EXTRAJARFILES)"!=""
-NEWCLASS+=$(foreach,i,$(EXTRAJARFILES) $(COMMON_BUILD_TOOLS)/$i)
-.ENDIF			# "$(EXTRAJARFILES)"!=""
+NEWCLASS+=$(EXTRAJARFILES)
 .IF "$(GENJAVACLASSFILES)"!=""
 NEWCLASS+=$(CLASSGENDIR)
 .ENDIF			# "$(GENJAVACLASSFILES)"!=""
diff --git a/solenv/inc/templates/extension_tmpl.mk b/solenv/inc/templates/extension_tmpl.mk
index fdc597c67164..b9ea7db7ee76 100644
--- a/solenv/inc/templates/extension_tmpl.mk
+++ b/solenv/inc/templates/extension_tmpl.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: extension_tmpl.mk,v $
-#
-# $Revision: 1.3.56.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_app.mk b/solenv/inc/tg_app.mk
index 29ea4ca9221a..cefdf14db033 100644
--- a/solenv/inc/tg_app.mk
+++ b/solenv/inc/tg_app.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_app.mk,v $
-#
-# $Revision: 1.75 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index 5c00ffb74f28..8218887528fe 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_compv.mk,v $
-#
-# $Revision: 1.22 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk
index 06aadd094d03..2f1b9fedde80 100644
--- a/solenv/inc/tg_config.mk
+++ b/solenv/inc/tg_config.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_config.mk,v $
-#
-# $Revision: 1.21.72.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_def.mk b/solenv/inc/tg_def.mk
index 90262f95e2ff..0bbd1f6b1ab1 100644
--- a/solenv/inc/tg_def.mk
+++ b/solenv/inc/tg_def.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_def.mk,v $
-#
-# $Revision: 1.49 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_dep.mk b/solenv/inc/tg_dep.mk
index 22eb11198bb2..37517e2f14b8 100644
--- a/solenv/inc/tg_dep.mk
+++ b/solenv/inc/tg_dep.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_dep.mk,v $
-#
-# $Revision: 1.30.166.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -94,6 +90,7 @@ ALLDPC:
     @echo $(EMQ)# > $(MISC)/$(TARGET).dpc
 
 ALLDEP:
+    @echo nothing to do here...
 
 .ENDIF
 
diff --git a/solenv/inc/tg_ext.mk b/solenv/inc/tg_ext.mk
index 7593dad01c37..3427b88836fc 100644
--- a/solenv/inc/tg_ext.mk
+++ b/solenv/inc/tg_ext.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_ext.mk,v $
-#
-# $Revision: 1.91 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk
index a8a33051f0fc..aa62b1cf477f 100755
--- a/solenv/inc/tg_help.mk
+++ b/solenv/inc/tg_help.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.pmk,v $
-#
-# $Revision: 1.25 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_jar.mk b/solenv/inc/tg_jar.mk
index 25bff261081b..d1109ec4e8f1 100644
--- a/solenv/inc/tg_jar.mk
+++ b/solenv/inc/tg_jar.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_jar.mk,v $
-#
-# $Revision: 1.25 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_java.mk b/solenv/inc/tg_java.mk
index 2192bb2d410f..5c00f2bbf7f5 100644
--- a/solenv/inc/tg_java.mk
+++ b/solenv/inc/tg_java.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_java.mk,v $
-#
-# $Revision: 1.13 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_javav.mk b/solenv/inc/tg_javav.mk
index e39533f9b6f6..fe5f7fe17e81 100644
--- a/solenv/inc/tg_javav.mk
+++ b/solenv/inc/tg_javav.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_javav.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_lib.mk b/solenv/inc/tg_lib.mk
index 7ea3efea65ab..08909156b729 100644
--- a/solenv/inc/tg_lib.mk
+++ b/solenv/inc/tg_lib.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_lib.mk,v $
-#
-# $Revision: 1.24 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_merge.mk b/solenv/inc/tg_merge.mk
index 324daba82f8b..a40d48a81c66 100644
--- a/solenv/inc/tg_merge.mk
+++ b/solenv/inc/tg_merge.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_merge.mk,v $
-#
-# $Revision: 1.11.72.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_moz.mk b/solenv/inc/tg_moz.mk
index 2cde0e93e003..8c1c0dfa39d4 100644
--- a/solenv/inc/tg_moz.mk
+++ b/solenv/inc/tg_moz.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_moz.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_obj.mk b/solenv/inc/tg_obj.mk
index a7cabeb51bac..3a597c2409b3 100644
--- a/solenv/inc/tg_obj.mk
+++ b/solenv/inc/tg_obj.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_obj.mk,v $
-#
-# $Revision: 1.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_res.mk b/solenv/inc/tg_res.mk
index 2a530f904886..cad40533e7b8 100644
--- a/solenv/inc/tg_res.mk
+++ b/solenv/inc/tg_res.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_res.mk,v $
-#
-# $Revision: 1.12 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_rslb.mk b/solenv/inc/tg_rslb.mk
index fedfa8fbd43e..40096386c436 100644
--- a/solenv/inc/tg_rslb.mk
+++ b/solenv/inc/tg_rslb.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_rslb.mk,v $
-#
-# $Revision: 1.26 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_scp.mk b/solenv/inc/tg_scp.mk
index cb86abae4c20..fd970deaae18 100644
--- a/solenv/inc/tg_scp.mk
+++ b/solenv/inc/tg_scp.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_scp.mk,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_sdi.mk b/solenv/inc/tg_sdi.mk
index 0ac0e24d2a85..a515fc1ed13a 100644
--- a/solenv/inc/tg_sdi.mk
+++ b/solenv/inc/tg_sdi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_sdi.mk,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 8cb6653f334e..170947c21c4a 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_shl.mk,v $
-#
-# $Revision: 1.127 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -176,7 +172,9 @@ SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
 $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)OBJS) $(SHL$(TNR)LIBS)
 .ENDIF
 
-$(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)VERSIONMAP)
+# .ERRREMOVE is needed as a recipe line like "$(AWK) ... > $@" would create $@
+# even if the $(AWK) part fails:
+$(USE_SHL$(TNR)VERSIONMAP) .ERRREMOVE: $(SHL$(TNR)VERSIONMAP)
     @@-$(RM) -f $@
 # The following files will only be generated and needed on Mac OS X as temporary files
 # in order to generate exported symbols list out of Linux/Solaris map files
@@ -322,16 +320,20 @@ $(SHL$(TNR)TARGETN) : \
 .ENDIF			# "$(COM)"=="GCC"
 .ENDIF			# "$(SHL$(TNR)ALLRES)"!=""
 .IF "$(COM)"=="GCC"	# always have to call dlltool explicitly as ld cannot handle # comment in .def
-    @echo dlltool --input-def $(SHL$(TNR)DEF) \
-        --dllname $(SHL$(TNR)TARGET)$(DLLPOST) \
+    @echo dlltool --dllname $(SHL$(TNR)TARGET)$(DLLPOST) \
         --kill-at \\ > $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
     @noop $(assign ALL$(TNR)OBJLIST:=$(STDOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) $(shell $(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s?$(ROUT)?$(PRJ)/$(ROUT)?g))
 .IF "$(DEFLIB$(TNR)NAME)"!=""	# do not have to include objs
     @noop $(assign DEF$(TNR)OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g))
     @noop $(foreach,i,$(DEF$(TNR)OBJLIST) $(assign ALL$(TNR)OBJLIST:=$(ALL$(TNR)OBJLIST:s?$i??)))
 .ENDIF			# "$(DEFLIB$(TNR)NAME)"!=""
-    @echo	--output-exp $(MISC)/$(@:b)_exp.o \
-        $(ALL$(TNR)OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+    @echo	--output-exp $(MISC)/$(@:b)_exp.o \\ >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+.IF "$(SHL$(TNR)DEF)"!=""
+    @echo	--input-def $(SHL$(TNR)DEF) \\ >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+.ELSE
+    @echo	$(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) \\ >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
+.ENDIF
+    @echo	$(ALL$(TNR)OBJLIST) >> $(MISC)/$(TARGET).$(@:b)_$(TNR).cmd
     @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHL) $(MINGWSSTDOBJ) -o $@ \
         $(STDOBJ) $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)DESCRIPTIONOBJ) $(SHL$(TNR)OBJS) $(SHL$(TNR)LINKRESO) \
         `$(TYPE) /dev/null $(SHL$(TNR)LIBS) | $(SED) s\#$(ROUT)\#$(PRJ)/$(ROUT)\#g` \
diff --git a/solenv/inc/tg_slo.mk b/solenv/inc/tg_slo.mk
index 4b96f2ffc3e0..0a0ae789a8c7 100644
--- a/solenv/inc/tg_slo.mk
+++ b/solenv/inc/tg_slo.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_slo.mk,v $
-#
-# $Revision: 1.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
index 3d79bd932b00..347dd25569de 100644
--- a/solenv/inc/tg_srs.mk
+++ b/solenv/inc/tg_srs.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_srs.mk,v $
-#
-# $Revision: 1.26.164.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_wntx64.mk b/solenv/inc/tg_wntx64.mk
index 987b81276748..12e049763a84 100644
--- a/solenv/inc/tg_wntx64.mk
+++ b/solenv/inc/tg_wntx64.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_wntx64.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_yxx.mk b/solenv/inc/tg_yxx.mk
index c42420a08279..5dfb95e07eec 100644
--- a/solenv/inc/tg_yxx.mk
+++ b/solenv/inc/tg_yxx.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_yxx.mk,v $
-#
-# $Revision: 1.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/tg_zip.mk b/solenv/inc/tg_zip.mk
index bca8d00208dd..0a0364e02ab3 100644
--- a/solenv/inc/tg_zip.mk
+++ b/solenv/inc/tg_zip.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: tg_zip.mk,v $
-#
-# $Revision: 1.42 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/udkversion.mk b/solenv/inc/udkversion.mk
index 2e11029e6687..18fa3cf45d77 100644
--- a/solenv/inc/udkversion.mk
+++ b/solenv/inc/udkversion.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: udkversion.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 6c497dd9053e..7e12a9e2b225 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unitools.mk,v $
-#
-# $Revision: 1.53.30.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -176,7 +172,6 @@ MKDIRHIER*=mkdir$E -p
 RMDIR*=rmdir
 XARGS*=xargs
 GNUTAR*:=tar
-TAR*:=tar
 
 RM+=$(RMFLAGS)
 ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/adjustvisibility
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 8d465df9e03e..eb27b51a6e6d 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unx.mk,v $
-#
-# $Revision: 1.40 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxaixp.mk b/solenv/inc/unxaixp.mk
index 3590a3d8a936..571cee1053c6 100644
--- a/solenv/inc/unxaixp.mk
+++ b/solenv/inc/unxaixp.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxaixp.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxbsda.mk b/solenv/inc/unxbsda.mk
index 6e9fe1d9e7e4..fefaa1f02bd7 100644
--- a/solenv/inc/unxbsda.mk
+++ b/solenv/inc/unxbsda.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxbsda.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxbsdi.mk b/solenv/inc/unxbsdi.mk
index 44942a34f11d..5e9c06605940 100644
--- a/solenv/inc/unxbsdi.mk
+++ b/solenv/inc/unxbsdi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxbsdi.mk,v $
-#
-# $Revision: 1.17 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxbsdi2.mk b/solenv/inc/unxbsdi2.mk
index dd579f0caa9e..f4206304501b 100644
--- a/solenv/inc/unxbsdi2.mk
+++ b/solenv/inc/unxbsdi2.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxbsdi2.mk,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxbsds.mk b/solenv/inc/unxbsds.mk
index 698764f2801e..0811c85a4c6d 100644
--- a/solenv/inc/unxbsds.mk
+++ b/solenv/inc/unxbsds.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxbsds.mk,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk
index dbf23846b3e8..4a22beaec256 100644
--- a/solenv/inc/unxfbsd.mk
+++ b/solenv/inc/unxfbsd.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxfbsd.mk,v $
-#
-# $Revision: 1.10 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxfbsdi.mk b/solenv/inc/unxfbsdi.mk
index 98de991f0b0b..c1227a35f2d3 100644
--- a/solenv/inc/unxfbsdi.mk
+++ b/solenv/inc/unxfbsdi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxfbsdi.mk,v $
-#
-# $Revision: 1.26 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxfbsdx.mk b/solenv/inc/unxfbsdx.mk
index 62817d5604fc..4a8e120d318e 100644
--- a/solenv/inc/unxfbsdx.mk
+++ b/solenv/inc/unxfbsdx.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxfbsdx.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxhpgr.mk b/solenv/inc/unxhpgr.mk
index 9146457483c6..9ac0c7e3daf1 100644
--- a/solenv/inc/unxhpgr.mk
+++ b/solenv/inc/unxhpgr.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxhpgr.mk,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxhpxr.mk b/solenv/inc/unxhpxr.mk
index 00323aa0ed53..174d61fc2b4c 100644
--- a/solenv/inc/unxhpxr.mk
+++ b/solenv/inc/unxhpxr.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxhpxr.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index b6c8f798a5f9..b27afb8c1fa4 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngi6.mk,v $
-#
-# $Revision: 1.48 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlnga.mk b/solenv/inc/unxlnga.mk
index 2f18fe7b43c6..da5d2fcd3d38 100644
--- a/solenv/inc/unxlnga.mk
+++ b/solenv/inc/unxlnga.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlnga.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlnghppa.mk b/solenv/inc/unxlnghppa.mk
index 240eef609365..7ae2d25c332e 100644
--- a/solenv/inc/unxlnghppa.mk
+++ b/solenv/inc/unxlnghppa.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlnghppa.mk,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngi.mk b/solenv/inc/unxlngi.mk
index dcc2addcd46c..d86aab185d0e 100644
--- a/solenv/inc/unxlngi.mk
+++ b/solenv/inc/unxlngi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngi6.mk,v $
-#
-# $Revision: 1.48 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngm68k.mk b/solenv/inc/unxlngm68k.mk
index 25d5118839e4..da6ed55d8cfd 100644
--- a/solenv/inc/unxlngm68k.mk
+++ b/solenv/inc/unxlngm68k.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngm68k.mk,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngmips.mk b/solenv/inc/unxlngmips.mk
index c4510ecb5738..53c927d10b32 100644
--- a/solenv/inc/unxlngmips.mk
+++ b/solenv/inc/unxlngmips.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngmips.mk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngppc.mk b/solenv/inc/unxlngppc.mk
index 3a7a8058498c..408233539bf8 100644
--- a/solenv/inc/unxlngppc.mk
+++ b/solenv/inc/unxlngppc.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngppc4.mk,v $
-#
-# $Revision: 1.34 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngppc64.mk b/solenv/inc/unxlngppc64.mk
index 1fa6b8f30e90..7ce9f35c4ad8 100644
--- a/solenv/inc/unxlngppc64.mk
+++ b/solenv/inc/unxlngppc64.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngppc64.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngr.mk b/solenv/inc/unxlngr.mk
index b108888d190b..1bcbb6626219 100644
--- a/solenv/inc/unxlngr.mk
+++ b/solenv/inc/unxlngr.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngr.mk,v $
-#
-# $Revision: 1.20 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngs.mk b/solenv/inc/unxlngs.mk
index 1286179659ae..b4e6f5f58f4d 100644
--- a/solenv/inc/unxlngs.mk
+++ b/solenv/inc/unxlngs.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngs.mk,v $
-#
-# $Revision: 1.27 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngs390.mk b/solenv/inc/unxlngs390.mk
index 303542dc7619..47e2e37011e8 100644
--- a/solenv/inc/unxlngs390.mk
+++ b/solenv/inc/unxlngs390.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngs3904.mk,v $
-#
-# $Revision: 1.22 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngs390x.mk b/solenv/inc/unxlngs390x.mk
index 6a0dfab905c7..108e30b7337a 100644
--- a/solenv/inc/unxlngs390x.mk
+++ b/solenv/inc/unxlngs390x.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngs390x.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxlngx.mk b/solenv/inc/unxlngx.mk
index ba74a55cfdc3..1ced6c3912d0 100644
--- a/solenv/inc/unxlngx.mk
+++ b/solenv/inc/unxlngx.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxlngx6.mk,v $
-#
-# $Revision: 1.19.12.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index c5a1a9d29976..0a4010bc7803 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxmacx.mk,v $
-#
-# $Revision: 1.34.56.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -210,7 +206,7 @@ LINKFLAGSRUNPATH_OOO=-install_name '@___________________________________________
 LINKFLAGSRUNPATH_SDK=
 LINKFLAGSRUNPATH_BRAND=
 LINKFLAGSRUNPATH_OXT=
-LINKFLAGSRUNPATH_NONE=
+LINKFLAGSRUNPATH_NONE=-install_name '@__________________________________________________NONE/$(@:f)'
 LINKFLAGS=$(LINKFLAGSDEFS)
 
 # [ed] 5/14/02 If we're building for aqua, add in the objc runtime library into our link line
diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk
index 09d5d424b690..6a21022d4830 100644
--- a/solenv/inc/unxmacxi.mk
+++ b/solenv/inc/unxmacxi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxmacxi.mk,v $
-#
-# $Revision: 1.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxmacxp.mk b/solenv/inc/unxmacxp.mk
index f1336f12e543..28b2881962de 100644
--- a/solenv/inc/unxmacxp.mk
+++ b/solenv/inc/unxmacxp.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxmacxp.mk,v $
-#
-# $Revision: 1.59 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxscoi.mk b/solenv/inc/unxscoi.mk
index 486fcf02deb3..901fe7b2cb22 100644
--- a/solenv/inc/unxscoi.mk
+++ b/solenv/inc/unxscoi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxscoi.mk,v $
-#
-# $Revision: 1.12 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxsogi.mk b/solenv/inc/unxsogi.mk
index c4559e44c4f2..ce82fca29fa9 100644
--- a/solenv/inc/unxsogi.mk
+++ b/solenv/inc/unxsogi.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxsogi.mk,v $
-#
-# $Revision: 1.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxsogs.mk b/solenv/inc/unxsogs.mk
index 6b052c33f50b..dd0fb53272f8 100644
--- a/solenv/inc/unxsogs.mk
+++ b/solenv/inc/unxsogs.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxsogs.mk,v $
-#
-# $Revision: 1.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index c4c777376561..0f227f9520fc 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxsoli4.mk,v $
-#
-# $Revision: 1.48 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +29,6 @@
 ASM=/usr/ccs/bin/as
 AFLAGS=-P
 
-
 CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER)
 
 SOLAR_JAVA*=TRUE
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index 67bafa3a1c14..0bd85aa0bd4f 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxsols4.mk,v $
-#
-# $Revision: 1.53 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +30,6 @@ ASM=/usr/ccs/bin/as
 # needs -D__sparcv8plus because it's not defined by the assembler with -xarch=v8plus
 AFLAGS=-P -xarch=v8plus -D__sparcv8plus
 
-
 CDEFS+=-D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=$(STLPORT_VER)
 
 SOLAR_JAVA*=TRUE
diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk
index 02459ad91d5d..494ecb0478b3 100644
--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: unxsolu4.mk,v $
-#
-# $Revision: 1.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/verinfo.hrc b/solenv/inc/verinfo.hrc
index 58e98b3a1c6d..d0a585af90ee 100644
--- a/solenv/inc/verinfo.hrc
+++ b/solenv/inc/verinfo.hrc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: verinfo.hrc,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
index 048b59205e08..d4c205f942b9 100644
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -1,80 +1,80 @@
-/*************************************************************************

- *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

- * Copyright 2009 by Sun Microsystems, Inc.

- *

- * 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.

- *

- *************************************************************************/

-

-#define VERSION         3

-#define SUBVERSION      2

-//#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)

-// .0 + VER_CONCEPT

-// .100 + VER_ALPHA

-// .200 + VER_BETA

-// .300 + VER_GAMMA

-// .500 + VER_FINAL

-//#define VER_CONCEPT       0

-//#define VER_BETA      6

-#define VER_FINAL       0

-

-#define VER_DAY         1

-#define VER_MONTH       1

-#define VER_YEAR        2010

-

-#ifndef VER_FIRSTYEAR

-#define VER_FIRSTYEAR   VER_YEAR

-#endif

-

-#include "verinfo.hrc"

-

-#ifdef WIN32

-#define FOR_WIN_X " (32 Bit)"

-#else

-#define FOR_WIN_X ""

-#endif

-

-// -----------------------------------------------------------------------

-//              language/character set specification table

-// -----------------------------------------------------------------------

-

-RCD_LANGUAGE rcdata

-{

-#ifdef LG_D

-    "040704B0",     // Germany -> Unicode

-    "040704E4",     // Germany -> Windows, Multilingual

-#else

-    "040904B0",     // Germany -> Unicode

-    "040904E4",     // USA -> Windows, Multilingual

-#endif

-    "04090000",     // USA -> 7-Bit-ASCII

-    0               // end of table

-}

-

-

-// version binary entry

-VS_VERSION_INFO rcdata

-{

-    0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,

-    VERSION, SUBVERSION, VERVARIANT, VER_COUNT

-};

-

+/*************************************************************************
+ *
+ * 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.
+ *
+ *************************************************************************/
+
+#define VERSION         3
+#define SUBVERSION      2
+//#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
+// .0 + VER_CONCEPT
+// .100 + VER_ALPHA
+// .200 + VER_BETA
+// .300 + VER_GAMMA
+// .500 + VER_FINAL
+//#define VER_CONCEPT       0
+//#define VER_BETA      6
+#define VER_FINAL       0
+
+#define VER_DAY         1
+#define VER_MONTH       1
+#define VER_YEAR        2010
+
+#ifndef VER_FIRSTYEAR
+#define VER_FIRSTYEAR   VER_YEAR
+#endif
+
+#include "verinfo.hrc"
+
+#ifdef WIN32
+#define FOR_WIN_X " (32 Bit)"
+#else
+#define FOR_WIN_X ""
+#endif
+
+// -----------------------------------------------------------------------
+//              language/character set specification table
+// -----------------------------------------------------------------------
+
+RCD_LANGUAGE rcdata
+{
+#ifdef LG_D
+    "040704B0",     // Germany -> Unicode
+    "040704E4",     // Germany -> Windows, Multilingual
+#else
+    "040904B0",     // Germany -> Unicode
+    "040904E4",     // USA -> Windows, Multilingual
+#endif
+    "04090000",     // USA -> 7-Bit-ASCII
+    0               // end of table
+}
+
+
+// version binary entry
+VS_VERSION_INFO rcdata
+{
+    0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
+    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+};
+
diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
index 852af90168b0..70ea1c193ee6 100644
--- a/solenv/inc/version_so.hrc
+++ b/solenv/inc/version_so.hrc
@@ -1,79 +1,79 @@
-/*************************************************************************

- *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

- * Copyright 2009 by Sun Microsystems, Inc.

- *

- * 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.

- *

- *************************************************************************/

-

-#define VERSION         9

-#define SUBVERSION      2

-//#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)

-// .0 + VER_CONCEPT

-// .100 + VER_ALPHA

-// .200 + VER_BETA

-// .300 + VER_GAMMA

-// .500 + VER_FINAL

-//#define VER_CONCEPT       0

-//#define VER_BETA      6

-#define VER_FINAL       0

-

-#define VER_DAY         1

-#define VER_MONTH       1

-#define VER_YEAR        2010

-

-#ifndef VER_FIRSTYEAR

-#define VER_FIRSTYEAR   VER_YEAR

-#endif

-

-#include "verinfo.hrc"

-

-#ifdef WIN32

-#define FOR_WIN_X " (32 Bit)"

-#else

-#define FOR_WIN_X ""

-#endif

-

-// -----------------------------------------------------------------------

-//              language/character set specification table

-// -----------------------------------------------------------------------

-

-RCD_LANGUAGE rcdata

-{

-#ifdef LG_D

-    "040704B0",     // Germany -> Unicode

-    "040704E4",     // Germany -> Windows, Multilingual

-#else

-    "040904B0",     // Germany -> Unicode

-    "040904E4",     // USA -> Windows, Multilingual

-#endif

-    "04090000",     // USA -> 7-Bit-ASCII

-    0               // end of table

-}

-

-// version binary entry

-VS_VERSION_INFO rcdata

-{

-    0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,

-    VERSION, SUBVERSION, VERVARIANT, VER_COUNT

-};

-

+/*************************************************************************
+ *
+ * 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.
+ *
+ *************************************************************************/
+
+#define VERSION         9
+#define SUBVERSION      2
+//#define VERVARIANT    0 // never define this one, will be provided by build environment (BUILD_ID)
+// .0 + VER_CONCEPT
+// .100 + VER_ALPHA
+// .200 + VER_BETA
+// .300 + VER_GAMMA
+// .500 + VER_FINAL
+//#define VER_CONCEPT       0
+//#define VER_BETA      6
+#define VER_FINAL       0
+
+#define VER_DAY         1
+#define VER_MONTH       1
+#define VER_YEAR        2010
+
+#ifndef VER_FIRSTYEAR
+#define VER_FIRSTYEAR   VER_YEAR
+#endif
+
+#include "verinfo.hrc"
+
+#ifdef WIN32
+#define FOR_WIN_X " (32 Bit)"
+#else
+#define FOR_WIN_X ""
+#endif
+
+// -----------------------------------------------------------------------
+//              language/character set specification table
+// -----------------------------------------------------------------------
+
+RCD_LANGUAGE rcdata
+{
+#ifdef LG_D
+    "040704B0",     // Germany -> Unicode
+    "040704E4",     // Germany -> Windows, Multilingual
+#else
+    "040904B0",     // Germany -> Unicode
+    "040904E4",     // USA -> Windows, Multilingual
+#endif
+    "04090000",     // USA -> 7-Bit-ASCII
+    0               // end of table
+}
+
+// version binary entry
+VS_VERSION_INFO rcdata
+{
+    0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
+    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+};
+
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk
index e516b5e44bc1..f369bd15ad30 100644
--- a/solenv/inc/wnt.mk
+++ b/solenv/inc/wnt.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: wnt.mk,v $
-#
-# $Revision: 1.84 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index b45b659d5f84..abb2bb25e34d 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: wntgcci6.mk,v $
-#
-# $Revision: 1.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -81,7 +77,7 @@ CFLAGSNOOPT=-O0
 # Compiler flags for describing the output path
 CFLAGSOUTOBJ=-o
 #plattform hart setzen
-CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_IE=0x500 -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED
+CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_WINNT=0x500 -D_WIN32_IE=0x500 -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED -D_MSC_EXTENSIONS -D_FORCENAMELESSUNION
 .IF  "$(DYNAMIC_CRT)"!=""
 CDEFS+=-D_DLL
 .ENDIF
@@ -218,3 +214,4 @@ UNICOWSLIB=$(PSDK_HOME)$/lib$/unicows.lib
 WININETLIB=-lwininet
 OLDNAMESLIB=-lmoldname
 MSIMG32LIB=$(PSDK_HOME)$/lib$/msimg32.lib
+PROPSYSLIB=-lpropsys
diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk
index 09ec567fbd62..6ed8327c8506 100644
--- a/solenv/inc/wntmsci10.mk
+++ b/solenv/inc/wntmsci10.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: wntmsci10.mk,v $
-#
-# $Revision: 1.44 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -213,8 +209,7 @@ MODULES_WITH_WARNINGS := \
     lingucomponent \
     soldep
 
-CDEFS+=-DSTLPORT_VERSION=$(STLPORT_VER) -DWINVER=0x400 -D_WIN32_IE=0x400
-CDEFS+=-D_MT
+CDEFS+=-DSTLPORT_VERSION=$(STLPORT_VER) -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
 
 COMMENTFLAG=/COMMENT:"$(PRJNAME)_$(UPD)_$(VCSID)_"
 
diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
index 3d2750fd2dc6..b270a6a25cfe 100644
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsci11.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: wntmsci11.mk,v $
-#
-# $Revision: 1.25 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -75,6 +71,11 @@ CXX+= /NMttNoLines
 NOLOGO*=-nologo
 .ENDIF
 
+.IF "$(VERBOSE)" != "TRUE"
+COMPILE_ECHO_SWITCH=-n
+COMPILE_ECHO_FILE=
+.ENDIF
+
 # Flags for COMEX == 11
 
 # disable "warning C4675: resolved overload was found by argument-dependent
@@ -218,12 +219,10 @@ CFLAGSWERRCC=-WX
 MODULES_WITH_WARNINGS := \
     soldep
 
-CDEFS+=-DSTLPORT_VERSION=400 -D_MT
+CDEFS+=-DSTLPORT_VERSION=400 -D_MT -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0500
 .IF "$(COMEX)" == "11"
-CDEFS+=-DWINVER=0x0400 -D_WIN32_IE=0x0400
 _VC_MANIFEST_BASENAME=__VC80
 .ELSE
-CDEFS+=-DWINVER=0x0500 -D_WIN32_IE=0x0500
 _VC_MANIFEST_BASENAME=__VC90
 .ENDIF
 
@@ -375,4 +374,5 @@ UNICOWSLIB=unicows.lib
 WININETLIB=wininet.lib
 OLDNAMESLIB=oldnames.lib
 MSIMG32LIB=msimg32.lib
+PROPSYSLIB=propsys.lib
 
diff --git a/solenv/makefile.mk b/solenv/makefile.mk
index 85823378e245..31bed765ac7f 100644
--- a/solenv/makefile.mk
+++ b/solenv/makefile.mk
@@ -1,15 +1,11 @@
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2008 by Sun Microsystems, Inc.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/solenv/src/version.c b/solenv/src/version.c
index dd37580f758c..b06b1510f300 100644
--- a/solenv/src/version.c
+++ b/solenv/src/version.c
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: version.c,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify