From 66f3cc020560c74e8a2df8a9d5ac3f9a5cabce63 Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Wed, 28 Apr 2010 12:49:32 +0200
Subject: #162096# take SOLARSRC as default repository when there is no valid
 hg repository

---
 solenv/bin/modules/SourceConfig.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index 9379b7764d0a..2be650713513 100644
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -248,7 +248,7 @@ sub get_config_file {
     return '';
 };
 
-sub get_hg_root {
+sub get_repository_root {
     my $self = shift;
     return $self->{USER_SOURCE_ROOT} if (defined $self->{USER_SOURCE_ROOT});
     my $hg_root;
@@ -265,13 +265,14 @@ sub get_hg_root {
             return $hg_root;
         };
     };
-    croak('Cannot open find source_config and/or determine hg root directory for ' . cwd());
+    Carp::cluck('Cannot open/find source_config and/or determine hg root directory for ' . cwd() . ". Taking $ENV{SOLARSRC} as default repository\n\n");
+    return $ENV{SOLARSRC};
 };
 
 sub read_config_file {
     my $self = shift;
     if (!$self->{SOURCE_CONFIG_FILE}) {
-        my $repository_root = get_hg_root($self);
+        my $repository_root = get_repository_root($self);
         ${$self->{REPOSITORIES}}{File::Basename::basename($repository_root)} = $repository_root;
         return;
     };
@@ -324,7 +325,7 @@ sub read_config_file {
         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);
+            my $hg_root = get_repository_root($self);
             ${$self->{REPOSITORIES}}{File::Basename::basename($hg_root)} = $hg_root;
         };
     } else {
-- 
cgit 


From 60458a1093d335264a11838bd4d0fa595e54924e Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Thu, 29 Apr 2010 14:47:52 +0200
Subject: #i111237# manipulate with source_config from the module parent
 directory

---
 solenv/bin/build.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 442dcba26946..6430cf33c755 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -342,7 +342,7 @@ sub rename_file {
 };
 
 sub generate_config_file {
-    my $source_config = SourceConfig->new();
+    my $source_config = SourceConfig->new($StandDir);
     $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);
@@ -2289,7 +2289,7 @@ sub prepare_incompatible_build {
     %add_to_config = %$deps_hash;
     if ($prepare) {
         if ((!defined $ENV{UPDATER}) || (defined $ENV{CWS_WORK_STAMP})) {
-            SourceConfig->new()->add_active_modules([keys %add_to_config], 0);
+            SourceConfig->new($StandDir)->add_active_modules([keys %add_to_config], 0);
         }
         clear_delivered();
     }
-- 
cgit 


From cd3128953c0d364ee6a70ea9ab860d778a509c3e Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Thu, 29 Apr 2010 16:14:28 +0200
Subject: #i111239# write html status file in the parent directory of the
 workspace modules

---
 solenv/bin/build.pl                | 10 +++++++---
 solenv/bin/modules/SourceConfig.pm |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 6430cf33c755..b56745402c5d 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -167,8 +167,8 @@
     $html_last_updated = 0;
     %jobs_hash = ();
     $html_path = undef;
-    $html_file = CorrectPath($ENV{SOLARSRC} . '/' . $ENV{INPATH}. '.build.html');
     $build_finished = 0;
+    $html_file = '';
     %had_error = (); # hack for misteriuos windows problems - try run dmake 2 times if first time there was an error
     $mkout = CorrectPath("$ENV{SOLARENV}/bin/mkout.pl");
     %weights_hash = (); # hash contains info about how many modules are dependent from one module
@@ -209,7 +209,6 @@
 
     get_options();
 
-    $html_file = CorrectPath($html_path . '/' . $ENV{INPATH}. '.build.html') if (defined $html_path);
 #    my $temp_html_file = CorrectPath($tmp_dir. '/' . $ENV{INPATH}. '.build.html');
     get_build_modes();
     %deliver_env = ();
@@ -225,12 +224,17 @@
         $deliver_env{'OUTPATH'}++;
         $deliver_env{'L10N_framework'}++;
     };
+    $StandDir = get_stand_dir();   # This also sets $initial_module
+    if (defined $html_path) {
+        $html_file = CorrectPath($html_path . '/' . $ENV{INPATH}. '.build.html');
+    } else {
+        $html_file = CorrectPath($ENV{SOLARSRC} . '/../' . $ENV{INPATH}. '.build.html');
+    };
 
     if ($generate_config && ($clear_config || (scalar keys %remove_from_config)||(scalar keys %add_to_config))) {
         generate_config_file();
         exit 0;
     }
-    $StandDir = get_stand_dir();   # This also sets $initial_module
     get_module_and_buildlist_paths();
     provide_consistency() if (defined $ENV{CWS_WORK_STAMP} && defined($ENV{COMMON_ENV_TOOLS}));
 
diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index 2be650713513..0bf4e7a1508d 100644
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -75,8 +75,9 @@ sub new {
             $source_root .= '/..';
         }
     } else {
-        $source_root = Cwd::realpath($ENV{SOURCE_ROOT_DIR});
+        $source_root = $ENV{SOURCE_ROOT_DIR};
     };
+    $source_root = Cwd::realpath($source_root);
     $self->{SOURCE_ROOT} = $source_root;
     $self->{DEBUG} = 0;
     $self->{VERBOSE} = 0;
-- 
cgit 


From 301f697cd5b80a31e4abb0210da4e206e4f62479 Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Thu, 29 Apr 2010 17:30:28 +0200
Subject: #i111239# fixed dmake log file path for html page

---
 solenv/bin/build.pl | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index b56745402c5d..85a1ebdd76a4 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -225,10 +225,11 @@
         $deliver_env{'L10N_framework'}++;
     };
     $StandDir = get_stand_dir();   # This also sets $initial_module
+    $source_config = SourceConfig -> new($StandDir);
     if (defined $html_path) {
         $html_file = CorrectPath($html_path . '/' . $ENV{INPATH}. '.build.html');
     } else {
-        $html_file = CorrectPath($ENV{SOLARSRC} . '/../' . $ENV{INPATH}. '.build.html');
+        $html_file = CorrectPath($StandDir . '/../' . $ENV{INPATH}. '.build.html');
     };
 
     if ($generate_config && ($clear_config || (scalar keys %remove_from_config)||(scalar keys %add_to_config))) {
@@ -346,7 +347,6 @@ sub rename_file {
 };
 
 sub generate_config_file {
-    my $source_config = SourceConfig->new($StandDir);
     $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);
@@ -1240,7 +1240,7 @@ sub check_deps_hash {
                     $jobs_hash{$key} = {    SHORT_NAME => $string,
                                             BUILD_NUMBER => $build_number,
                                             STATUS => 'waiting',
-                                            LOG_PATH => $module . "/$ENV{INPATH}/misc/logs/$log_name",
+                                            LOG_PATH => $source_config->get_module_repository($module) . "/$module/$ENV{INPATH}/misc/logs/$log_name",
                                             LONG_LOG_PATH => CorrectPath($module_paths{$module} . "/$ENV{INPATH}/misc/logs/$log_name"),
                                             START_TIME => 0,
                                             FINISH_TIME => 0,
@@ -1597,7 +1597,6 @@ sub get_options {
 
 sub get_module_and_buildlist_paths {
     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;
@@ -2293,7 +2292,7 @@ sub prepare_incompatible_build {
     %add_to_config = %$deps_hash;
     if ($prepare) {
         if ((!defined $ENV{UPDATER}) || (defined $ENV{CWS_WORK_STAMP})) {
-            SourceConfig->new($StandDir)->add_active_modules([keys %add_to_config], 0);
+            $source_config->add_active_modules([keys %add_to_config], 0);
         }
         clear_delivered();
     }
-- 
cgit 


From 0b404429eb845a847c2100ee781cbbee67b881b0 Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Mon, 3 May 2010 10:15:53 +0200
Subject: corrected error message for --all and multiprocessing builds

---
 solenv/bin/build.pl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'solenv')

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 85a1ebdd76a4..1233f24ffe6f 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1655,7 +1655,13 @@ sub cancel_build {
             $message_part .= "--from @broken_modules_names\n";
         };
     } else {
-        $message_part .= "--all:@broken_modules_names\n";
+        if ($processes_to_run) {
+            $message_part .= "--from ";
+        } else {
+            $message_part .= "--all:";
+        };
+        $message_part .= "@broken_modules_names\n";
+
     };
     if ($broken_modules_number && $build_all_parents) {
         print "\n";
-- 
cgit 


From 8362cbced7e63906939831b74ea580cda5e91ebc Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Wed, 12 May 2010 17:11:57 +0200
Subject: #i109602# introduced new switch exclude_branch_from

---
 solenv/bin/build.pl | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 1233f24ffe6f..159e00c7c7d3 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -139,6 +139,7 @@
     $html = '';
     @ignored_errors = ();
     %incompatibles = ();
+    %exclude_branches = ();
     $only_platform = ''; # the only platform to prepare
     $only_common = ''; # the only common output tree to delete when preparing
     %build_modes = ();
@@ -566,17 +567,31 @@ sub get_parent_deps {
     my @unresolved_parents = get_parents_array($prj_dir);
     $parents_deps_hash{$_}++ foreach (@unresolved_parents);
     $$deps_hash{$prj_dir} = \%parents_deps_hash;
+    my %skipped_branches = ();
     while ($module = pop(@unresolved_parents)) {
+        if (defined $exclude_branches{$module}) {
+            $skipped_branches{$module}++;
+            next;
+        };
         my %parents_deps_hash = ();
-        $parents_deps_hash{$_}++ foreach (get_parents_array($module));
+        foreach (get_parents_array($module)) {
+            if (defined $exclude_branches{$_}) {
+                $skipped_branches{$_}++;
+                next;
+            };
+            $parents_deps_hash{$_}++;
+        }
         $$deps_hash{$module} = \%parents_deps_hash;
         foreach $Parent (keys %parents_deps_hash) {
-            if (!defined($$deps_hash{$Parent})) {
+            if (!defined($$deps_hash{$Parent}) && (!defined $exclude_branches{$module})) {
                 push (@unresolved_parents, $Parent);
             };
         };
     };
     check_deps_hash($deps_hash);
+    foreach (keys %skipped_branches) {
+        print $echo . "Skipping module's $_ branch\n";
+    };
 };
 
 sub store_weights {
@@ -1396,7 +1411,7 @@ sub print_error {
 
 sub usage {
     print STDERR "\nbuild\n";
-    print STDERR "Syntax:    build    [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2] [prj_name3 [...]]]|[--since|-c prj_name] [--with_branches|-b]|[--prepare|-p][:platform] [--deliver|-d [--dlv_switch deliver_switch]]] [-P processes|--server [--setenvstring \"string\"] [--client_timeout MIN] [--port port1[:port2:...:portN]]] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V] [--mode|-m OOo[,SO[,EXT]] [--html [--html_path html_file_path] [--dontgraboutput]] [--pre_job=pre_job_sring] [--job=job_string|-j] [--post_job=post_job_sring] [--stoponerror] [--genconf [--removeall|--clear|--remove|--add [module1,module2[,...,moduleN]]]] [--interactive]\n";
+    print STDERR "Syntax:    build    [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2] [prj_name3 [...]]]|[--since|-c prj_name] [--with_branches|-b]|[--prepare|-p][:platform] [--deliver|-d [--dlv_switch deliver_switch]]] [-P processes|--server [--setenvstring \"string\"] [--client_timeout MIN] [--port port1[:port2:...:portN]]] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V] [--mode|-m OOo[,SO[,EXT]] [--html [--html_path html_file_path] [--dontgraboutput]] [--pre_job=pre_job_sring] [--job=job_string|-j] [--post_job=post_job_sring] [--stoponerror] [--genconf [--removeall|--clear|--remove|--add [module1,module2[,...,moduleN]]]] [--exclude_branch_from prj_name1[:prj_name2] [prj_name3 [...]]] [--interactive]\n";
     print STDERR "Example1:    build --from sfx2\n";
     print STDERR "                     - build all projects dependent from sfx2, starting with sfx2, finishing with the current module\n";
     print STDERR "Example2:    build --all:sfx2\n";
@@ -1409,6 +1424,7 @@ sub usage {
     print STDERR "\nSwitches:\n";
     print STDERR "        --all        - build all projects from very beginning till current one\n";
     print STDERR "        --from       - build all projects dependent from the specified (including it) till current one\n";
+    print STDERR "        --exclude_branch_from    - exclude module(s) and its branch from the build\n";
     print STDERR "        --mode OOo   - build only projects needed for OpenOffice.org\n";
     print STDERR "        --prepare    - clear all projects for incompatible build from prj_name till current one [for platform] (cws version)\n";
     print STDERR "        --with_branches- build all projects in neighbour branches and current branch starting from actual project\n";
@@ -1478,7 +1494,11 @@ sub get_options {
                                 and $build_all_cont = $1            and next;
         if ($arg =~ /^--from$/ || $arg =~ /^-f$/) {
                                     $build_all_parents = 1;
-                                    get_incomp_projects();
+                                    get_modules_passed(\%incompatibles);
+                                    next;
+        };
+        if ($arg =~ /^--exclude_branch_from$/) {
+                                    get_modules_passed(\%exclude_branches);
                                     next;
         };
         $arg =~ /^--prepare$/    and $prepare = 1 and next;
@@ -2279,7 +2299,6 @@ sub prepare_incompatible_build {
         if (!defined $$deps_hash{$module}) {
             print_error("The module $initial_module is independent from $module\n");
         }
-        delete $incompatibles{$module};
         $incompatibles{$module} = $$deps_hash{$module};
         delete $$deps_hash{$module};
     }
@@ -2423,7 +2442,8 @@ sub get_list_of_modules {
 #    };
 };
 
-sub get_incomp_projects {
+sub get_modules_passed {
+    my $hash_ref = shift;
     my $option = '';
     while ($option = shift @ARGV) {
         if ($option =~ /^-+/) {
@@ -2435,7 +2455,7 @@ sub get_incomp_projects {
                 print_error("\'--from\' switch collision") if ($build_all_cont);
                 $build_all_cont = $';
             };
-            $incompatibles{$option}++;
+            $$hash_ref{$option}++;
         };
     };
 };
-- 
cgit 


From fa35aefa9a0d93c37653e6db76076a758e5ebcf3 Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Wed, 12 May 2010 17:23:48 +0200
Subject: #i10000# do not write source_config if defined UPDATER in non-cws
 environment

---
 solenv/bin/build.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'solenv')

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 159e00c7c7d3..acc8f69d6614 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -2316,7 +2316,7 @@ sub prepare_incompatible_build {
     @modules_built = keys %$deps_hash;
     %add_to_config = %$deps_hash;
     if ($prepare) {
-        if ((!defined $ENV{UPDATER}) || (defined $ENV{CWS_WORK_STAMP})) {
+        if ((!(defined $ENV{UPDATER} && (!defined $ENV{CWS_WORK_STAMP}))) || (defined $ENV{CWS_WORK_STAMP})) {
             $source_config->add_active_modules([keys %add_to_config], 0);
         }
         clear_delivered();
-- 
cgit 


From a67693196fa1efba50bcebf2019e2d3e256870a2 Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Wed, 26 May 2010 14:04:33 +0200
Subject: #i111239# put html page in the log directory

---
 solenv/bin/build.pl | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index acc8f69d6614..a37edfa3d074 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -227,10 +227,18 @@
     };
     $StandDir = get_stand_dir();   # This also sets $initial_module
     $source_config = SourceConfig -> new($StandDir);
-    if (defined $html_path) {
-        $html_file = CorrectPath($html_path . '/' . $ENV{INPATH}. '.build.html');
-    } else {
-        $html_file = CorrectPath($StandDir . '/../' . $ENV{INPATH}. '.build.html');
+
+    if ($html) {
+        if (defined $html_path) {
+            $html_file = CorrectPath($html_path . '/' . $ENV{INPATH}. '.build.html');
+        } else {
+            my $log_directory = Cwd::realpath(CorrectPath($StandDir . '/../log'));
+            if ((!-d $log_directory) && (!mkdir($log_directory))) {
+                print_error("Cannot create $log_directory for writing html file\n");
+            };
+            $html_file = $log_directory . '/' . $ENV{INPATH}. '.build.html';
+            print "\nPath to html status page: $html_file\n";
+        };
     };
 
     if ($generate_config && ($clear_config || (scalar keys %remove_from_config)||(scalar keys %add_to_config))) {
@@ -1255,7 +1263,7 @@ sub check_deps_hash {
                     $jobs_hash{$key} = {    SHORT_NAME => $string,
                                             BUILD_NUMBER => $build_number,
                                             STATUS => 'waiting',
-                                            LOG_PATH => $source_config->get_module_repository($module) . "/$module/$ENV{INPATH}/misc/logs/$log_name",
+                                            LOG_PATH => '../' . $source_config->get_module_repository($module) . "/$module/$ENV{INPATH}/misc/logs/$log_name",
                                             LONG_LOG_PATH => CorrectPath($module_paths{$module} . "/$ENV{INPATH}/misc/logs/$log_name"),
                                             START_TIME => 0,
                                             FINISH_TIME => 0,
-- 
cgit 


From 336bc45f08a1780316c34209056307e712809671 Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Wed, 26 May 2010 17:53:22 +0200
Subject: vgbugs10: #i109602# removed unexpected sideeffect

---
 solenv/bin/build.pl | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index a37edfa3d074..495583fa1f06 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -569,14 +569,11 @@ sub get_build_list_path {
 # Get dependencies hash of the current and all parent projects
 #
 sub get_parent_deps {
-    my (%parents_deps_hash, $module, $parent);
     my $prj_dir = shift;
     my $deps_hash = shift;
-    my @unresolved_parents = get_parents_array($prj_dir);
-    $parents_deps_hash{$_}++ foreach (@unresolved_parents);
-    $$deps_hash{$prj_dir} = \%parents_deps_hash;
+    my @unresolved_parents = ($prj_dir);
     my %skipped_branches = ();
-    while ($module = pop(@unresolved_parents)) {
+    while (my $module = pop(@unresolved_parents)) {
         if (defined $exclude_branches{$module}) {
             $skipped_branches{$module}++;
             next;
-- 
cgit 


From 32de849ec0d285772b4be28ffd53bdc9cf6d905d Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Tue, 1 Jun 2010 15:00:01 +0200
Subject: vgbugs10: #i109602# rework concept to meet real bug requirements

---
 solenv/bin/build.pl | 89 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 51 insertions(+), 38 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 495583fa1f06..ab1167ddc65e 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -139,6 +139,7 @@
     $html = '';
     @ignored_errors = ();
     %incompatibles = ();
+    %skip_modules = ();
     %exclude_branches = ();
     $only_platform = ''; # the only platform to prepare
     $only_common = ''; # the only common output tree to delete when preparing
@@ -574,10 +575,7 @@ sub get_parent_deps {
     my @unresolved_parents = ($prj_dir);
     my %skipped_branches = ();
     while (my $module = pop(@unresolved_parents)) {
-        if (defined $exclude_branches{$module}) {
-            $skipped_branches{$module}++;
-            next;
-        };
+        next if (defined $$deps_hash{$module});
         my %parents_deps_hash = ();
         foreach (get_parents_array($module)) {
             if (defined $exclude_branches{$_}) {
@@ -596,6 +594,11 @@ sub get_parent_deps {
     check_deps_hash($deps_hash);
     foreach (keys %skipped_branches) {
         print $echo . "Skipping module's $_ branch\n";
+        delete $exclude_branches{$_};
+    };
+    my @missing_branches = keys %exclude_branches;
+    if (scalar @missing_branches) {
+        print_error("For $prj_dir branche(s): \"@missing_branches\" not found\n");
     };
 };
 
@@ -629,18 +632,18 @@ sub expand_dependencies {
 };
 
 #
-# This procedure fills out the %reversed_dependencies hash,
-# the hash contaninig the info about modules "waiting" for the module
+# This procedure fills the second hash with reversed dependencies,
+# ie, with info about modules "waiting" for the module
 #
 sub reverse_dependensies {
-    my $deps_hash = shift;
+    my ($deps_hash, $reversed) = @_;
     foreach my $module (keys %$deps_hash) {
         foreach (keys %{$$deps_hash{$module}}) {
-            if (defined $reversed_dependencies{$_}) {
-                ${$reversed_dependencies{$_}}{$module}++
+            if (defined $$reversed{$_}) {
+                ${$$reversed{$_}}{$module}++
             } else {
                 my %single_module_dep_hash = ($module => 1);
-                $reversed_dependencies{$_} = \%single_module_dep_hash;
+                $$reversed{$_} = \%single_module_dep_hash;
             };
         };
     };
@@ -659,8 +662,12 @@ sub build_all {
         };
         modules_classify(keys %global_deps_hash);
         expand_dependencies (\%global_deps_hash);
-#        prepare_build_from(\%global_deps_hash) if (scalar keys %incompatibles);
-        prepare_incompatible_build(\%global_deps_hash) if ($incompatible);
+        prepare_incompatible_build(\%global_deps_hash) if ($incompatible && (!$build_from_with_branches));
+        if ($build_from_with_branches) {
+            my %reversed_full_deps_hash = ();
+            reverse_dependensies(\%global_deps_hash, \%reversed_full_deps_hash);
+            prepare_build_from_with_branches(\%global_deps_hash, \%reversed_full_deps_hash);
+        }
         if ($build_all_cont || $build_since) {
             prepare_build_all_cont(\%global_deps_hash);
         };
@@ -677,13 +684,13 @@ 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) {
+        foreach my $module (keys %dead_parents, keys %skip_modules) {
             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);
-        reverse_dependensies(\%global_deps_hash_backup);
+        reverse_dependensies(\%global_deps_hash_backup, \%reversed_dependencies);
         $modules_number = scalar keys %global_deps_hash;
         initialize_html_info($_) foreach (keys %global_deps_hash);
         if ($processes_to_run) {
@@ -1416,7 +1423,7 @@ sub print_error {
 
 sub usage {
     print STDERR "\nbuild\n";
-    print STDERR "Syntax:    build    [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2] [prj_name3 [...]]]|[--since|-c prj_name] [--with_branches|-b]|[--prepare|-p][:platform] [--deliver|-d [--dlv_switch deliver_switch]]] [-P processes|--server [--setenvstring \"string\"] [--client_timeout MIN] [--port port1[:port2:...:portN]]] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V] [--mode|-m OOo[,SO[,EXT]] [--html [--html_path html_file_path] [--dontgraboutput]] [--pre_job=pre_job_sring] [--job=job_string|-j] [--post_job=post_job_sring] [--stoponerror] [--genconf [--removeall|--clear|--remove|--add [module1,module2[,...,moduleN]]]] [--exclude_branch_from prj_name1[:prj_name2] [prj_name3 [...]]] [--interactive]\n";
+    print STDERR "Syntax:    build    [--all|-a[:prj_name]]|[--from|-f prj_name1[:prj_name2] [prj_name3 [...]]]|[--since|-c prj_name] [--with_branches prj_name1[:prj_name2] [--skip prj_name1[:prj_name2] [prj_name3 [...]] [prj_name3 [...]|-b]|[--prepare|-p][:platform] [--deliver|-d [--dlv_switch deliver_switch]]] [-P processes|--server [--setenvstring \"string\"] [--client_timeout MIN] [--port port1[:port2:...:portN]]] [--show|-s] [--help|-h] [--file|-F] [--ignore|-i] [--version|-V] [--mode|-m OOo[,SO[,EXT]] [--html [--html_path html_file_path] [--dontgraboutput]] [--pre_job=pre_job_sring] [--job=job_string|-j] [--post_job=post_job_sring] [--stoponerror] [--genconf [--removeall|--clear|--remove|--add [module1,module2[,...,moduleN]]]] [--exclude_branch_from prj_name1[:prj_name2] [prj_name3 [...]]] [--interactive]\n";
     print STDERR "Example1:    build --from sfx2\n";
     print STDERR "                     - build all projects dependent from sfx2, starting with sfx2, finishing with the current module\n";
     print STDERR "Example2:    build --all:sfx2\n";
@@ -1432,7 +1439,8 @@ sub usage {
     print STDERR "        --exclude_branch_from    - exclude module(s) and its branch from the build\n";
     print STDERR "        --mode OOo   - build only projects needed for OpenOffice.org\n";
     print STDERR "        --prepare    - clear all projects for incompatible build from prj_name till current one [for platform] (cws version)\n";
-    print STDERR "        --with_branches- build all projects in neighbour branches and current branch starting from actual project\n";
+    print STDERR "        --with_branches- the same as \"--from\" but with build all projects in neighbour branches\n";
+    print STDERR "        --skip       - do not build certain module(s)\n";
     print STDERR "        --since      - build all projects beginning from the specified till current one (the same as \"--all:prj_name\", but skipping prj_name)\n";
     print STDERR "        --checkmodules      - check if all required parent projects are availlable\n";
     print STDERR "        --show       - show what is going to be built\n";
@@ -1487,12 +1495,14 @@ sub get_options {
         $arg =~ /^--dlv_switch$/    and $dlv_switch = shift @ARGV    and next;
         $arg =~ /^--file$/        and $cmd_file = shift @ARGV             and next;
         $arg =~ /^-F$/        and $cmd_file = shift @ARGV             and next;
+        $arg =~ /^--skip$/    and get_modules_passed(\%skip_modules)      and next;
 
-        $arg =~ /^--with_branches$/        and $build_all_parents = 1
-                                and $build_from_with_branches = shift @ARGV         and next;
-        $arg =~ /^-b$/        and $build_all_parents = 1
-                                and $build_from_with_branches = shift @ARGV         and next;
-
+        if ($arg =~ /^--with_branches$/ || $arg =~ /^-b$/) {
+                                    $build_from_with_branches = 1;
+                                    $build_all_parents = 1;
+                                    get_modules_passed(\%incompatibles);
+                                    next;
+        };
         $arg =~ /^--all:(\S+)$/ and $build_all_parents = 1
                                 and $build_all_cont = $1            and next;
         $arg =~ /^-a:(\S+)$/ and $build_all_parents = 1
@@ -1556,8 +1566,12 @@ sub get_options {
         print_error("\"--html_path\" switch is used only with \"--html\"") if ($html_path);
         print_error("\"--dontgraboutput\" switch is used only with \"--html\"") if ($dont_grab_output);
     };
+    if ((scalar keys %exclude_branches) && !$build_all_parents) {
+        print_error("\"--exclude_branch_from\" is not applicable for one module builds!!");
+    };
     $grab_output = 0 if ($dont_grab_output);
     print_error('Switches --with_branches and --all collision') if ($build_from_with_branches && $build_all_cont);
+    print_error('Switch --skip is for building multiple modules only!!') if (!$build_all_parents);
 #    print_error('Please prepare the workspace on one of UNIX platforms') if ($prepare && ($ENV{GUI} ne 'UNX'));
     print_error('Switches --with_branches and --since collision') if ($build_from_with_branches && $build_since);
     if ($show) {
@@ -2143,12 +2157,12 @@ sub modules_classify {
 
 #
 # This procedure provides consistency for cws
-# and optimized build (ie in case of -with_branches, -all:prj_name
+# and optimized build (ie in case of --with_branches, -all:prj_name
 # and -since switches)
 #
 sub provide_consistency {
     check_dir();
-    foreach $var_ref (\$build_from_with_branches, \$build_all_cont, \$build_since) {
+    foreach $var_ref (\$build_all_cont, \$build_since) {
         if ($$var_ref) {
             return if (defined $module_paths{$$var_ref});
             print_error("Cannot find module '$$var_ref'", 9);
@@ -2293,6 +2307,20 @@ sub fix_permissions {
      chmod '0664', $file;
 };
 
+sub prepare_build_from_with_branches {
+    ($full_deps_hash, $reversed_full_deps_hash) = @_;
+    foreach my $prerequisite (keys %$full_deps_hash) {
+        foreach my $dependent_module (keys %incompatibles) {
+            if (defined ${$$reversed_full_deps_hash{$prerequisite}}{$dependent_module}) {
+                remove_from_dependencies($prerequisite, $full_deps_hash);
+                delete $$full_deps_hash{$prerequisite};
+#                print "Removed $prerequisite\n";
+                last;
+            };
+        };
+    };
+};
+
 #
 # Removes projects which it is not necessary to build
 # in incompatible build
@@ -2365,21 +2393,6 @@ sub prepare_incompatible_build {
     do_exit(0) if ($prepare);
 };
 
-#
-# 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};
-#        remove_from_dependencies($prj, $deps_hash);
-#    };
-#};
-
 #
 # Removes projects which it is not necessary to build
 # with --all:prj_name or --since switch
-- 
cgit 


From 79efb54f42ba554996ba0da77cf2c2e8567c963a Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Fri, 11 Jun 2010 14:33:56 +0200
Subject: vgbugs10: moved repository detection to the new module
 RepositoryHelper

---
 solenv/bin/build.pl | 67 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 39 insertions(+), 28 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index ab1167ddc65e..445b33b37b1e 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -45,6 +45,7 @@
 
     use lib ("$ENV{SOLARENV}/bin/modules");
     use SourceConfig;
+    use RepositoryHelper;
 
     my $in_so_env = 0;
     if (defined $ENV{COMMON_ENV_TOOLS}) {
@@ -1141,34 +1142,44 @@ sub get_stand_dir {
         $ENV{mk_tmp} = '';
         die "No environment set\n";
     };
-    my $StandDir;
-    if ( defined $ENV{PWD} ) {
-        $StandDir = $ENV{PWD};
-    } elsif (defined $ENV{_cwd}) {
-        $StandDir = $ENV{_cwd};
-    } else {
-        $StandDir = cwd();
-    };
-    my $previous_dir = '';
-    do {
-        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";
+    my $repository_helper = RepositoryHelper->new();
+    my $StandDir = $repository_helper->get_repository_root();
+    my $initial_dir = $repository_helper->get_initial_directory();
+    if ($StandDir eq $initial_dir) {
+        print_error('Found no project to build');
+    };
+    $initial_module = substr($initial_dir, length($StandDir) + 1);
+    if ($initial_module =~ /\\|\//) {
+        $initial_module = File::Basename::dirname($initial_module);
+    };
+    $module_paths{$initial_module} = $StandDir . "/$initial_module";
+#    $build_list_paths{$initial_module} =$StandDir . '/prj/'.$_;
+#    if ( defined $ENV{PWD} ) {
+#       $StandDir = $ENV{PWD};
+#   } elsif (defined $ENV{_cwd}) {
+#       $StandDir = $ENV{_cwd};
+#   } else {
+#       $StandDir = cwd();
+#    };
+#    my $previous_dir = '';
+#    do {
+#        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} = '';
-                print_error('Found no project to build');
-            };
-        };
-        $previous_dir = $StandDir;
-        $StandDir = File::Basename::dirname(Cwd::realpath($StandDir));
-        print_error('Found no project to build') if (!$StandDir);
-    }
-#    while (chdir '..');
-    while (chdir "$StandDir");
+#            } elsif ($StandDir eq $previous_dir) {
+#                $ENV{mk_tmp} = '';
+#                print_error('Found no project to build');
+#            };
+#        };
+#        $previous_dir = $StandDir;
+#        $StandDir = File::Basename::dirname(Cwd::realpath($StandDir));
+#        print_error('Found no project to build') if (!$StandDir);
+#    }
+#    while (chdir "$StandDir");
 };
 
 #
@@ -1571,7 +1582,7 @@ sub get_options {
     };
     $grab_output = 0 if ($dont_grab_output);
     print_error('Switches --with_branches and --all collision') if ($build_from_with_branches && $build_all_cont);
-    print_error('Switch --skip is for building multiple modules only!!') if (!$build_all_parents);
+    print_error('Switch --skip is for building multiple modules only!!') if ((scalar keys %skip_modules) && (!$build_all_parents));
 #    print_error('Please prepare the workspace on one of UNIX platforms') if ($prepare && ($ENV{GUI} ne 'UNX'));
     print_error('Switches --with_branches and --since collision') if ($build_from_with_branches && $build_since);
     if ($show) {
-- 
cgit 


From 49175f3415be166a8e1360af46ae58e506c0ec15 Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Fri, 11 Jun 2010 14:34:44 +0200
Subject: vgbugs10: new module for repository detection

---
 solenv/bin/modules/RepositoryHelper.pm | 205 +++++++++++++++++++++++++++++++++
 1 file changed, 205 insertions(+)
 create mode 100644 solenv/bin/modules/RepositoryHelper.pm

(limited to 'solenv')

diff --git a/solenv/bin/modules/RepositoryHelper.pm b/solenv/bin/modules/RepositoryHelper.pm
new file mode 100644
index 000000000000..7677376be70e
--- /dev/null
+++ b/solenv/bin/modules/RepositoryHelper.pm
@@ -0,0 +1,205 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+#*************************************************************************
+#
+# RepositoryHelper - Perl for working with repositories and underlying SCM
+#
+# usage: see below
+#
+#*************************************************************************
+
+package RepositoryHelper;
+
+use strict;
+
+
+use Carp;
+use Cwd qw (cwd);
+use File::Basename;
+#use File::Temp qw(tmpnam);
+
+my $debug = 0;
+
+#####  profiling #####
+
+##### ctor #####
+
+sub new {
+    my $proto = shift;
+    my $class = ref($proto) || $proto;
+    my $initial_directory = shift;
+    if ($initial_directory) {
+        $initial_directory = Cwd::realpath($initial_directory);
+    } else {
+        if ( defined $ENV{PWD} ) {
+            $initial_directory = $ENV{PWD};
+        } elsif (defined $ENV{_cwd}) {
+            $initial_directory = $ENV{_cwd};
+        } else {
+            $initial_directory = cwd();
+        };
+    };
+    my $self = {};
+    $self->{INITIAL_DIRECTORY} = $initial_directory;
+    $self->{REPOSITORY_ROOT} = undef;
+    $self->{REPOSITORY_NAME} = undef;
+    $self->{SCM_NAME} = undef;
+    detect_repository($self);
+    bless($self, $class);
+    return $self;
+}
+
+##### methods #####
+sub get_repository_root
+{
+    my $self        = shift;
+    return $self->{REPOSITORY_ROOT};
+}
+
+sub get_initial_directory
+{
+    my $self        = shift;
+    return $self->{INITIAL_DIRECTORY};
+}
+
+sub get_scm_name
+{
+    my $self        = shift;
+    return$self->{SCM_NAME};
+}
+
+##### private methods #####
+sub search_for_hg {
+    my $self        = shift;
+    my $hg_root;
+    my $scm_name = 'hg';
+    if (open(COMMAND, "$scm_name 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/) {
+            $self->{REPOSITORY_ROOT} = $hg_root;
+            $self->{SCM_NAME} = $scm_name;
+            return 1;
+        };
+    };
+    return 0;
+};
+
+sub search_via_build_lst {
+    my $self = shift;
+    my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names
+    my $previous_dir = '';
+    my $rep_root_candidate = $self->{INITIAL_DIRECTORY};
+    do {
+        foreach (@possible_build_lists) {# ('build.lst', 'build.xlist');
+            if (-e $rep_root_candidate . '/prj/'.$_) {
+                $self->{REPOSITORY_ROOT} = File::Basename::dirname($rep_root_candidate);
+                return 1;
+            } elsif ($rep_root_candidate eq $previous_dir) {
+                return 0;
+            };
+        };
+        $previous_dir = $rep_root_candidate;
+        $rep_root_candidate = File::Basename::dirname(Cwd::realpath($rep_root_candidate));
+        return 0 if (!$rep_root_candidate);
+    }
+    while (chdir "$rep_root_candidate");
+};
+
+sub detect_repository {
+    my $self        = shift;
+    return if (search_via_build_lst($self));
+    chdir $self->{INITIAL_DIRECTORY};
+    return if (search_for_hg($self));
+    croak('Cannot determine source directory/repository for ' . $self->{INITIAL_DIRECTORY});
+};
+
+##### finish #####
+
+1; # needed by use or require
+
+__END__
+
+=head1 NAME
+
+RepositoryHelper - Perl module for working with repositories and underlying SCM
+
+=head1 SYNOPSIS
+
+    # example that will analyze sources and return the source root directory
+
+    use RepositoryHelper;
+
+    # Create a new instance:
+    $a = RepositoryHelper->new();
+
+    # Get repositories for the actual workspace:
+    $a->get_repository_root();
+
+
+=head1 DESCRIPTION
+
+RepositoryHelper is a perlPerl module for working with repositories and underlying SCM
+in the database.
+
+Methods:
+
+RepositoryHelper::new()
+
+Creates a new instance of RepositoryHelper. Can be initialized by: some path which likely to belong to a repository, default - empty, the current dir will be taken.
+
+RepositoryHelper::get_repository_root()
+
+Returns the repository root, retrieved by SCM methods or on educated guess...
+
+RepositoryHelper::get_initial_directory()
+
+Returns full path to the initialistion directory.
+
+=head2 EXPORT
+
+RepositoryHelper::new()
+RepositoryHelper::get_repository_root()
+RepositoryHelper::get_scm_name()
+RepositoryHelper::get_initial_directory()
+
+=head1 AUTHOR
+
+Vladimir Glazunov, vg@openoffice.org
+
+=head1 SEE ALSO
+
+perl(1).
+
+=cut
-- 
cgit 


From 8bd016bc90501caa24bfae9be085e658bbc68858 Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Tue, 22 Jun 2010 17:21:43 +0200
Subject: kso45 #i110653# ooobaseversion globally available

---
 solenv/inc/version.lst    | 30 ++++++++++++++++++++++++++++++
 solenv/inc/versionlist.mk | 30 ++++++++++++++++++++++++++++++
 solenv/prj/d.lst          |  2 ++
 3 files changed, 62 insertions(+)
 create mode 100644 solenv/inc/version.lst
 create mode 100644 solenv/inc/versionlist.mk

(limited to 'solenv')

diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst
new file mode 100644
index 000000000000..ec0bb1407ea2
--- /dev/null
+++ b/solenv/inc/version.lst
@@ -0,0 +1,30 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ *************************************************************************/
+
+OOOBASEVERSIONMAJOR=3
+OOOBASEVERSIONMINOR=2
+OOOBASEVERSIONMICRO=1
diff --git a/solenv/inc/versionlist.mk b/solenv/inc/versionlist.mk
new file mode 100644
index 000000000000..31a255e48be1
--- /dev/null
+++ b/solenv/inc/versionlist.mk
@@ -0,0 +1,30 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+.INCLUDE: version.lst
+
+.EXPORT : OOOBASEVERSIONMAJOR OOOBASEVERSIONMINOR OOOBASEVERSIONMICRO
diff --git a/solenv/prj/d.lst b/solenv/prj/d.lst
index e69de29bb2d1..011796a62903 100644
--- a/solenv/prj/d.lst
+++ b/solenv/prj/d.lst
@@ -0,0 +1,2 @@
+mkdir: %_DEST%\bin%_EXT
+..\inc\version.lst %_DEST%\bin%_EXT%\version.lst
-- 
cgit 


From 826a90d68a4dc458585c6d2e647bec17971e9193 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@openoffice.org>
Date: Tue, 22 Jun 2010 18:10:51 +0200
Subject: configure25: #i111045# jemalloc

---
 solenv/inc/unxlng.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'solenv')

diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index 62a96f9c5f49..41f985fd472b 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -198,6 +198,14 @@ STDLIBCUIMT+=-ltcmalloc
 STDSHLGUIMT+=-ltcmalloc
 STDSHLCUIMT+=-ltcmalloc
 .ENDIF
+
+.IF "$(ALLOC)" == "JEMALLOC"
+STDLIBGUIMT+=-ljemalloc
+STDLIBCUIMT+=-ljemalloc
+STDSHLGUIMT+=-ljemalloc
+STDSHLCUIMT+=-ljemalloc
+.ENDIF
+
 .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
 LINKFLAGS += -Wl,--hash-style=both
 .ELSE
-- 
cgit 


From 6b8be900fb86c9c433e34db4e846002b49d82a7c Mon Sep 17 00:00:00 2001
From: Kai Sommerfeld <kso@openoffice.org>
Date: Wed, 23 Jun 2010 14:36:24 +0200
Subject: #i110653# - Fixed file header (c-style -> mk-file)

---
 solenv/inc/version.lst | 52 +++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

(limited to 'solenv')

diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst
index ec0bb1407ea2..019af0e131ed 100644
--- a/solenv/inc/version.lst
+++ b/solenv/inc/version.lst
@@ -1,29 +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.
- *
- *************************************************************************/
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
 
 OOOBASEVERSIONMAJOR=3
 OOOBASEVERSIONMINOR=2
-- 
cgit 


From 20f357091160225ee1891c6a86468633df6ff281 Mon Sep 17 00:00:00 2001
From: Kai Sommerfeld <kso@openoffice.org>
Date: Fri, 25 Jun 2010 17:56:38 +0200
Subject: #i110653# - Raised OOo version to 3.3.0

---
 solenv/inc/version.lst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'solenv')

diff --git a/solenv/inc/version.lst b/solenv/inc/version.lst
index 019af0e131ed..ac49f6c6fcf6 100644
--- a/solenv/inc/version.lst
+++ b/solenv/inc/version.lst
@@ -26,5 +26,5 @@
 #*************************************************************************
 
 OOOBASEVERSIONMAJOR=3
-OOOBASEVERSIONMINOR=2
-OOOBASEVERSIONMICRO=1
+OOOBASEVERSIONMINOR=3
+OOOBASEVERSIONMICRO=0
-- 
cgit 


From e8883cd38996181390f19d1f3885e3bef5210d59 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Tue, 29 Jun 2010 16:39:39 +0200
Subject: jl154: #i112789# call SourceConfig->new() so that it always works

---
 solenv/bin/subsequenttests | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100755 => 100644 solenv/bin/subsequenttests

(limited to 'solenv')

diff --git a/solenv/bin/subsequenttests b/solenv/bin/subsequenttests
old mode 100755
new mode 100644
index 34e6b8034c70..3caa84293f3e
--- a/solenv/bin/subsequenttests
+++ b/solenv/bin/subsequenttests
@@ -47,7 +47,7 @@ while (@ARGV) {
 }
 
 my @testpaths = ();
-my $sc = SourceConfig->new();
+my $sc = SourceConfig->new($ENV{'SOLARSRC'});
 my $module;
 foreach $module ($sc->get_active_modules()) {
     my $buildlst = $sc->get_module_build_list($module);
-- 
cgit 


From 58f4a8d5d10868c306f7028c6b54fe702b830352 Mon Sep 17 00:00:00 2001
From: obo <obo@openoffice.org>
Date: Wed, 30 Jun 2010 17:05:13 +0200
Subject: masterfix: #i10000# rename sdev300.ini into sooo330.ini for new
 release branch OOO330

---
 solenv/config/sdev300.ini | 3554 ---------------------------------------------
 solenv/config/sooo330.ini | 3554 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 3554 insertions(+), 3554 deletions(-)
 delete mode 100755 solenv/config/sdev300.ini
 create mode 100644 solenv/config/sooo330.ini

(limited to 'solenv')

diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
deleted file mode 100755
index 3e80e1460885..000000000000
--- a/solenv/config/sdev300.ini
+++ /dev/null
@@ -1,3554 +0,0 @@
-common
-{
-	environment
-	{
-		common
-		{
-			ADDED_MODULES solenv default_images custom_images ooo_custom_images external_images postprocess instset_native instsetoo_native smoketest_native smoketestoo_native
-			BIG_SVX TRUE
-			BMP_WRITES_FLAG TRUE
-			BUILD_SPECIAL TRUE
-			BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS 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
-			DIC_ALL TRUE
-			ENABLEUNICODE TRUE
-			ENABLE_AGG YES
-			ENABLE_CUPS TRUE
-			ENABLE_DIRECTX TRUE
-			ENABLE_FONTCONFIG TRUE
-			ENABLE_GCONF TRUE
-			ENABLE_GNOMEVFS TRUE
-			ENABLE_GTK TRUE
-			ENABLE_MEDIAWIKI YES
-			ENABLE_MINIMIZER YES
- 			ENABLE_MYSQLC YES
-			ENABLE_NSS_MODULE YES
-			ENABLE_RANDR TRUE
-			ENABLE_REPORTBUILDER YES
-			ENABLE_SVCTAGS YES
-			ENABLE_VBA YES
-			ISERVER iserver.germany.sun.com
-			LU_HGFLAG ""
-			LU_NOSOURCE ""
-			LU_RFLAG ""
-			NEW_JAR_PACK TRUE
-			NO_REC_RES TRUE
-			OOODMAKEMODE YES
-            OOO_SHELL /bin/bash
-			PCLEAN_PATH xxx
-			RES_ENUS TRUE
-			RES_GER TRUE
-			rsc_once TRUE
-			SHIPDRIVE /so/install
-			STLPORT4 NO_STLPORT4
-			STLPORT_VER 400
-			WITH_FONTOOO YES
-			WITH_LDAP YES
-			wrapper_override_cc_wrapper TRUE
-			MAXPROC maxproc=15
-		}
-		common:0 IF %UPDATER% == YES
-		{
-			DEFAULT_TO_ENGLISH_FOR_PACKING 1
-			DELIVER_TO_ZIP TRUE
-			DISABLE_SAL_DBGBOX 1
-		}
-		common:1 IF X%CWS_WORK_STAMP%X != XX
-		{
-			CWS_WORK_STAMP_EXT _%CWS_WORK_STAMP%
-		}
-		common:2 IF %UPDATER% == YES
-		{
-			WITH_LANG en-US de
-            BUILD_TYPE l10n
-		}
-		common:3 IF %UPDATER% != YES
-		{
-		}
-		crashdump
-		{
-			ENABLE_CRASHDUMP TRUE
-		}
-		hg
-		{
-			LU_HGFLAG hg_source
-		}
-		maxproc
-		{
-			MAXPROC maxproc=%MAXPROCESS%
-		}
-		minorext
-		{
-			UPDMINOREXT .%UPDMINOR%
-		}
-		nosource
-		{
-			LU_NOSOURCE no_source
-		}
-		pro:0 IF %UPDATER% == YES
-		{
-			DELIVER_TO_ZIP TRUE
-			product full
-			PROEXT .pro
-			PROFULLSWITCH product=full
-			WITH_LANG en-US de es fr hu it ja ko nl pl pt pt-BR ru sv th tr zh-CN zh-TW ar
-		}
-		pro:1 IF %UPDATER% != YES
-		{
-			product full
-			PROEXT .pro
-			PROFULLSWITCH product=full
-		}
-		r_only
-		{
-			LU_RFLAG r_only
-		}
-		tmp
-		{
-			SOL_TMP %SOL_TMP_DIR%
-		}
-		verbose
-		{
-			VERBOSE VERBOSE
-		}
-	}
-	extern
-	{
-		ENVROOT
-		PATH
-		SRC_ROOT
-		UPDATER
-	}
-	order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 tmp crashdump maxproc hg r_only nosource
-	reset
-	{
-		ALT_L10N_MODULE
-		ENVCFLAGS
-		HOMEDRIVE
-		HOMEPATH
-		JAVAHOME
-		JAVA_HOME
- 		LU_HGFLAG
- 		LU_NOSOURCE
- 		LU_RFLAGS
-        MKDIRHIER
-		PROEXT
-		PROFULLSWITCH
-		SHIPDRIVE
-		SOLARSRC
-		SOLAR_JAVA
-		SPEW
-		STLPORT4
-		UPDMINOREXT
-		WITH_FONTOOO
-		WITH_LANG
-	}
-	restore
-	{
-		PATH
-	}
-	standlst
-	{
-		DRIVE_O %WORK_STAMP%/drives/o:/UnixVolume
-		DRIVE_S %WORK_STAMP%/drives/s:/UnixVolume
-	}
-	switches
-	{
-		crashdump
-		cwsname CWS_WORK_STAMP
-		envroot
-		hg
-		minorext
-		nosource
-		pro
-		maxproc MAXPROCESS
-		r_only
-		tmp SOL_TMP_DIR
-		verbose VERBOSE
-	}
-}
-finish
-{
-	environment
-	{
-		cap
-		{
-			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
-		}
-		cax
-		{
-			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
-		}
-		common_0:0 IF %OS% == MACOSX
-		{
-			ENABLE_GCONF
-			ENABLE_GNOMEVFS
-			ENABLE_GTK
-			SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% -I%SOLARENV%$/%OUTPATH%$/inc -I%SOLARENV%$/inc %SOLAREXTRAINC%
-		}
-		common_0:3 IF %SOLARINCLUDES% ==
-		{
-			SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% %PSDKINC% -I%COMPATH%$/include -I%SOLARENV%$/inc %SOLAREXTRAINC%
-		}
-		common_1
-		{
-        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
-		{
-			MWS_BUILD TRUE
-		}
-		common_a
-		{
-			*o: cd %SOLARSRC%
-			ALT_L10N_MODULE $expand(%SOLARSRC%/..)/sun/l10n_so
-			TARFILE_LOCATION %SOURCE_ROOT_DIR%/ext_sources
-		}
-		common_jre:0 IF %JREPATH% ==
-		{
-			HIER set
-		}
-		common_jre:1 IF %LD_LIBRARY_PATH% ==
-		{
-			PATH %PATH%$:$cp(%JREPATH%)
-		}
-		cwsname:0 IF X%SOURCE_ROOT_USED%X == XX
-		{
-			*build
-			*deliver
-			DMAKEROOT SOURCE_ROOT_not_used
-			SOLARINC SOURCE_ROOT_not_used
-			SOLARINCLUDE SOURCE_ROOT_not_used
-			SOLARSRC SOURCE_ROOT_not_used
-			SOLARVER SOURCE_ROOT_not_used
-			SOLARVERSION SOURCE_ROOT_not_used
-			SOLAR_SOURCE_ROOT SOURCE_ROOT_not_used
-			SO_GEN_ERROR Error - Using -cwsname without -sourceroot switch is harmful...
-			SO_GEN_ERROR2 ...resetting path to source tree
-			SRC_ROOT SOURCE_ROOT_not_used
-		}
-		cwsname:1 IF X%SOURCE_ROOT%X == XX
-		{
-			*build
-			*deliver
-			DMAKEROOT SOURCE_ROOT_not_set
-			SOLARINC SOURCE_ROOT_not_set
-			SOLARINCLUDE SOURCE_ROOT_not_set
-			SOLARSRC SOURCE_ROOT_not_set
-			SOLARVER SOURCE_ROOT_not_set
-			SOLARVERSION SOURCE_ROOT_not_set
-			SOLAR_SOURCE_ROOT SOURCE_ROOT_not_set
-			SO_GEN_ERROR Error - Using -cwsname without SOURCE_ROOT set is harmful...
-			SO_GEN_ERROR2 ...resetting path to source tree
-			SRC_ROOT SOURCE_ROOT_not_set
-		}
-		cwsname:2 IF X%UPDMINOR%X == XX
-		{
-			*build
-			*deliver
-			DMAKEROOT UPDMINOR_not_used
-			SOLARINC UPDMINOR_not_used
-			SOLARINCLUDE UPDMINOR_not_used
-			SOLARSRC UPDMINOR_not_used
-			SOLARVER UPDMINOR_not_used
-			SOLARVERSION UPDMINOR_not_used
-			SOLAR_SOURCE_ROOT UPDMINOR_not_used
-			SO_GEN_ERROR Error - Using -cwsname without -ver switch is harmful...
-			SO_GEN_ERROR2 ...resetting path to source tree
-			SRC_ROOT UPDMINOR_not_used
-		}
-		jdk14
-		{
-			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
-			ILIB %LIB%$;%JDKLIB%
-			LIB %LIB%$;%JDKLIB%
-            JAVA_TARGET_FLAG -target 1.4
-		}
-		jdk15
-		{
-			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
-			ILIB %LIB%$;%JDKLIB%
-			LIB %LIB%$;%JDKLIB%
-            JAVA_TARGET_FLAG -target 1.5
-		}
-		l10n
-		{
-			framework %L10N_framework%
-			L10N-framework %L10N_framework%
-		}
-		ojdk16
-		{
-			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
-			ILIB %LIB%$;%JDKLIB%
-			LIB %LIB%$;%JDKLIB%
-            JAVA_TARGET_FLAG -target 1.6
-		}
-	}
-	order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 cax cap common_a
-	switches
-	{
-		cwsname CWS_WORK_STAMP
-	}
-}
-unxfbsdi
-{
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice perl %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice perl %SOLARENV%/bin/build_client.pl
-			*copyprj perl %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver perl %SOLARENV%/bin/deliver.pl
-			*mkout perl %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep perl %SOLARENV%/bin/zipdep.pl
-			COPYPRJ perl %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER perl %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			LD_LIBRARY_PATH .:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:%COMPATH%/libexec
-			MKOUT perl %SOLARENV%/bin/mkout.pl
-			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
-			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			ZIPDEP perl %SOLARENV%/bin/zipdep.pl
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux
-			DEVROOT %SOLAR_ENV_ROOT%
-			PKGFORMAT some_dummy
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.3.1
-			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2_11
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_06
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-		}
-		common2
-		{
-			BUILD_TOOLS %SOLARROOT%/bt_unxfbsdi/bin
-			COM GCC
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU I
-			CPUNAME INTEL
-			CVER C300
-			ENV_TOOLS %SOLARROOT%/et_unxfbsdi/bin
-			GUI UNX
-			GUIBASE unx
-			GVER VCL
-			INPATH unxfbsdi%PROEXT%
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			NO_BSYMBOLIC True
-			OS FREEBSD
-			OUTPATH unxfbsdi
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxfbsdi%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxfbsdi%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /tmp
-			TMP /tmp
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		debug
-		{
-			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
-			JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/linux
-			JDKLIB %JDK14PATH%/jre/lib:%JDK14PATH%/jre/lib/i386:%JDK14PATH%/jre/lib/i386/client
-			JDKLIBS -L%JDK14PATH%/jre/lib -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/jre/lib/i386/client
-			JDKPATH %JDK14PATH%/bin
-			JDK_VERSION 142
-			XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
-		}
-		jdk14path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-			JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/i386:%JDK15PATH%/jre/lib/i386/client
-			JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/jre/lib/i386/client
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 IF X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15 debug
-	reset
-	{
-		CLASSPATH
-		COPYALL
-	}
-	restore
-	{
-		INCLUDE
-	}
-	script
-	{
-		csh 
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
-            820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
-            820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		debug
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		pro
-		sourceroot
-		sysbaseroot
-	}
-}
-unxlngi6
-{
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.5$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.5$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			HAVE_GCC_VISIBILITY_FEATURE TRUE
-            HAVE_LD_BSYMBOLIC_FUNCTIONS TRUE
-            HAVE_LD_HASH_STYLE TRUE
-			LIBRARY_PATH %SYSBASE%/usr/lib
-			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
-			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.5/glibc2.5
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.5
-			DEVROOT %SOLAR_ENV_ROOT%
-			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-			PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.5/%WORK_STAMP%/bin/perl
-			PKGFORMAT rpm
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.3.1
-			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2_11
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_06
-			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
-            BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.5/%WORK_STAMP%/bin
-			COM GCC
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU I
-			CPUNAME INTEL
-			CVER C432
-			ENABLE_KAB TRUE
-			ENABLE_KDE TRUE
-			ENABLE_EVOAB2 TRUE
-			ENV_TOOLS %SOLARROOT%/et_linux_libc2.5/%WORK_STAMP%/bin
-			GUI UNX
-			GUIBASE unx
-			GVER VCL
-			INPATH unxlngi6%PROEXT%
-			JDK13PATH %SOLAR_JDK13PATH%
-			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
-			OUTPATH unxlngi6
-			RPM %SOLARENV%/bin/rpm-wrapper
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxlngi6%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxlngi6%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /tmp
-			TMP /tmp
-		}
-		common3:0 IF X%UPDATER%X == XX
-		{
-			FORCE2ARCHIVE TRUE
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
-			JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/linux
-			JDKLIB %JDK14PATH%/jre/lib:%JDK14PATH%/jre/lib/i386:%JDK14PATH%/jre/lib/i386/client
-			JDKLIBS -L%JDK14PATH%/jre/lib -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/jre/lib/i386/client
-			JDKPATH %JDK14PATH%/bin
-			JDK_VERSION 142
-			XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
-		}
-		jdk14path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-			JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/i386:%JDK15PATH%/jre/lib/i386/client:%JDK15PATH%/jre/lib/i386/xawt
-			JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/jre/lib/i386/client
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		ojdk16
-		{
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
-			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
-			JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/jre/lib/i386/client:%OJDK16PATH%/jre/lib/i386/xawt
-			JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/jre/lib/i386/client
-			JDKPATH %OJDK16PATH%/bin
-			JDK_VERSION 160
-			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-		}
-		ojdk16path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 IF X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2 pro common3:0 common jdk14 jdk15 ojdk16
-	reset
-	{
-		CLASSPATH
-		COPYALL
-	}
-	restore
-	{
-		INCLUDE
-	}
-	script
-	{
-		csh 
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
-            820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
-            820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		debug
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		sourceroot
-		sysbaseroot
-	}
-}
-unxlngx6
-{
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			HAVE_GCC_VISIBILITY_FEATURE TRUE
-            HAVE_LD_BSYMBOLIC_FUNCTIONS TRUE
-            HAVE_LD_HASH_STYLE TRUE
-			LIBRARY_PATH %SYSBASE%/usr/lib
-			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
-			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc3.4.6/glibc3.4.6
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc3.4.6/
-			DEVROOT %SOLAR_ENV_ROOT%
-			PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
-			PKGFORMAT rpm
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2.32
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_15.x64
-			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-amd64
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-			USE_SYSTEM_STL YES
-			XAU_LIBS -lXau
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
-            BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin
-			COM GCC
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU X
-			CPUNAME INTEL
-			CVER C341
-			ENABLE_KAB TRUE
-			ENABLE_KDE TRUE
-			ENV_TOOLS %SOLARROOT%/et_linux_libc2.32/%WORK_STAMP%/bin
-			GUI UNX
-			GUIBASE unx
-			GUIENV sal
-			GVER VCL
-			INPATH unxlngx6%PROEXT%
-			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
-			OUTPATH unxlngx6
-			PA_VER 18
-			RPM %SOLARENV%/bin/rpm-wrapper
-			SOLARUPD %UPD%
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxlngx6%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxlngx6%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /tmp
-			TMP /tmp
-		}
-		common3:0 IF X%UPDATER%X == XX
-		{
-			FORCE2ARCHIVE TRUE
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-			JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/amd64:%JDK15PATH%/jre/lib/amd64/server:%JDK15PATH%/jre/lib/amd64/xawt
-			JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/amd64 -L%JDK15PATH%/jre/lib/amd64/server
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk14path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-			JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/amd64:%JDK15PATH%/jre/lib/amd64/server:%JDK15PATH%/jre/lib/amd64/xawt
-			JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/amd64 -L%JDK15PATH%/jre/lib/amd64/server
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		ojdk16
-		{
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
-			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
-			JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/amd64:%OJDK16PATH%/jre/lib/amd64/server:%OJDK16PATH%/jre/lib/amd64/xawt
-			JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/amd64 -L%OJDK16PATH%/jre/lib/amd64/server
-			JDKPATH %OJDK16PATH%/bin
-			JDK_VERSION 160
-			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-		}
-		ojdk16path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 IF X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2  common3:0 pro common jdk14 jdk15 ojdk16
-	reset
-	{
-		CLASSPATH
-		COPYALL
-	}
-	restore
-	{
-		INCLUDE
-	}
-	script
-	{
-		csh 
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
-            820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
-            820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		debug
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		sourceroot
-		sysbaseroot
-	}
-}
-unxmacxi
-{
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			HAVE_GCC_VISIBILITY_FEATURE TRUE
-			LIBRARY_PATH %SYSBASE%/usr/lib
-			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include/c++/4.0.0 -I%SYSBASE%/usr/include/c++/4.0.0/i686-apple-darwin8 -I%SYSBASE%/usr/lib/gcc/i686-apple-darwin8/4.0.1/include -I%SYSBASE%/usr/include/python2.3 -I%SYSBASE%/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin8/4.0.1/include -I%SYSBASE%/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon
-			SOLAREXTRALIB -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-		}
-		common0
-		{
-			GXX_INCLUDE_PATH /so/env/gcc_4.0.1_macosx/usr/include/c++/4.0.0
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/gcc_4.0.1_macosx
-            MACDEVSDK /so/env/gcc_4.0.1_macosx/MacOSX10.4u.sdk
-		}
-		common1
-		{
-			BUILD_OS_APPLEOSX TRUE
-			BUILD_OS_MAJOR 10
-			BUILD_OS_MINOR 4
-			BUILD_OS_REV 10
-			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.0.1_macosx
-			DEVROOT %SOLAR_ENV_ROOT%
-			DISABLE_DEPRECATION_WARNING TRUE
-			EXTRA_CDEFS -DBUILD_OS_APPLEOSX -DBUILD_OS_MAJOR=10 -DBUILD_OS_MINOR=4 -DBUILD_OS_REV=10
-			EXTRA_CFLAGS -isysroot %COMPATH%/MacOSX10.4u.sdk
-			EXTRA_LINKFLAGS -Wl,-syslibroot,%COMPATH%/MacOSX10.4u.sdk
-			GNUCOPY gnucp
-			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-			LIBXML_CFLAGS -I%COMPATH%/MacOSX10.4u.sdk/usr/include/libxml2
-			LIBXML_LIBS -L%COMPATH%/MacOSX10.4u.sdk/usr/lib -lxml2 -lz -lpthread -liconv -lm
-			LIBXSLT_CFLAGS -I%COMPATH%/MacOSX10.4u.sdk/usr/include/libxml2
-			LIBXSLT_LIBS -L%COMPATH%/MacOSX10.4u.sdk/usr/lib -lxslt -lxml2 -lz -lpthread -liconv -lm
-			MACOSX_DEPLOYMENT_TARGET 10.4
-			OPENSSL_LIBS -lssl -lcrypto
-			PERL %SOLAR_ENV_ROOT%/bt_macosx_intel/%WORK_STAMP%/bin/perl
-			PKGFORMAT dmg
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/mac_jdk14_unknown
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/MacOSX_JDK_1.5.0_07.intel
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-			SYSTEM_CURL YES
-			SYSTEM_LIBXML YES
-			SYSTEM_LIBXSLT YES
-			SYSTEM_OPENSSL YES
-			SYSTEM_PYTHON YES
-			SYSTEM_ZLIB YES
-			USE_SYSTEM_STL YES
-			BUILD_PIXMAN YES
-			WITH_MOZILLA YES
-		}
-		common2
-		{
-			BUILD_TOOLS %SOLARROOT%/bt_macosx_intel/%WORK_STAMP%/bin
-			COM GCC
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU I
-			CPUNAME INTEL
-			CVER C341
-			ENV_TOOLS %SOLARROOT%/et_macosx_intel/%WORK_STAMP%/bin
-			GUI UNX
-			GUIBASE aqua
-			GVER VCL
-			INPATH unxmacxi%PROEXT%
-			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
-			PA_VER 18
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxmacxi%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxmacxi%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /tmp
-			TMP /tmp
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-			JDKLIB %JDK15PATH%/jre/lib
-			JDKLIBS -L%JDK15PATH%/jre/lib
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk14path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
-			JDKLIB %JDK15PATH%/jre/lib
-			JDKLIBS -L%JDK15PATH%/jre/lib
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 IF X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15
-	reset
-	{
-		CLASSPATH
-		COPYALL
-	}
-	restore
-	{
-		INCLUDE
-	}
-	script
-	{
-		csh 
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
-            820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
-            820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		debug
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		pro
-		sourceroot
-		sysbaseroot
-	}
-}
-unxsoli4
-{
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
-			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_intel
-		}
-		common1
-		{
-			COMPATH /so/env/compilers/SUNWS12_p/intel/SUNWspro
-			DEVROOT %SOLAR_ENV_ROOT%
-			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-			PERL %SOLAR_ENV_ROOT%/bt_solaris_intel/bin/perl
-			PKGFORMAT pkg
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.3.1_01.intel
-			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.4.2_11.intel
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_06.intel
-			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-i586
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-		}
-		common2
-		{
-			BUILD_TOOLS %SOLARROOT%/bt_solaris_intel/%WORK_STAMP%/bin
-			COM C52
-			COMEX 4
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU I
-			CPUNAME INTEL
-			CVER C52
-			ENABLE_EVOAB2 TRUE
-			ENV_TOOLS %SOLARROOT%/et_solaris_intel/%WORK_STAMP%/bin
-			GUI UNX
-			GUIBASE unx
-			GVER VCL
-			INPATH unxsoli4%PROEXT%
-			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
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxsoli4%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxsoli4%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /var/tmp
-			TMP /var/tmp
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 if X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
-			JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/solaris
-			JDKLIB %JDK14PATH%/jre/lib/i386:%JDK14PATH%/lib:%JDK14PATH%/jre/lib/i386/native_threads:%JDK14PATH%/jre/plugin/i386:%JDK14PATH%/jre/lib/i386/motif21
-			JDKLIBS -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/lib -L%JDK14PATH%/jre/lib/i386/native_threads -L%JDK14PATH%/jre/plugin/i386 -L%JDK14PATH%/jre/lib/i386/motif21
-			JDKPATH %JDK14PATH%/bin
-			JDK_VERSION 142
-			XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
-		}
-		jdk14path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
-			JDKLIB %JDK15PATH%/jre/lib/i386:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/i386/native_threads:%JDK15PATH%/jre/plugin/i386:%JDK15PATH%/jre/lib/i386/motif21
-			JDKLIBS -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/i386/native_threads -L%JDK15PATH%/jre/plugin/i386 -L%JDK15PATH%/jre/lib/i386/motif21
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		ojdk16
-		{
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
-			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/solaris
-			JDKLIB %OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/lib:%OJDK16PATH%/jre/lib/i386/native_threads:%OJDK16PATH%/jre/plugin/i386:%OJDK16PATH%/jre/lib/i386/xawt
-			JDKLIBS -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/lib -L%OJDK16PATH%/jre/lib/i386/native_threads -L%OJDK16PATH%/jre/plugin/i386 -L%OJDK16PATH%/jre/lib/i386/xawt
-			JDKPATH %OJDK16PATH%/bin
-			JDK_VERSION 160
-			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-		}
-		ojdk16path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath common2 pro common jdk14 jdk15 ojdk16
-	reset
-	{
-		CLASSPATH
-	}
-	script
-	{
-		csh 
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
-            820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
-            820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		sourceroot
-		sysbaseroot
-	}
-}
-unxsols4
-{
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
-			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_LICENSE_FILE /opt/SUNWspro/license_dir/sunpro.lic,1
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
-		}
-		common1
-		{
-			COMPATH /so/env/compilers/SUNWS12_p/sparc/SUNWspro
-			DEVROOT %SOLAR_ENV_ROOT%
-			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-			PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl
-			PKGFORMAT pkg
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.3.1_01.sparc
-			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.4.2_11.sparc
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_06.sparc
-			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-sparc
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-		}
-		common2
-		{
-			BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
-			COM C52
-			COMEX 4
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU S
-			CPUNAME SPARC
-			CVER C52
-			ENABLE_EVOAB2 TRUE
-			ENV_TOOLS %SOLARROOT%/et_solaris_sparc/%WORK_STAMP%/bin
-			GUI UNX
-			GUIBASE unx
-			GVER VCL
-			INPATH unxsols4%PROEXT%
-			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
-			OUTPATH unxsols4
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxsols4%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxsols4%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /var/tmp
-			TMP /var/tmp
-		}
-		common:3 IF %UPDATER% == YES
-		{
-			TEMP /tmp
-			TMP /tmp
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 if X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
-			JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/solaris
-			JDKLIB %JDK14PATH%/jre/lib/sparc:%JDK14PATH%/lib:%JDK14PATH%/jre/lib/sparc/native_threads:%JDK14PATH%/jre/plugin/sparc:%JDK14PATH%/jre/lib/sparc/motif21
-			JDKLIBS -L%JDK14PATH%/jre/lib/sparc -L%JDK14PATH%/lib -L%JDK14PATH%/jre/lib/sparc/native_threads -L%JDK14PATH%/jre/plugin/sparc -L%JDK14PATH%/jre/lib/sparc/motif21
-			JDKPATH %JDK14PATH%/bin
-			JDK_VERSION 142
-			XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
-		}
-		jdk14path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
-			JDKLIB %JDK15PATH%/jre/lib/sparc:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/sparc/native_threads:%JDK15PATH%/jre/plugin/sparc:%JDK15PATH%/jre/lib/sparc/motif21
-			JDKLIBS -L%JDK15PATH%/jre/lib/sparc -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/sparc/native_threads -L%JDK15PATH%/jre/plugin/sparc -L%JDK15PATH%/jre/lib/sparc/motif21
-			JDKPATH %JDK15PATH%/bin
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		ojdk16
-		{
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
-			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/solaris
-			JDKLIB %OJDK16PATH%/jre/lib/sparc:%OJDK16PATH%/lib:%OJDK16PATH%/jre/lib/sparc/native_threads:%OJDK16PATH%/jre/plugin/sparc:%OJDK16PATH%/jre/lib/sparc/xawt
-			JDKLIBS -L%OJDK16PATH%/jre/lib/sparc -L%OJDK16PATH%/lib -L%OJDK16PATH%/jre/lib/sparc/native_threads -L%OJDK16PATH%/jre/plugin/sparc -L%OJDK16PATH%/jre/lib/sparc/xawt
-			JDKPATH %OJDK16PATH%/bin
-			JDK_VERSION 160
-			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-		}
-		ojdk16path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LM_LICENSE_FILE
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0  sysbaseroot cap cax compath common2 common:3 pro common jdk14 jdk15 ojdk16
-	reset
-	{
-		CLASSPATH
-	}
-	script
-	{
-		csh 
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
-            820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
-            820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		sourceroot
-		sysbaseroot
-	}
-}
-unxsolu4
-{
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			ENABLE_GNOMEVFS
-			FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
-			FREETYPE_LIBS -L%SYSBASE%/usr/sfw/lib/sparcv9 -lfreetype
-			LIBXML_CFLAGS -I%SYSBASE%/usr/include/libxml2
-			LIBXML_LIBS -L%SYSBASE%/usr/lib/sparcv9 -lxml2 -lpthread -lz -lm -lsocket -lnsl
-			LIBXSLT_CFLAGS -I%SYSBASE%/usr/include/libxml2
-			LIBXSLT_LIBS -L%SYSBASE%/usr/lib/sparcv9 -lxslt -lxml2 -lpthread -lz -lm -lsocket -lnsl
-			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
-			PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
-			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
-			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
-			SOLAR_JAVA TRUE
-			SYSTEM_FREETYPE YES
-			SYSTEM_LIBXML YES
-			SYSTEM_LIBXSLT YES
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
-		}
-		common1
-		{
-			COMPATH /so/env/compilers/SUNWS12m1/sparc/SUNWspro
-			DEVROOT %SOLAR_ENV_ROOT%
-			PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl
-			PKGFORMAT pkg
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_15.sparc
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-			USE_SYSTEM_STL YES
-		}
-		common2
-		{
-			BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
-			COM C52
-			COMEX 4
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU U
-			CPUNAME SPARC
-			CVER C52
-			ENV_TOOLS %SOLARROOT%/et_solaris_sparc/%WORK_STAMP%/bin
-			GUI UNX
-			GUIBASE unx
-			GVER VCL
-			INPATH unxsolu4%PROEXT%
-			JDK15PATH %SOLAR_JDK15PATH%
-			OS SOLARIS
-			OUTPATH unxsolu4
-			SOLAR_STLLIBPATH %SOLARVERSION%$/unxsolu4%PROEXT%$/lib%UPDMINOREXT%
-			SOLAR_STLPATH %SOLARVERSION%$/unxsolu4%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SYSBASE %SOLAR_SYSBASE_ROOT%
-			TEMP /var/tmp
-			TMP /var/tmp
-		}
-		common:3 IF %UPDATER% == YES
-		{
-			TEMP /tmp
-			TMP /tmp
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 if X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk15
-		{
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
-			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
-			JDKLIB %JDK15PATH%/jre/lib/sparcv9:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/sparcv9/native_threads:%JDK15PATH%/jre/lib/sparcv9/server:%JDK15PATH%/jre/plugin/sparcv9:%JDK15PATH%/jre/lib/sparcv9/motif21
-			JDKLIBS -L%JDK15PATH%/jre/lib/sparcv9 -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/sparcv9/native_threads -L%JDK15PATH%/jre/lib/sparcv9/server -L%JDK15PATH%/jre/plugin/sparcv9 -L%JDK15PATH%/jre/lib/sparcv9/motif21
-			JDKPATH %JDK15PATH%/bin/sparcv9
-			JDK_VERSION 150
-			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-		sysbaseroot
-		{
-			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LM_LICENSE_FILE
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		SYSBASE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath common2 common:3 pro common jdk15
-	reset
-	{
-		CLASSPATH
-	}
-	script
-	{
-		csh
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
-            820: wrapfetch.sh
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
-            820: wrapfetch.sh
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR2
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-			881: echo $SO_GEN_ERROR2
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		pro
-		sourceroot
-		sysbaseroot
-	}
-}
-unxubti8
-{
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOLARROOT%/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COPYALL FALSE
-			DEVROOT %SOL_TMP%$/r
-			PCLEAN_PATH %SOL_TMP%$/r/etools
-			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
-			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%/bin/deliver.pl
-			*mkout %PERL% %SOLARENV%/bin/mkout.pl
-			*r: cd %SOLARROOT%
-			*s: cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER deliver.pl
-			DMAKEROOT %SOLARENV%/inc/startup
-			HAVE_GCC_VISIBILITY_FEATURE TRUE
-			LD_LIBRARY_PATH .:/usr/lib:/usr/lib/jvm/java-6-openjdk/jre/lib/i386:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/xawt:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/client:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/native_threads:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:
-			MKOUT mkout.pl
-			SOLAREXTRAINC -I%SOLAR_STLPATH%
-			SOLAREXTRALIB -L../lib
-			SOLAR_JAVA TRUE
-			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT /so/env
-			SOLAR_SOURCE_ROOT %DRIVE_O%
-		}
-		common1
-		{
-			AGG_VERSION 2300
-			ANT /usr/share/ant/bin/ant
-			ANT_HOME /usr/share/ant
-			ANT_LIB /usr/share/ant/lib
-			AWTLIB -ljawt
-			CC gcc
-			COMPATH /usr/bin
-			CXX g++
-			DEVROOT %SOLAR_ENV_ROOT%
-			EXCEPTIONS dwarf2
-			EXTERNAL_WARNINGS_NOT_ERRORS 1
-			GNUMAKE make
-			GXX_INCLUDE_PATH /usr/include/c++/4.2
-			HAVE_LD_HASH_STYLE TRUE
-			JAVACOMPILER /usr/bin/javac
-			JAVADOC /usr/bin/javadoc
-			JDK sun
-			LFS_CFLAGS -D_FILE_OFFSET_BITS=64
-			PAM YES
-			PAM_LINK NO
-			PERL /usr/bin/perl
-			PKGFORMAT deb
-			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
-			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
-			SOLAR_PLUGIN TRUE
-			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
-			VBA_EXTENSION NO
-			WITH_LANG en-US de
-			XAU_LIBS -lXau
-			XCLASSPATH /usr/lib/jvm/java-6-openjdk/jre/lib/rt.jar:.
-			XINERAMA_LINK dynamic
-			ZIPDEP zipdep.pl
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
-            BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin
-			COM GCC
-			COMMON_BUILD_TOOLS %SRC_ROOT%/external/common
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			CPU I
-			CPUNAME INTEL
-			CVER C341
-			GUI UNX
-			GUIBASE unx
-			GVER VCL
-			INPATH unxubti8%PROEXT%
-			NO_BSYMBOLIC TRUE
-			OJDK16PATH /usr/lib/jvm/java-6-openjdk
-			OS LINUX
-			OUTPATH unxubti8
-			RPM /usr/bin/rpmbuild
-			SOLAR_STLPATH %SOLARVERSION%$/unxubti8%PROEXT%$/inc%UPDMINOREXT%$/stl
-			TEMP /tmp
-			TMP /tmp
-		}
-		compath
-		{
-			COMPATH /usr/bin
-		}
-		debug
-		{
-			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SOLARVER %DIST_ROOT%/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk15
-		{
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
-			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
-			JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/jre/lib/i386/client:%OJDK16PATH%/jre/lib/i386/xawt
-			JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/jre/lib/i386/client -L%OJDK16PATH%/jre/lib/i386/native_threads
-			JDKPATH %OJDK16PATH%/bin
-			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-		}
-		jdk15path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		ojdk16
-		{
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
-			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
-			JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/jre/lib/i386/client:%OJDK16PATH%/jre/lib/i386/xawt
-			JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/jre/lib/i386/client -L%OJDK16PATH%/jre/lib/i386/native_threads
-			JDKPATH %OJDK16PATH%/bin
-			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
-		}
-		ojdk16path:0 IF X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH %JDK_PATH%
-		}
-		pro
-		{
-			PROSWITCH -DPRODUCT
-		}
-		sourceroot:0 IF X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-	}
-	extern
-	{
-		DIST_ROOT
-		ENV_ROOT
-		HOME
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-		USER
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 cap cax compath common2 pro common jdk15 ojdk16 debug
-	reset
-	{
-		CLASSPATH
-		COPYALL
-		ENABLE_CRASHDUMP
-	}
-	restore
-	{
-		INCLUDE
-	}
-	script
-	{
-		csh
-		{
-			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			600: umask 002
-			800: rehash
-            820: wrapfetch.sh
-		}
-		sh
-		{
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			600: umask 002
-			800: hash -r
-            820: wrapfetch.sh
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		debug
-		distroot
-		envroot
-		jdk15
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		sourceroot
-	}
-}
-wntgcci1
-{
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COMPATH %SOL_TMP%$/r$/MinGW
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
-			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
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COMPATH %SOL_TMP%$/r$/MinGW
-			COPYALL FALSE
-			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
-			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
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
-			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%$/bin$/deliver.pl
-			*dmake *dmake %PROFULLSWITCH%
-			*mkout %PERL% %SOLARENV%$/bin$/mkout.pl
-			*o cd %SOLARENV%$/..
-			*r cd %SOLARROOT%
-			*s cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-			BIG_SVX
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
-			DMAKEROOT %SOLARENV%$/inc$/startup
-			ILIB .$:%UPDMINOREXT%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/lib$:%FSDK%$/lib$:%COMPATH%$/lib$:
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			LIB .$:%UPDMINOREXT%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/lib$:%PSDK%$/lib$/x86$:%FSDK%$/lib$:%COMPATH%$/lib$:%SOLAR_STLLIBPATH%
-			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
-			PATH %PATH%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%SHARED_COM_SDK_PATH%$:%PSDK%$/bin$:%FSDK%$/bin
-			PSDKINC -I%PSDK%$/include
-			SOLAREXTRAINC -I%COMPATH%$/lib$/gcc-lib$/mingw32$/3.2$/include -I%DSDK%$/include
-			SOLAR_JAVA TRUE
-			XCLASSPATH .
-			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
-		}
-		common0
-		{
-			SOLAR_ENV_ROOT r:
-			SOLAR_SOURCE_ROOT o:
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/MinGW
-			#			FSDK %SOLAR_ENV_ROOT%$/msvc7net$/FrameworkSDK
-			DEVROOT %SOLAR_ENV_ROOT%
-			NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
-			PERL %SOLAR_ENV_ROOT%$/btw$/perl$/bin$/perl
-			PKGFORMAT some_dummy
-			PSDK %SOLAR_ENV_ROOT%$/MinGW$/w32api
-			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc7net$/Common7$/ide
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
-            BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
-			CALL_CDECL TRUE
-			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-			COM GCC
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			COMP_ENV wntgcci1
-			CPU I
-			CPUNAME INTEL
-			CVER M1300
-			DYNAMIC_CRT TRUE
-			ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
-			GUI WNT
-			GUIBASE WIN
-			GVER NT351
-			INPATH wntgcci1%PROEXT%
-			OS WNT
-			OUTPATH wntgcci1
-			SET_EXEPTIONS TRUE
-			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
-			SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
-			SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
-			SOLAR_STLPATH %SOLARVERSION%$/wntgcci1%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SORT sort -T %TMP%
-			use_shl_versions TRUE
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%$/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk141
-			JAVAHOME %JDK14PATH%
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%$/include$/win32$:%JDK14PATH%$/include
-			JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
-			JDKLIB -L%JDK14PATH%$/lib
-			JDKLIBS -L%JDK14PATH%$/lib
-			JDKPATH %JDK14PATH%$/bin
-			JDK_VERSION 142
-			JREPATH %JDK14PATH%$/jre$/bin$/client
-			XCLASSPATH .$:%JDK14PATH%$/jre$/lib$/rt.jar
-		}
-		jdk14path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk151
-			JAVAHOME %JDK15PATH%
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%$/include$/win32$:%JDK15PATH%$/include
-			JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
-			JDKLIB -L%JDK15PATH%$/lib
-			JDKLIBS -L%JDK15PATH%$/lib
-			JDKPATH %JDK15PATH%$/bin
-			JDK_VERSION 150
-			JREPATH %JDK15PATH%$/jre$/bin$/client
-			XCLASSPATH .$:%JDK15PATH%$/jre$/lib$/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		psdk
-		{
-			PSDK %STAR_PSDK%
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-	}
-	extern
-	{
-		COMSPEC
-		DIST_ROOT
-		ENV_ROOT
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
-	reset
-	{
-		COPYALL
-		NSIS_PATH
-		SOLAR_ENV_ROOT
-		WST
-	}
-	script
-	{
-		csh
-		{
-			150: setenv MYENV_PATH $PATH
-			160: setenv PATH $SSX_PATH
-			200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			260: setenv PATH $MYENV_PATH
-			270: unsetenv MYENV_PATH
-			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
-			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
-			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
-			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
-		}
-		sh
-		{
-			150: export MYENV_PATH=$PATH
-			160: export PATH=$SSX_PATH
-			260: export PATH=$MYENV_PATH
-			270: unset MYENV_PATH
-			400: if [ $COPYALL ]; then
-			410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			415: fi
-			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			851: export SO_GEN_ERROR
-			852: fi
-			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			861: export SO_GEN_ERROR
-			862: fi
-			870: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-			871: echo $SO_GEN_ERROR
-			872: fi
-			880: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-			881: echo $SO_GEN_ERROR
-			882: fi
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		pro
-		psdk STAR_PSDK
-		sourceroot
-	}
-}
-wntmsci11
-{
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT %SOURCE_ROOT_TMP%
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			COMPATH %SOL_TMP%$/r$/msvc8p
-			COMPROOT %SOL_TMP%$/r$/msvc8p
-			COPYALL TRUE
-			COPY_PACKED TRUE
-			DEVROOT %SOL_TMP%$/r
-			DSDK %SOL_TMP%$/r$/msvc8p$/DirectXSDK
-			FSDK %SOL_TMP%$/r$/msvc8p$/Sdk$/v2.0
-			PCLEAN_PATH %SOLARROOT%$/etw
-			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-			PSDK %SOL_TMP%$/r$/msvc8p$/PlatformSDK
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc8p$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		cax
-		{
-			COMPATH %SOL_TMP%$/r$/msvc8p
-			COMPROOT %SOL_TMP%$/r$/msvc8p
-			COPYALL FALSE
-			DSDK %COMPATH%$/DirectXSDK
-			FSDK %COMPATH%$/Sdk$/v2.0
-			PCLEAN_PATH %SOL_TMP%$/r$/etw
-			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
-			PSDK %COMPATH%$/PlatformSDK
-			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/ide
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-		}
-		common
-		{
-			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
-			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			*deliver %PERL% %SOLARENV%$/bin$/deliver.pl
-			*mkout %PERL% %SOLARENV%$/bin$/mkout.pl
-			*mwscommit %PERL% %COMMON_ENV_TOOLS%/mwscommit.pl
-			*o cdd %SOLARENV%$/..
-			*r cdd %SOLARROOT%
-			*s cdd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-			BIG_SVX
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
-			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
-			DMAKEROOT %SOLARENV%$/inc$/startup
-			ILIB .$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/vc$/lib$:%PSDK%$/lib$:%FSDK%$/lib$:%DSDK%$/lib$/x86
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			LIB .$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/vc$/lib$:%PSDK%$/lib$:%FSDK%$/lib$:%DSDK%$/lib$/x86$:%SOLAR_STLLIBPATH%
-			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
-			MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%/mwscommit.pl
-			PATH %PATH%$:%SHARED_COM_SDK_PATH%$:%PSDK%$/vc$/bin$:%PSDK%$/bin$:%FSDK%$/bin$:%DSDK%$/bin$/Utilities$/bin$/x86$:%PACKMS%
-			PROF_EDITION TRUE
-			PSDKINC -I%PSDK%$/vc$/include -I%PSDK%$/include -I%COMPATH%$/PlatformSDK_VC8$/include
-			SOLAREXTRAINC -I%DSDK%$/include
-			SOLAR_JAVA TRUE
-			TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
-			VISTA_MANIFEST TRUE
-			WINDOWS_VISTA_PSDK TRUE
-			XCLASSPATH .
-			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
-		}
-		common0
-		{
-			BS_ROOT n:
-			SOLAR_ENV_ROOT r:
-			SOLAR_SOURCE_ROOT o:
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/msvc8p
-			COMPROOT %SOLAR_ENV_ROOT%$/msvc8p
-			DEVROOT %SOLAR_ENV_ROOT%
-			DSDK %SOLAR_ENV_ROOT%$/msvc8p$/DirectXSDK
-			FSDK %SOLAR_ENV_ROOT%$/msvc8p$/Sdk$/v2.0
-			PERL %SOLAR_ENV_ROOT%$/btw$/perl$/bin$/perl
-            PKGFORMAT msi
-			PSDK %SOLAR_ENV_ROOT%$/msvc8p$/PlatformSDK
-			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc8p$/Common7$/ide
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
-            BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
-			CALL_CDECL TRUE
-			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-			COM MSC
-			COMEX 11
-			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			COMP_ENV wntmsci11
-			CPU I
-			CPUNAME INTEL
-			CVER M1400
-			DYNAMIC_CRT TRUE
-			ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
-			GUI WNT
-			GUIBASE WIN
-			GVER NT351
-			INPATH wntmsci11%PROEXT%
-			OS WNT
-			OUTPATH wntmsci11
-			PACKMS %SO_PACK%$/wntmsci11$/MS
-			SET_EXEPTIONS TRUE
-			SHIPDRIVE %BS_ROOT%$/ship$/install
-			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
-			SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
-			SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
-			SOLAR_STLPATH %SOLARVERSION%$/wntmsci11%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SORT sort -T %TMP%
-			use_shl_versions TRUE
-		}
-		compath
-		{
-			COMPATH %STAR_COMPATH%
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
-			SOLARVER %DIST_ROOT%$/%WORK_STAMP%
-			SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT %ENV_ROOT%
-		}
-		jdk14
-		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk141
-			JAVAHOME %JDK14PATH%
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%$/include$/win32$:%JDK14PATH%$/include
-			JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
-			JDKLIB %JDK14PATH%$/lib
-			JDKLIBS %JDK14PATH%$/lib
-			JDKPATH %JDK14PATH%$/bin
-			JDK_VERSION 142
-			JREPATH %JDK14PATH%$/jre$/bin$/client
-			XCLASSPATH .$:%JDK14PATH%$/jre$/lib$/rt.jar
-		}
-		jdk14path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH %JDK_PATH%
-		}
-		jdk15
-		{
-			HOMEDRIVE %DEVROOT%
-			HOMEPATH $/jdk151
-			JAVAHOME %JDK15PATH%
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%$/include$/win32$:%JDK15PATH%$/include
-			JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
-			JDKLIB %JDK15PATH%$/lib
-			JDKLIBS %JDK15PATH%$/lib
-			JDKPATH %JDK15PATH%$/bin
-			JDK_VERSION 150
-			JREPATH %JDK15PATH%$/jre$/bin$/client
-			XCLASSPATH .$:%JDK15PATH%$/jre$/lib$/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH %JDK_PATH%
-		}
-		psdk
-		{
-			PSDK %STAR_PSDK%
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
-			SOURCE_ROOT_USED TRUE
-		}
-	}
-	extern
-	{
-		COMSPEC
-		DIST_ROOT
-		ENV_ROOT
-		JDK_PATH
-		LOCALINI
-		SOL_TMP
-		SOURCE_ROOT
-	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
-	reset
-	{
-		COPYALL
-		SOLAR_ENV_ROOT
-		WST
-	}
-	script
-	{
-		post
-		{
-			150: set MYENV_PATH=%PATH
-			160: set PATH=%SSX_PATH
-			200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %BTARGET% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-			260: set PATH=%MYENV_PATH
-			270: unset MYENV_PATH
-			400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR%
-			401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2%
-		}
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		pro
-		psdk STAR_PSDK
-		sourceroot
-	}
-}
-wntmsci12
-{
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
-			SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			BUILD_TOOLS %SOL_TMP%$/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%$/r$/etw$/%WORK_STAMP%
-			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
-			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			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
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
-
-		}
-		cax
-		{
-			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%$/r$/etw$/%WORK_STAMP%
-			FSDK %COMPATH%$/Sdk$/v3.5
-			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-			PCLEAN_PATH %SOL_TMP%$/r$/etw
-			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %COMPATH%$/PlatformSDK$/v6.1
-			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
-		}
-		common
-		{
-			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
-			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
-			*deliver %PERL% %SOLARENV%$/bin$/deliver.pl
-			*mkout %PERL% %SOLARENV%$/bin$/mkout.pl
-			*mwscommit %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
-			*o cd %SOLARENV%$/..
-			*r cd %SOLARROOT%
-			*s cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-			*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
-			BIG_SVX
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
-			CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
-			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
-			DMAKEROOT %SOLARENV%$/inc$/startup
-			ENABLE_PCH TRUE
-			ILIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			LIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86;%SOLAR_STLLIBPATH%
-			LIBMGR_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/lib.exe
-			LINK_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/link.exe
-			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
-			MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
-			OJDK16PATH %SOLAR_OJDK16PATH%
-			PATH $cp(%PSDK%$/Bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
-			PROF_EDITION TRUE
-			PSDKINC -I%PSDK%$/include
-			SOLAREXTRAINC -I%DSDK%$/include
-			SOLAR_JAVA TRUE
-			TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
-			USE_DIRECTX5 TRUE
-			WINDOWS_VISTA_PSDK TRUE
-			SYSBASE TRUE
-            WITH_VC_REDIST TRUE
-			XCLASSPATH .
-			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
-			BUILD_X64 TRUE
-			CHECK_LUCENCE_INDEXER_OUTPUT TRUE
-		}
-		common0
-		{
-			BS_ROOT n:
-			SOLAR_ENV_ROOT r:
-			SOLAR_SOURCE_ROOT o:
-			BTOOLDIR %WORK_STAMP%$/cygtools
-			PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
-		}
-		common02
-		{
-			PERL perl
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/msvc9p
-			COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
-			DEVROOT %SOLAR_ENV_ROOT%
-			DSDK %SOLAR_ENV_ROOT%$/msvc9p$/DirectXSDK
-			FSDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v3.5
-			F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
-			PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
-            PKGFORMAT msi
-			PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/v6.1
-			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-#			TEMP $dp(%TEMP%)
-#			TMP $dp(%TMP%)
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
-            BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
-			CALL_CDECL TRUE
-			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
-			COM MSC
-			COMEX 12
-			COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools)
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			COMP_ENV wntmsci12
-			CPU I
-			CPUNAME INTEL
-			CVER M1500
-			DYNAMIC_CRT TRUE
-			ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
-			GUI WNT
-			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
-			PACKMS %SO_PACK%$/wntmsci12$/MS
-			SET_EXEPTIONS TRUE
-			SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install
-			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
-			SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
-			SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
-			SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586
-			SOLAR_STLPATH %SOLARVERSION%$/wntmsci12%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SORT sort -T %TMP%
-#			TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe
-			use_shl_versions TRUE
-		}
-		common:3 IF %UPDATER% == YES
-		{
-			SHIPDRIVE %BS_ROOT%$/ship$/install
-		}
-		compath
-		{
-			COMPATH $dp(%STAR_COMPATH%)
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
-			SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%)
-			SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
-		}
-		jdk14
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/jdk141
-			JAVAHOME %JDK14PATH%
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
-			JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
-			JDKLIB %JDK14PATH%$/lib
-			JDKLIBS %JDK14PATH%$/lib
-			JDKPATH %JDK14PATH%$/bin
-			JDK_VERSION 142
-			JREPATH %JDK14PATH%$/jre$/bin$/client
-			XCLASSPATH .;%JDK14PATH%$/jre$/lib$/rt.jar
-		}
-		jdk14path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH $dp(%JDK_PATH%)
-		}
-		jdk15
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/jdk151
-			JAVAHOME %JDK15PATH%
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
-			JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
-			JDKLIB %JDK15PATH%$/lib
-			JDKLIBS %JDK15PATH%$/lib
-			JDKPATH %JDK15PATH%$/bin
-			JDK_VERSION 150
-			JREPATH %JDK15PATH%$/jre$/bin$/client
-			XCLASSPATH .;%JDK15PATH%$/jre$/lib$/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH $dp(%JDK_PATH%)
-		}
-		ojdk16
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/openjdk-6-b08-windows-i586
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include
-			JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32
-			JDKLIB %OJDK16PATH%$/lib
-			JDKLIBS %OJDK16PATH%$/lib
-			JDKPATH %OJDK16PATH%$/bin
-			JDK_VERSION 160
-			JREPATH %OJDK16PATH%$/jre$/bin$/client
-			XCLASSPATH .;%OJDK16PATH%$/jre$/lib$/rt.jar
-		}
-		ojdk16path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH $dp(%JDK_PATH%)
-		}
-		pro
-		{
-			RES_ENUS TRUE
-		}
-		psdk
-		{
-			PSDK $dp(%STAR_PSDK%)
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
-			SOURCE_ROOT_USED TRUE
-		}
-		tmp
-		{
-			SOL_TMP $dp(%SOL_TMP_DIR%)
-		}
-	}
-	extern
-	{
-		COMSPEC
-		DIST_ROOT
-		ENV_ROOT
-		JDK_PATH
-		LOCALINI
-		OSTYPE
-		$dp(SOL_TMP)
-		$dp(SOURCE_ROOT)
-		$dp(TMP)
-		$dp(TEMP)
-	}
-	order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
-	reset
-	{
-		COPYALL
-		CXX_X64_BINARY
-		DB2IMP
-		GCRINC
-		GCRLIB
-		GCRPATH
-		LIBMGR_X64_BINARY
-		LINK_X64_BINARY
-		NSIS_PATH
-		OLD_CHAOS
-		PERLDIR
-		SOLAR_ENV_ROOT
-		TFDEF
-		TFDIR
-		WST
-	}
-	script
-	{
-         sh
-            {
-            400: if [ $COPYALL ]; then
-            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            415: fi
-            600: umask 002
-            800: hash -r
-            820: wrapfetch.sh
-            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-            851:       export SO_GEN_ERROR
-            852: fi
-            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-            861:       export SO_GEN_ERROR2
-            862: fi
-            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-            871:       echo $SO_GEN_ERROR
-            872: fi
-            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-            881:       echo $SO_GEN_ERROR2
-            882: fi
-        }
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		psdk STAR_PSDK
-		sourceroot
-		tmp SOL_TMP_DIR
-	}
-}
-wntmsci13
-{
-	environment
-	{
-		bs_sourceroot
-		{
-			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
-			SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
-			SOURCE_ROOT_USED TRUE
-		}
-		cap
-		{
-			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%$/r$/etw$/%WORK_STAMP%
-			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
-			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			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
-			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
-
-		}
-		cax
-		{
-			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%$/r$/etw$/%WORK_STAMP%
-			FSDK %COMPATH%$/Sdk$/v3.5
-			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
-			PCLEAN_PATH %SOL_TMP%$/r$/etw
-			PERL %SOL_TMP%$/r$/%PERLDIR%
-			PSDK %COMPATH%$/PlatformSDK$/v6.1
-			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
-			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOL_TMP%$/r
-			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
-			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
-#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
-		}
-		common
-		{
-			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
-			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
-			*copyprj %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
-			*deliver %PERL% %SOLARENV%$/bin$/deliver.pl
-			*mkout %PERL% %SOLARENV%$/bin$/mkout.pl
-			*mwscommit %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
-			*o cd %SOLARENV%$/..
-			*r cd %SOLARROOT%
-			*s cd %SOLARVERSION%
-			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
-			*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
-			BIG_SVX
-			COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
-			CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
-			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
-			DMAKEROOT %SOLARENV%$/inc$/startup
-			ENABLE_PCH TRUE
-			ILIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86
-			JDK13PATH %SOLAR_JDK13PATH%
-			JDK14PATH %SOLAR_JDK14PATH%
-			JDK15PATH %SOLAR_JDK15PATH%
-			LIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86;%SOLAR_STLLIBPATH%
-			LIBMGR_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/lib.exe
-			LINK_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/link.exe
-			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
-			MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
-			OJDK16PATH %SOLAR_OJDK16PATH%
-			PATH $cp(%PSDK%$/Bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
-			PROF_EDITION TRUE
-			PSDKINC -I%PSDK%$/include
-			SOLAREXTRAINC -I%DSDK%$/include
-			SOLAR_JAVA TRUE
-			TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
-			USE_DIRECTX5 TRUE
-			WINDOWS_VISTA_PSDK TRUE
-			SYSBASE TRUE
-            WITH_VC_REDIST TRUE
-			XCLASSPATH .
-			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
-			BUILD_X64 TRUE
-		}
-		common0
-		{
-			BS_ROOT n:
-			SOLAR_ENV_ROOT r:
-			SOLAR_SOURCE_ROOT o:
-			BTOOLDIR %WORK_STAMP%$/cygtools
-			PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
-		}
-		common02
-		{
-			PERL perl
-		}
-		common1
-		{
-			COMPATH %SOLAR_ENV_ROOT%$/msvc9p
-			COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
-			DEVROOT %SOLAR_ENV_ROOT%
-			DSDK %SOLAR_ENV_ROOT%$/msvc9p$/DirectXSDK
-			FSDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v3.5
-			F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0
-			NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
-			PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
-            PKGFORMAT msi
-			PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/v6.1
-			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
-			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
-			SOLARROOT %SOLAR_ENV_ROOT%
-			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
-			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
-			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
-#			TEMP $dp(%TEMP%)
-#			TMP $dp(%TMP%)
-		}
-		common2
-		{
-			ENABLE_GRAPHITE TRUE
-            BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
-			CALL_CDECL TRUE
-			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
-			COM MSC
-			COMEX 12
-			COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools)
-			COMMON_ENV_TOOLS %SOLARROOT%$/etools
-			COMP_ENV wntmsci13
-			CPU I
-			CPUNAME INTEL
-			CVER M1500
-			DYNAMIC_CRT TRUE
-			ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
-			GUI WNT
-			GUIBASE WIN
-			GVER NT351
-			INPATH wntmsci13%PROEXT%
-			MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
-			OS WNT
-			OUTPATH wntmsci13
-			PACKMS %SO_PACK%$/wntmsci13$/MS
-			SET_EXEPTIONS TRUE
-			SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install
-			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
-			SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
-			SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
-			SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586
-			SOLAR_STLPATH %SOLARVERSION%$/wntmsci13%PROEXT%$/inc%UPDMINOREXT%$/stl
-			SORT sort -T %TMP%
-#			TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe
-			use_shl_versions TRUE
-		}
-		common:3 IF %UPDATER% == YES
-		{
-			SHIPDRIVE %BS_ROOT%$/ship$/install
-		}
-		compath
-		{
-			COMPATH $dp(%STAR_COMPATH%)
-		}
-		distroot:0 if X%DIST_ROOT%X != XX
-		{
-			SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
-			SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%)
-			SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
-		}
-		envroot:0 IF X%ENV_ROOT%X != XX
-		{
-			SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
-		}
-		jdk14
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/jdk141
-			JAVAHOME %JDK14PATH%
-			JAVA_HOME %JDK14PATH%
-			JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
-			JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
-			JDKLIB %JDK14PATH%$/lib
-			JDKLIBS %JDK14PATH%$/lib
-			JDKPATH %JDK14PATH%$/bin
-			JDK_VERSION 142
-			JREPATH %JDK14PATH%$/jre$/bin$/client
-			XCLASSPATH .;%JDK14PATH%$/jre$/lib$/rt.jar
-		}
-		jdk14path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK14PATH $dp(%JDK_PATH%)
-		}
-		jdk15
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/jdk151
-			JAVAHOME %JDK15PATH%
-			JAVA_HOME %JDK15PATH%
-			JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
-			JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
-			JDKLIB %JDK15PATH%$/lib
-			JDKLIBS %JDK15PATH%$/lib
-			JDKPATH %JDK15PATH%$/bin
-			JDK_VERSION 150
-			JREPATH %JDK15PATH%$/jre$/bin$/client
-			XCLASSPATH .;%JDK15PATH%$/jre$/lib$/rt.jar
-		}
-		jdk15path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_JDK15PATH $dp(%JDK_PATH%)
-		}
-		ojdk16
-		{
-#			HOMEDRIVE %DEVROOT%
-#			HOMEPATH $/openjdk-6-b08-windows-i586
-			JAVA_HOME %OJDK16PATH%
-			JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include
-			JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32
-			JDKLIB %OJDK16PATH%$/lib
-			JDKLIBS %OJDK16PATH%$/lib
-			JDKPATH %OJDK16PATH%$/bin
-			JDK_VERSION 160
-			JREPATH %OJDK16PATH%$/jre$/bin$/client
-			XCLASSPATH .;%OJDK16PATH%$/jre$/lib$/rt.jar
-		}
-		ojdk16path:0 if X%JDK_PATH%X != XX
-		{
-			SOLAR_OJDK16PATH $dp(%JDK_PATH%)
-		}
-		pro
-		{
-			RES_ENUS TRUE
-		}
-		psdk
-		{
-			PSDK $dp(%STAR_PSDK%)
-		}
-		sourceroot:0 if X%SOURCE_ROOT%X != XX
-		{
-			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
-			SOURCE_ROOT_USED TRUE
-		}
-		tmp
-		{
-			SOL_TMP $dp(%SOL_TMP_DIR%)
-		}
-	}
-	extern
-	{
-		COMSPEC
-		DIST_ROOT
-		ENV_ROOT
-		JDK_PATH
-		LOCALINI
-		OSTYPE
-		$dp(SOL_TMP)
-		$dp(SOURCE_ROOT)
-		$dp(TMP)
-		$dp(TEMP)
-	}
-	order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
-	reset
-	{
-		COPYALL
-		CXX_X64_BINARY
-		DB2IMP
-		GCRINC
-		GCRLIB
-		GCRPATH
-		LIBMGR_X64_BINARY
-		LINK_X64_BINARY
-		NSIS_PATH
-		OLD_CHAOS
-		PERLDIR
-		SOLAR_ENV_ROOT
-		TFDEF
-		TFDIR
-		WST
-	}
-	script
-	{
-         sh
-            {
-            400: if [ $COPYALL ]; then
-            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
-            415: fi
-            600: umask 002
-            800: hash -r
-            820: wrapfetch.sh
-            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
-            851:       export SO_GEN_ERROR
-            852: fi
-            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
-            861:       export SO_GEN_ERROR2
-            862: fi
-            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
-            871:       echo $SO_GEN_ERROR
-            872: fi
-            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
-            881:       echo $SO_GEN_ERROR2
-            882: fi
-        }
-	}
-	switches
-	{
-       	bs_sourceroot SOURCE_ROOT_TMP
-		bsclient
-		cap
-		cax
-		compath STAR_COMPATH
-		distroot
-		envroot
-		jdk14
-		jdk14path
-		jdk15
-		jdk15path
-		l10n L10N_framework
-		ojdk16
-		ojdk16path
-		pro
-		psdk STAR_PSDK
-		sourceroot
-		tmp SOL_TMP_DIR
-	}
-}
-
diff --git a/solenv/config/sooo330.ini b/solenv/config/sooo330.ini
new file mode 100644
index 000000000000..3e80e1460885
--- /dev/null
+++ b/solenv/config/sooo330.ini
@@ -0,0 +1,3554 @@
+common
+{
+	environment
+	{
+		common
+		{
+			ADDED_MODULES solenv default_images custom_images ooo_custom_images external_images postprocess instset_native instsetoo_native smoketest_native smoketestoo_native
+			BIG_SVX TRUE
+			BMP_WRITES_FLAG TRUE
+			BUILD_SPECIAL TRUE
+			BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS 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
+			DIC_ALL TRUE
+			ENABLEUNICODE TRUE
+			ENABLE_AGG YES
+			ENABLE_CUPS TRUE
+			ENABLE_DIRECTX TRUE
+			ENABLE_FONTCONFIG TRUE
+			ENABLE_GCONF TRUE
+			ENABLE_GNOMEVFS TRUE
+			ENABLE_GTK TRUE
+			ENABLE_MEDIAWIKI YES
+			ENABLE_MINIMIZER YES
+ 			ENABLE_MYSQLC YES
+			ENABLE_NSS_MODULE YES
+			ENABLE_RANDR TRUE
+			ENABLE_REPORTBUILDER YES
+			ENABLE_SVCTAGS YES
+			ENABLE_VBA YES
+			ISERVER iserver.germany.sun.com
+			LU_HGFLAG ""
+			LU_NOSOURCE ""
+			LU_RFLAG ""
+			NEW_JAR_PACK TRUE
+			NO_REC_RES TRUE
+			OOODMAKEMODE YES
+            OOO_SHELL /bin/bash
+			PCLEAN_PATH xxx
+			RES_ENUS TRUE
+			RES_GER TRUE
+			rsc_once TRUE
+			SHIPDRIVE /so/install
+			STLPORT4 NO_STLPORT4
+			STLPORT_VER 400
+			WITH_FONTOOO YES
+			WITH_LDAP YES
+			wrapper_override_cc_wrapper TRUE
+			MAXPROC maxproc=15
+		}
+		common:0 IF %UPDATER% == YES
+		{
+			DEFAULT_TO_ENGLISH_FOR_PACKING 1
+			DELIVER_TO_ZIP TRUE
+			DISABLE_SAL_DBGBOX 1
+		}
+		common:1 IF X%CWS_WORK_STAMP%X != XX
+		{
+			CWS_WORK_STAMP_EXT _%CWS_WORK_STAMP%
+		}
+		common:2 IF %UPDATER% == YES
+		{
+			WITH_LANG en-US de
+            BUILD_TYPE l10n
+		}
+		common:3 IF %UPDATER% != YES
+		{
+		}
+		crashdump
+		{
+			ENABLE_CRASHDUMP TRUE
+		}
+		hg
+		{
+			LU_HGFLAG hg_source
+		}
+		maxproc
+		{
+			MAXPROC maxproc=%MAXPROCESS%
+		}
+		minorext
+		{
+			UPDMINOREXT .%UPDMINOR%
+		}
+		nosource
+		{
+			LU_NOSOURCE no_source
+		}
+		pro:0 IF %UPDATER% == YES
+		{
+			DELIVER_TO_ZIP TRUE
+			product full
+			PROEXT .pro
+			PROFULLSWITCH product=full
+			WITH_LANG en-US de es fr hu it ja ko nl pl pt pt-BR ru sv th tr zh-CN zh-TW ar
+		}
+		pro:1 IF %UPDATER% != YES
+		{
+			product full
+			PROEXT .pro
+			PROFULLSWITCH product=full
+		}
+		r_only
+		{
+			LU_RFLAG r_only
+		}
+		tmp
+		{
+			SOL_TMP %SOL_TMP_DIR%
+		}
+		verbose
+		{
+			VERBOSE VERBOSE
+		}
+	}
+	extern
+	{
+		ENVROOT
+		PATH
+		SRC_ROOT
+		UPDATER
+	}
+	order minorext common:2 common:3 pro:0 pro:1 common common:0 cwsname common:1 tmp crashdump maxproc hg r_only nosource
+	reset
+	{
+		ALT_L10N_MODULE
+		ENVCFLAGS
+		HOMEDRIVE
+		HOMEPATH
+		JAVAHOME
+		JAVA_HOME
+ 		LU_HGFLAG
+ 		LU_NOSOURCE
+ 		LU_RFLAGS
+        MKDIRHIER
+		PROEXT
+		PROFULLSWITCH
+		SHIPDRIVE
+		SOLARSRC
+		SOLAR_JAVA
+		SPEW
+		STLPORT4
+		UPDMINOREXT
+		WITH_FONTOOO
+		WITH_LANG
+	}
+	restore
+	{
+		PATH
+	}
+	standlst
+	{
+		DRIVE_O %WORK_STAMP%/drives/o:/UnixVolume
+		DRIVE_S %WORK_STAMP%/drives/s:/UnixVolume
+	}
+	switches
+	{
+		crashdump
+		cwsname CWS_WORK_STAMP
+		envroot
+		hg
+		minorext
+		nosource
+		pro
+		maxproc MAXPROCESS
+		r_only
+		tmp SOL_TMP_DIR
+		verbose VERBOSE
+	}
+}
+finish
+{
+	environment
+	{
+		cap
+		{
+			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
+		}
+		cax
+		{
+			SOLARSRC %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+			SOURCE_ROOT_DIR $expand(%SOLARSRC%/..)
+		}
+		common_0:0 IF %OS% == MACOSX
+		{
+			ENABLE_GCONF
+			ENABLE_GNOMEVFS
+			ENABLE_GTK
+			SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% -I%SOLARENV%$/%OUTPATH%$/inc -I%SOLARENV%$/inc %SOLAREXTRAINC%
+		}
+		common_0:3 IF %SOLARINCLUDES% ==
+		{
+			SOLARINCLUDES -I%SOLARVERSION%$/%INPATH%$/inc%UPDMINOREXT% %PSDKINC% -I%COMPATH%$/include -I%SOLARENV%$/inc %SOLAREXTRAINC%
+		}
+		common_1
+		{
+        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
+		{
+			MWS_BUILD TRUE
+		}
+		common_a
+		{
+			*o: cd %SOLARSRC%
+			ALT_L10N_MODULE $expand(%SOLARSRC%/..)/sun/l10n_so
+			TARFILE_LOCATION %SOURCE_ROOT_DIR%/ext_sources
+		}
+		common_jre:0 IF %JREPATH% ==
+		{
+			HIER set
+		}
+		common_jre:1 IF %LD_LIBRARY_PATH% ==
+		{
+			PATH %PATH%$:$cp(%JREPATH%)
+		}
+		cwsname:0 IF X%SOURCE_ROOT_USED%X == XX
+		{
+			*build
+			*deliver
+			DMAKEROOT SOURCE_ROOT_not_used
+			SOLARINC SOURCE_ROOT_not_used
+			SOLARINCLUDE SOURCE_ROOT_not_used
+			SOLARSRC SOURCE_ROOT_not_used
+			SOLARVER SOURCE_ROOT_not_used
+			SOLARVERSION SOURCE_ROOT_not_used
+			SOLAR_SOURCE_ROOT SOURCE_ROOT_not_used
+			SO_GEN_ERROR Error - Using -cwsname without -sourceroot switch is harmful...
+			SO_GEN_ERROR2 ...resetting path to source tree
+			SRC_ROOT SOURCE_ROOT_not_used
+		}
+		cwsname:1 IF X%SOURCE_ROOT%X == XX
+		{
+			*build
+			*deliver
+			DMAKEROOT SOURCE_ROOT_not_set
+			SOLARINC SOURCE_ROOT_not_set
+			SOLARINCLUDE SOURCE_ROOT_not_set
+			SOLARSRC SOURCE_ROOT_not_set
+			SOLARVER SOURCE_ROOT_not_set
+			SOLARVERSION SOURCE_ROOT_not_set
+			SOLAR_SOURCE_ROOT SOURCE_ROOT_not_set
+			SO_GEN_ERROR Error - Using -cwsname without SOURCE_ROOT set is harmful...
+			SO_GEN_ERROR2 ...resetting path to source tree
+			SRC_ROOT SOURCE_ROOT_not_set
+		}
+		cwsname:2 IF X%UPDMINOR%X == XX
+		{
+			*build
+			*deliver
+			DMAKEROOT UPDMINOR_not_used
+			SOLARINC UPDMINOR_not_used
+			SOLARINCLUDE UPDMINOR_not_used
+			SOLARSRC UPDMINOR_not_used
+			SOLARVER UPDMINOR_not_used
+			SOLARVERSION UPDMINOR_not_used
+			SOLAR_SOURCE_ROOT UPDMINOR_not_used
+			SO_GEN_ERROR Error - Using -cwsname without -ver switch is harmful...
+			SO_GEN_ERROR2 ...resetting path to source tree
+			SRC_ROOT UPDMINOR_not_used
+		}
+		jdk14
+		{
+			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
+			ILIB %LIB%$;%JDKLIB%
+			LIB %LIB%$;%JDKLIB%
+            JAVA_TARGET_FLAG -target 1.4
+		}
+		jdk15
+		{
+			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
+			ILIB %LIB%$;%JDKLIB%
+			LIB %LIB%$;%JDKLIB%
+            JAVA_TARGET_FLAG -target 1.5
+		}
+		l10n
+		{
+			framework %L10N_framework%
+			L10N-framework %L10N_framework%
+		}
+		ojdk16
+		{
+			CLASSPATH .$;%JAVA_HOME%$/jre$/lib$/rt.jar
+			ILIB %LIB%$;%JDKLIB%
+			LIB %LIB%$;%JDKLIB%
+            JAVA_TARGET_FLAG -target 1.6
+		}
+	}
+	order cwsname:0 cwsname:1 cwsname:2 common_0:0 common_0:1 common_0:2 common_0:3 jdk14 jdk15 ojdk16 common_1 common_2:0 l10n common_jre:0 common_jre:1 cax cap common_a
+	switches
+	{
+		cwsname CWS_WORK_STAMP
+	}
+}
+unxfbsdi
+{
+	environment
+	{
+		bs_sourceroot
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT_USED TRUE
+		}
+		cap
+		{
+			COPYALL TRUE
+			COPY_PACKED TRUE
+			DEVROOT %SOL_TMP%$/r
+			PCLEAN_PATH %SOLARROOT%/etools
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		cax
+		{
+			COPYALL FALSE
+			DEVROOT %SOL_TMP%$/r
+			PCLEAN_PATH %SOL_TMP%$/r/etools
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		common
+		{
+			*build nice perl %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+			*build_client nice perl %SOLARENV%/bin/build_client.pl
+			*copyprj perl %COMMON_ENV_TOOLS%/copyprj.pl
+			*deliver perl %SOLARENV%/bin/deliver.pl
+			*mkout perl %SOLARENV%/bin/mkout.pl
+			*r: cd %SOLARROOT%
+			*s: cd %SOLARVERSION%
+			*zipdep perl %SOLARENV%/bin/zipdep.pl
+			COPYPRJ perl %COMMON_ENV_TOOLS%/copyprj.pl
+			DELIVER perl %SOLARENV%/bin/deliver.pl
+			DMAKEROOT %SOLARENV%/inc/startup
+			LD_LIBRARY_PATH .:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:%COMPATH%/libexec
+			MKOUT perl %SOLARENV%/bin/mkout.pl
+			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
+			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
+			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
+			SOLAR_JAVA TRUE
+			ZIPDEP perl %SOLARENV%/bin/zipdep.pl
+		}
+		common0
+		{
+			SOLAR_ENV_ROOT /so/env
+			SOLAR_SOURCE_ROOT %DRIVE_O%
+		}
+		common1
+		{
+			COMPATH %SOLAR_ENV_ROOT%$/gcc_3.0.1_linux_libc2.11_turbolinux
+			DEVROOT %SOLAR_ENV_ROOT%
+			PKGFORMAT some_dummy
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+			SOLARROOT %SOLAR_ENV_ROOT%
+			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.3.1
+			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2_11
+			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_06
+			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+		}
+		common2
+		{
+			BUILD_TOOLS %SOLARROOT%/bt_unxfbsdi/bin
+			COM GCC
+			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+			COMMON_ENV_TOOLS %SOLARROOT%$/etools
+			CPU I
+			CPUNAME INTEL
+			CVER C300
+			ENV_TOOLS %SOLARROOT%/et_unxfbsdi/bin
+			GUI UNX
+			GUIBASE unx
+			GVER VCL
+			INPATH unxfbsdi%PROEXT%
+			JDK13PATH %SOLAR_JDK13PATH%
+			JDK14PATH %SOLAR_JDK14PATH%
+			JDK15PATH %SOLAR_JDK15PATH%
+			NO_BSYMBOLIC True
+			OS FREEBSD
+			OUTPATH unxfbsdi
+			SOLAR_STLLIBPATH %SOLARVERSION%$/unxfbsdi%PROEXT%$/lib%UPDMINOREXT%
+			SOLAR_STLPATH %SOLARVERSION%$/unxfbsdi%PROEXT%$/inc%UPDMINOREXT%$/stl
+			SYSBASE %SOLAR_SYSBASE_ROOT%
+			TEMP /tmp
+			TMP /tmp
+		}
+		compath
+		{
+			COMPATH %STAR_COMPATH%
+		}
+		debug
+		{
+			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
+		}
+		distroot:0 if X%DIST_ROOT%X != XX
+		{
+			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+			SOLARVER %DIST_ROOT%/%WORK_STAMP%
+			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+		}
+		envroot:0 IF X%ENV_ROOT%X != XX
+		{
+			SOLAR_ENV_ROOT %ENV_ROOT%
+		}
+		jdk14
+		{
+			JAVA_HOME %JDK14PATH%
+			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
+			JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/linux
+			JDKLIB %JDK14PATH%/jre/lib:%JDK14PATH%/jre/lib/i386:%JDK14PATH%/jre/lib/i386/client
+			JDKLIBS -L%JDK14PATH%/jre/lib -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/jre/lib/i386/client
+			JDKPATH %JDK14PATH%/bin
+			JDK_VERSION 142
+			XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
+		}
+		jdk14path:0 IF X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK14PATH %JDK_PATH%
+		}
+		jdk15
+		{
+			JAVA_HOME %JDK15PATH%
+			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
+			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
+			JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/i386:%JDK15PATH%/jre/lib/i386/client
+			JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/jre/lib/i386/client
+			JDKPATH %JDK15PATH%/bin
+			JDK_VERSION 150
+			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+		}
+		jdk15path:0 IF X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK15PATH %JDK_PATH%
+		}
+		pro
+		{
+			PROSWITCH -DPRODUCT
+		}
+		sourceroot:0 IF X%SOURCE_ROOT%X != XX
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+			SOURCE_ROOT_USED TRUE
+		}
+		sysbaseroot
+		{
+			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+		}
+	}
+	extern
+	{
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
+	}
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15 debug
+	reset
+	{
+		CLASSPATH
+		COPYALL
+	}
+	restore
+	{
+		INCLUDE
+	}
+	script
+	{
+		csh 
+		{
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			600: umask 002
+			800: rehash
+            820: wrapfetch.sh
+			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+		}
+		sh
+		{
+			400: if [ $COPYALL ]; then
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			415: fi
+			600: umask 002
+			800: hash -r
+            820: wrapfetch.sh
+			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+			851: export SO_GEN_ERROR
+			852: fi
+			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+			861: export SO_GEN_ERROR2
+			862: fi
+			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+			871: echo $SO_GEN_ERROR
+			872: fi
+			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+			881: echo $SO_GEN_ERROR2
+			882: fi
+		}
+	}
+	switches
+	{
+       	bs_sourceroot SOURCE_ROOT_TMP
+		bsclient
+		cap
+		cax
+		compath STAR_COMPATH
+		debug
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
+		l10n L10N_framework
+		pro
+		sourceroot
+		sysbaseroot
+	}
+}
+unxlngi6
+{
+	environment
+	{
+		bs_sourceroot
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT_USED TRUE
+		}
+		cap
+		{
+			COPYALL TRUE
+			COPY_PACKED TRUE
+			DEVROOT %SOL_TMP%$/r
+			PCLEAN_PATH %SOLARROOT%/etools
+			PERL %SOL_TMP%$/r$/bt_linux_libc2.5$/%WORK_STAMP%$/bin$/perl
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		cax
+		{
+			COPYALL FALSE
+			DEVROOT %SOL_TMP%$/r
+			PCLEAN_PATH %SOL_TMP%$/r/etools
+			PERL %SOL_TMP%$/r$/bt_linux_libc2.5$/%WORK_STAMP%$/bin$/perl
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		common
+		{
+			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+			*deliver %PERL% %SOLARENV%/bin/deliver.pl
+			*mkout %PERL% %SOLARENV%/bin/mkout.pl
+			*r: cd %SOLARROOT%
+			*s: cd %SOLARVERSION%
+			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
+			DMAKEROOT %SOLARENV%/inc/startup
+			HAVE_GCC_VISIBILITY_FEATURE TRUE
+            HAVE_LD_BSYMBOLIC_FUNCTIONS TRUE
+            HAVE_LD_HASH_STYLE TRUE
+			LIBRARY_PATH %SYSBASE%/usr/lib
+			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
+			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
+			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
+			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
+			SOLAR_JAVA TRUE
+			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+		}
+		common0
+		{
+			SOLAR_ENV_ROOT /so/env
+			SOLAR_SOURCE_ROOT %DRIVE_O%
+			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux_libc2.5/glibc2.5
+		}
+		common1
+		{
+			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux_libc2.5
+			DEVROOT %SOLAR_ENV_ROOT%
+			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+			PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.5/%WORK_STAMP%/bin/perl
+			PKGFORMAT rpm
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+			SOLARROOT %SOLAR_ENV_ROOT%
+			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.3.1
+			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2_11
+			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_06
+			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
+			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+		}
+		common2
+		{
+			ENABLE_GRAPHITE TRUE
+            BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.5/%WORK_STAMP%/bin
+			COM GCC
+			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+			COMMON_ENV_TOOLS %SOLARROOT%$/etools
+			CPU I
+			CPUNAME INTEL
+			CVER C432
+			ENABLE_KAB TRUE
+			ENABLE_KDE TRUE
+			ENABLE_EVOAB2 TRUE
+			ENV_TOOLS %SOLARROOT%/et_linux_libc2.5/%WORK_STAMP%/bin
+			GUI UNX
+			GUIBASE unx
+			GVER VCL
+			INPATH unxlngi6%PROEXT%
+			JDK13PATH %SOLAR_JDK13PATH%
+			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
+			OUTPATH unxlngi6
+			RPM %SOLARENV%/bin/rpm-wrapper
+			SOLAR_STLLIBPATH %SOLARVERSION%$/unxlngi6%PROEXT%$/lib%UPDMINOREXT%
+			SOLAR_STLPATH %SOLARVERSION%$/unxlngi6%PROEXT%$/inc%UPDMINOREXT%$/stl
+			SYSBASE %SOLAR_SYSBASE_ROOT%
+			TEMP /tmp
+			TMP /tmp
+		}
+		common3:0 IF X%UPDATER%X == XX
+		{
+			FORCE2ARCHIVE TRUE
+		}
+		compath
+		{
+			COMPATH %STAR_COMPATH%
+		}
+		distroot:0 if X%DIST_ROOT%X != XX
+		{
+			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+			SOLARVER %DIST_ROOT%/%WORK_STAMP%
+			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+		}
+		envroot:0 IF X%ENV_ROOT%X != XX
+		{
+			SOLAR_ENV_ROOT %ENV_ROOT%
+		}
+		jdk14
+		{
+			JAVA_HOME %JDK14PATH%
+			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/linux
+			JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/linux
+			JDKLIB %JDK14PATH%/jre/lib:%JDK14PATH%/jre/lib/i386:%JDK14PATH%/jre/lib/i386/client
+			JDKLIBS -L%JDK14PATH%/jre/lib -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/jre/lib/i386/client
+			JDKPATH %JDK14PATH%/bin
+			JDK_VERSION 142
+			XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
+		}
+		jdk14path:0 IF X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK14PATH %JDK_PATH%
+		}
+		jdk15
+		{
+			JAVA_HOME %JDK15PATH%
+			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
+			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
+			JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/i386:%JDK15PATH%/jre/lib/i386/client:%JDK15PATH%/jre/lib/i386/xawt
+			JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/jre/lib/i386/client
+			JDKPATH %JDK15PATH%/bin
+			JDK_VERSION 150
+			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+		}
+		jdk15path:0 IF X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK15PATH %JDK_PATH%
+		}
+		ojdk16
+		{
+			JAVA_HOME %OJDK16PATH%
+			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
+			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
+			JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/jre/lib/i386/client:%OJDK16PATH%/jre/lib/i386/xawt
+			JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/jre/lib/i386/client
+			JDKPATH %OJDK16PATH%/bin
+			JDK_VERSION 160
+			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
+		}
+		ojdk16path:0 IF X%JDK_PATH%X != XX
+		{
+			SOLAR_OJDK16PATH %JDK_PATH%
+		}
+		pro
+		{
+			PROSWITCH -DPRODUCT
+		}
+		sourceroot:0 IF X%SOURCE_ROOT%X != XX
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+			SOURCE_ROOT_USED TRUE
+		}
+		sysbaseroot
+		{
+			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+		}
+	}
+	extern
+	{
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
+	}
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2 pro common3:0 common jdk14 jdk15 ojdk16
+	reset
+	{
+		CLASSPATH
+		COPYALL
+	}
+	restore
+	{
+		INCLUDE
+	}
+	script
+	{
+		csh 
+		{
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			600: umask 002
+			800: rehash
+            820: wrapfetch.sh
+			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+		}
+		sh
+		{
+			400: if [ $COPYALL ]; then
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			415: fi
+			600: umask 002
+			800: hash -r
+            820: wrapfetch.sh
+			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+			851: export SO_GEN_ERROR
+			852: fi
+			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+			861: export SO_GEN_ERROR2
+			862: fi
+			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+			871: echo $SO_GEN_ERROR
+			872: fi
+			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+			881: echo $SO_GEN_ERROR2
+			882: fi
+		}
+	}
+	switches
+	{
+       	bs_sourceroot SOURCE_ROOT_TMP
+		bsclient
+		cap
+		cax
+		compath STAR_COMPATH
+		debug
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
+		l10n L10N_framework
+		ojdk16
+		ojdk16path
+		pro
+		sourceroot
+		sysbaseroot
+	}
+}
+unxlngx6
+{
+	environment
+	{
+		bs_sourceroot
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT_USED TRUE
+		}
+		cap
+		{
+			COPYALL TRUE
+			COPY_PACKED TRUE
+			DEVROOT %SOL_TMP%$/r
+			PCLEAN_PATH %SOLARROOT%/etools
+			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		cax
+		{
+			COPYALL FALSE
+			DEVROOT %SOL_TMP%$/r
+			PCLEAN_PATH %SOL_TMP%$/r/etools
+			PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		common
+		{
+			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+			*deliver %PERL% %SOLARENV%/bin/deliver.pl
+			*mkout %PERL% %SOLARENV%/bin/mkout.pl
+			*r: cd %SOLARROOT%
+			*s: cd %SOLARVERSION%
+			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
+			DMAKEROOT %SOLARENV%/inc/startup
+			HAVE_GCC_VISIBILITY_FEATURE TRUE
+            HAVE_LD_BSYMBOLIC_FUNCTIONS TRUE
+            HAVE_LD_HASH_STYLE TRUE
+			LIBRARY_PATH %SYSBASE%/usr/lib
+			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
+			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
+			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
+			SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib  -L%SOLAR_STLLIBPATH%
+			SOLAR_JAVA TRUE
+			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+		}
+		common0
+		{
+			SOLAR_ENV_ROOT /so/env
+			SOLAR_SOURCE_ROOT %DRIVE_O%
+			SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc3.4.6/glibc3.4.6
+		}
+		common1
+		{
+			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc3.4.6/
+			DEVROOT %SOLAR_ENV_ROOT%
+			PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
+			PKGFORMAT rpm
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+			SOLARROOT %SOLAR_ENV_ROOT%
+			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.4.2.32
+			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Linux_JDK_1.5.0_15.x64
+			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-amd64
+			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+			USE_SYSTEM_STL YES
+			XAU_LIBS -lXau
+		}
+		common2
+		{
+			ENABLE_GRAPHITE TRUE
+            BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin
+			COM GCC
+			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+			COMMON_ENV_TOOLS %SOLARROOT%$/etools
+			CPU X
+			CPUNAME INTEL
+			CVER C341
+			ENABLE_KAB TRUE
+			ENABLE_KDE TRUE
+			ENV_TOOLS %SOLARROOT%/et_linux_libc2.32/%WORK_STAMP%/bin
+			GUI UNX
+			GUIBASE unx
+			GUIENV sal
+			GVER VCL
+			INPATH unxlngx6%PROEXT%
+			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
+			OUTPATH unxlngx6
+			PA_VER 18
+			RPM %SOLARENV%/bin/rpm-wrapper
+			SOLARUPD %UPD%
+			SOLAR_STLLIBPATH %SOLARVERSION%$/unxlngx6%PROEXT%$/lib%UPDMINOREXT%
+			SOLAR_STLPATH %SOLARVERSION%$/unxlngx6%PROEXT%$/inc%UPDMINOREXT%$/stl
+			SYSBASE %SOLAR_SYSBASE_ROOT%
+			TEMP /tmp
+			TMP /tmp
+		}
+		common3:0 IF X%UPDATER%X == XX
+		{
+			FORCE2ARCHIVE TRUE
+		}
+		compath
+		{
+			COMPATH %STAR_COMPATH%
+		}
+		distroot:0 if X%DIST_ROOT%X != XX
+		{
+			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+			SOLARVER %DIST_ROOT%/%WORK_STAMP%
+			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+		}
+		envroot:0 IF X%ENV_ROOT%X != XX
+		{
+			SOLAR_ENV_ROOT %ENV_ROOT%
+		}
+		jdk14
+		{
+			JAVA_HOME %JDK15PATH%
+			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
+			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
+			JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/amd64:%JDK15PATH%/jre/lib/amd64/server:%JDK15PATH%/jre/lib/amd64/xawt
+			JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/amd64 -L%JDK15PATH%/jre/lib/amd64/server
+			JDKPATH %JDK15PATH%/bin
+			JDK_VERSION 150
+			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+		}
+		jdk14path:0 IF X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK14PATH %JDK_PATH%
+		}
+		jdk15
+		{
+			JAVA_HOME %JDK15PATH%
+			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
+			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
+			JDKLIB %JDK15PATH%/jre/lib:%JDK15PATH%/jre/lib/amd64:%JDK15PATH%/jre/lib/amd64/server:%JDK15PATH%/jre/lib/amd64/xawt
+			JDKLIBS -L%JDK15PATH%/jre/lib -L%JDK15PATH%/jre/lib/amd64 -L%JDK15PATH%/jre/lib/amd64/server
+			JDKPATH %JDK15PATH%/bin
+			JDK_VERSION 150
+			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+		}
+		jdk15path:0 IF X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK15PATH %JDK_PATH%
+		}
+		ojdk16
+		{
+			JAVA_HOME %OJDK16PATH%
+			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
+			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
+			JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/amd64:%OJDK16PATH%/jre/lib/amd64/server:%OJDK16PATH%/jre/lib/amd64/xawt
+			JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/amd64 -L%OJDK16PATH%/jre/lib/amd64/server
+			JDKPATH %OJDK16PATH%/bin
+			JDK_VERSION 160
+			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
+		}
+		ojdk16path:0 IF X%JDK_PATH%X != XX
+		{
+			SOLAR_OJDK16PATH %JDK_PATH%
+		}
+		pro
+		{
+			PROSWITCH -DPRODUCT
+		}
+		sourceroot:0 IF X%SOURCE_ROOT%X != XX
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+			SOURCE_ROOT_USED TRUE
+		}
+		sysbaseroot
+		{
+			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+		}
+	}
+	extern
+	{
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
+	}
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 cap cax compath common2  common3:0 pro common jdk14 jdk15 ojdk16
+	reset
+	{
+		CLASSPATH
+		COPYALL
+	}
+	restore
+	{
+		INCLUDE
+	}
+	script
+	{
+		csh 
+		{
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			600: umask 002
+			800: rehash
+            820: wrapfetch.sh
+			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+		}
+		sh
+		{
+			400: if [ $COPYALL ]; then
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			415: fi
+			600: umask 002
+			800: hash -r
+            820: wrapfetch.sh
+			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+			851: export SO_GEN_ERROR
+			852: fi
+			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+			861: export SO_GEN_ERROR2
+			862: fi
+			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+			871: echo $SO_GEN_ERROR
+			872: fi
+			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+			881: echo $SO_GEN_ERROR2
+			882: fi
+		}
+	}
+	switches
+	{
+       	bs_sourceroot SOURCE_ROOT_TMP
+		bsclient
+		cap
+		cax
+		compath STAR_COMPATH
+		debug
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
+		l10n L10N_framework
+		ojdk16
+		ojdk16path
+		pro
+		sourceroot
+		sysbaseroot
+	}
+}
+unxmacxi
+{
+	environment
+	{
+		bs_sourceroot
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT_USED TRUE
+		}
+		cap
+		{
+			COPYALL TRUE
+			COPY_PACKED TRUE
+			DEVROOT %SOL_TMP%$/r
+			PCLEAN_PATH %SOLARROOT%/etools
+			PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		cax
+		{
+			COPYALL FALSE
+			DEVROOT %SOL_TMP%$/r
+			PCLEAN_PATH %SOL_TMP%$/r/etools
+			PERL %SOL_TMP%$/r$/bt_macosx_intel$/%WORK_STAMP%$/bin$/perl
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		common
+		{
+			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+			*deliver %PERL% %SOLARENV%/bin/deliver.pl
+			*mkout %PERL% %SOLARENV%/bin/mkout.pl
+			*r: cd %SOLARROOT%
+			*s: cd %SOLARVERSION%
+			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
+			DMAKEROOT %SOLARENV%/inc/startup
+			HAVE_GCC_VISIBILITY_FEATURE TRUE
+			LIBRARY_PATH %SYSBASE%/usr/lib
+			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
+			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc
+			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include/c++/4.0.0 -I%SYSBASE%/usr/include/c++/4.0.0/i686-apple-darwin8 -I%SYSBASE%/usr/lib/gcc/i686-apple-darwin8/4.0.1/include -I%SYSBASE%/usr/include/python2.3 -I%SYSBASE%/MacOSX10.4u.sdk/usr/lib/gcc/i686-apple-darwin8/4.0.1/include -I%SYSBASE%/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon
+			SOLAREXTRALIB -L%SOLAR_STLLIBPATH%
+			SOLAR_JAVA TRUE
+			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+		}
+		common0
+		{
+			GXX_INCLUDE_PATH /so/env/gcc_4.0.1_macosx/usr/include/c++/4.0.0
+			SOLAR_ENV_ROOT /so/env
+			SOLAR_SOURCE_ROOT %DRIVE_O%
+			SOLAR_SYSBASE_ROOT /so/env/gcc_4.0.1_macosx
+            MACDEVSDK /so/env/gcc_4.0.1_macosx/MacOSX10.4u.sdk
+		}
+		common1
+		{
+			BUILD_OS_APPLEOSX TRUE
+			BUILD_OS_MAJOR 10
+			BUILD_OS_MINOR 4
+			BUILD_OS_REV 10
+			COMPATH %SOLAR_ENV_ROOT%$/gcc_4.0.1_macosx
+			DEVROOT %SOLAR_ENV_ROOT%
+			DISABLE_DEPRECATION_WARNING TRUE
+			EXTRA_CDEFS -DBUILD_OS_APPLEOSX -DBUILD_OS_MAJOR=10 -DBUILD_OS_MINOR=4 -DBUILD_OS_REV=10
+			EXTRA_CFLAGS -isysroot %COMPATH%/MacOSX10.4u.sdk
+			EXTRA_LINKFLAGS -Wl,-syslibroot,%COMPATH%/MacOSX10.4u.sdk
+			GNUCOPY gnucp
+			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+			LIBXML_CFLAGS -I%COMPATH%/MacOSX10.4u.sdk/usr/include/libxml2
+			LIBXML_LIBS -L%COMPATH%/MacOSX10.4u.sdk/usr/lib -lxml2 -lz -lpthread -liconv -lm
+			LIBXSLT_CFLAGS -I%COMPATH%/MacOSX10.4u.sdk/usr/include/libxml2
+			LIBXSLT_LIBS -L%COMPATH%/MacOSX10.4u.sdk/usr/lib -lxslt -lxml2 -lz -lpthread -liconv -lm
+			MACOSX_DEPLOYMENT_TARGET 10.4
+			OPENSSL_LIBS -lssl -lcrypto
+			PERL %SOLAR_ENV_ROOT%/bt_macosx_intel/%WORK_STAMP%/bin/perl
+			PKGFORMAT dmg
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+			SOLARROOT %SOLAR_ENV_ROOT%
+			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/mac_jdk14_unknown
+			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/MacOSX_JDK_1.5.0_07.intel
+			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+			SYSTEM_CURL YES
+			SYSTEM_LIBXML YES
+			SYSTEM_LIBXSLT YES
+			SYSTEM_OPENSSL YES
+			SYSTEM_PYTHON YES
+			SYSTEM_ZLIB YES
+			USE_SYSTEM_STL YES
+			BUILD_PIXMAN YES
+			WITH_MOZILLA YES
+		}
+		common2
+		{
+			BUILD_TOOLS %SOLARROOT%/bt_macosx_intel/%WORK_STAMP%/bin
+			COM GCC
+			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+			COMMON_ENV_TOOLS %SOLARROOT%$/etools
+			CPU I
+			CPUNAME INTEL
+			CVER C341
+			ENV_TOOLS %SOLARROOT%/et_macosx_intel/%WORK_STAMP%/bin
+			GUI UNX
+			GUIBASE aqua
+			GVER VCL
+			INPATH unxmacxi%PROEXT%
+			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
+			PA_VER 18
+			SOLAR_STLLIBPATH %SOLARVERSION%$/unxmacxi%PROEXT%$/lib%UPDMINOREXT%
+			SOLAR_STLPATH %SOLARVERSION%$/unxmacxi%PROEXT%$/inc%UPDMINOREXT%$/stl
+			SYSBASE %SOLAR_SYSBASE_ROOT%
+			TEMP /tmp
+			TMP /tmp
+		}
+		compath
+		{
+			COMPATH %STAR_COMPATH%
+		}
+		distroot:0 if X%DIST_ROOT%X != XX
+		{
+			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+			SOLARVER %DIST_ROOT%/%WORK_STAMP%
+			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+		}
+		envroot:0 IF X%ENV_ROOT%X != XX
+		{
+			SOLAR_ENV_ROOT %ENV_ROOT%
+		}
+		jdk14
+		{
+			JAVA_HOME %JDK15PATH%
+			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
+			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
+			JDKLIB %JDK15PATH%/jre/lib
+			JDKLIBS -L%JDK15PATH%/jre/lib
+			JDKPATH %JDK15PATH%/bin
+			JDK_VERSION 150
+			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+		}
+		jdk14path:0 IF X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK14PATH %JDK_PATH%
+		}
+		jdk15
+		{
+			JAVA_HOME %JDK15PATH%
+			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/linux
+			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/linux
+			JDKLIB %JDK15PATH%/jre/lib
+			JDKLIBS -L%JDK15PATH%/jre/lib
+			JDKPATH %JDK15PATH%/bin
+			JDK_VERSION 150
+			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+		}
+		jdk15path:0 IF X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK15PATH %JDK_PATH%
+		}
+		pro
+		{
+			PROSWITCH -DPRODUCT
+		}
+		sourceroot:0 IF X%SOURCE_ROOT%X != XX
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+			SOURCE_ROOT_USED TRUE
+		}
+		sysbaseroot
+		{
+			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+		}
+	}
+	extern
+	{
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
+	}
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 distroot:0 cap cax compath common2 pro common jdk14 jdk15
+	reset
+	{
+		CLASSPATH
+		COPYALL
+	}
+	restore
+	{
+		INCLUDE
+	}
+	script
+	{
+		csh 
+		{
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			600: umask 002
+			800: rehash
+            820: wrapfetch.sh
+			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+		}
+		sh
+		{
+			400: if [ $COPYALL ]; then
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			415: fi
+			600: umask 002
+			800: hash -r
+            820: wrapfetch.sh
+			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+			851: export SO_GEN_ERROR
+			852: fi
+			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+			861: export SO_GEN_ERROR2
+			862: fi
+			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+			871: echo $SO_GEN_ERROR
+			872: fi
+			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+			881: echo $SO_GEN_ERROR2
+			882: fi
+		}
+	}
+	switches
+	{
+       	bs_sourceroot SOURCE_ROOT_TMP
+		bsclient
+		cap
+		cax
+		compath STAR_COMPATH
+		debug
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
+		l10n L10N_framework
+		pro
+		sourceroot
+		sysbaseroot
+	}
+}
+unxsoli4
+{
+	environment
+	{
+		bs_sourceroot
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT_USED TRUE
+		}
+		cap
+		{
+			COPYALL TRUE
+			COPY_PACKED TRUE
+			DEVROOT %SOL_TMP%$/r
+			PCLEAN_PATH %SOLARROOT%/etools
+			PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		cax
+		{
+			COPYALL FALSE
+			DEVROOT %SOL_TMP%$/r
+			PCLEAN_PATH %SOL_TMP%$/r/etools
+			PERL %SOL_TMP%$/r$/bt_solaris_intel$/bin$/perl
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		common
+		{
+			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+			*deliver %PERL% %SOLARENV%/bin/deliver.pl
+			*mkout %PERL% %SOLARENV%/bin/mkout.pl
+			*r: cd %SOLARROOT%
+			*s: cd %SOLARVERSION%
+			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
+			DMAKEROOT %SOLARENV%/inc/startup
+			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
+			PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
+			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
+			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
+			SOLAR_JAVA TRUE
+			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
+		}
+		common0
+		{
+			SOLAR_ENV_ROOT /so/env
+			SOLAR_SOURCE_ROOT %DRIVE_O%
+			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_intel
+		}
+		common1
+		{
+			COMPATH /so/env/compilers/SUNWS12_p/intel/SUNWspro
+			DEVROOT %SOLAR_ENV_ROOT%
+			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+			PERL %SOLAR_ENV_ROOT%/bt_solaris_intel/bin/perl
+			PKGFORMAT pkg
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+			SOLARROOT %SOLAR_ENV_ROOT%
+			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.3.1_01.intel
+			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.4.2_11.intel
+			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_06.intel
+			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-i586
+			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+		}
+		common2
+		{
+			BUILD_TOOLS %SOLARROOT%/bt_solaris_intel/%WORK_STAMP%/bin
+			COM C52
+			COMEX 4
+			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+			COMMON_ENV_TOOLS %SOLARROOT%$/etools
+			CPU I
+			CPUNAME INTEL
+			CVER C52
+			ENABLE_EVOAB2 TRUE
+			ENV_TOOLS %SOLARROOT%/et_solaris_intel/%WORK_STAMP%/bin
+			GUI UNX
+			GUIBASE unx
+			GVER VCL
+			INPATH unxsoli4%PROEXT%
+			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
+			SOLAR_STLLIBPATH %SOLARVERSION%$/unxsoli4%PROEXT%$/lib%UPDMINOREXT%
+			SOLAR_STLPATH %SOLARVERSION%$/unxsoli4%PROEXT%$/inc%UPDMINOREXT%$/stl
+			SYSBASE %SOLAR_SYSBASE_ROOT%
+			TEMP /var/tmp
+			TMP /var/tmp
+		}
+		compath
+		{
+			COMPATH %STAR_COMPATH%
+		}
+		distroot:0 if X%DIST_ROOT%X != XX
+		{
+			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+			SOLARVER %DIST_ROOT%/%WORK_STAMP%
+			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+		}
+		envroot:0 if X%ENV_ROOT%X != XX
+		{
+			SOLAR_ENV_ROOT %ENV_ROOT%
+		}
+		jdk14
+		{
+			JAVA_HOME %JDK14PATH%
+			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
+			JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/solaris
+			JDKLIB %JDK14PATH%/jre/lib/i386:%JDK14PATH%/lib:%JDK14PATH%/jre/lib/i386/native_threads:%JDK14PATH%/jre/plugin/i386:%JDK14PATH%/jre/lib/i386/motif21
+			JDKLIBS -L%JDK14PATH%/jre/lib/i386 -L%JDK14PATH%/lib -L%JDK14PATH%/jre/lib/i386/native_threads -L%JDK14PATH%/jre/plugin/i386 -L%JDK14PATH%/jre/lib/i386/motif21
+			JDKPATH %JDK14PATH%/bin
+			JDK_VERSION 142
+			XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
+		}
+		jdk14path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK14PATH %JDK_PATH%
+		}
+		jdk15
+		{
+			JAVA_HOME %JDK15PATH%
+			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
+			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
+			JDKLIB %JDK15PATH%/jre/lib/i386:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/i386/native_threads:%JDK15PATH%/jre/plugin/i386:%JDK15PATH%/jre/lib/i386/motif21
+			JDKLIBS -L%JDK15PATH%/jre/lib/i386 -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/i386/native_threads -L%JDK15PATH%/jre/plugin/i386 -L%JDK15PATH%/jre/lib/i386/motif21
+			JDKPATH %JDK15PATH%/bin
+			JDK_VERSION 150
+			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+		}
+		jdk15path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK15PATH %JDK_PATH%
+		}
+		ojdk16
+		{
+			JAVA_HOME %OJDK16PATH%
+			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
+			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/solaris
+			JDKLIB %OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/lib:%OJDK16PATH%/jre/lib/i386/native_threads:%OJDK16PATH%/jre/plugin/i386:%OJDK16PATH%/jre/lib/i386/xawt
+			JDKLIBS -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/lib -L%OJDK16PATH%/jre/lib/i386/native_threads -L%OJDK16PATH%/jre/plugin/i386 -L%OJDK16PATH%/jre/lib/i386/xawt
+			JDKPATH %OJDK16PATH%/bin
+			JDK_VERSION 160
+			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
+		}
+		ojdk16path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_OJDK16PATH %JDK_PATH%
+		}
+		pro
+		{
+			PROSWITCH -DPRODUCT
+		}
+		sourceroot:0 if X%SOURCE_ROOT%X != XX
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+			SOURCE_ROOT_USED TRUE
+		}
+		sysbaseroot
+		{
+			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+		}
+	}
+	extern
+	{
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
+	}
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0 sysbaseroot cap cax compath common2 pro common jdk14 jdk15 ojdk16
+	reset
+	{
+		CLASSPATH
+	}
+	script
+	{
+		csh 
+		{
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			600: umask 002
+			800: rehash
+            820: wrapfetch.sh
+			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+		}
+		sh
+		{
+			400: if [ $COPYALL ]; then
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			415: fi
+			600: umask 002
+			800: hash -r
+            820: wrapfetch.sh
+			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+			851: export SO_GEN_ERROR
+			852: fi
+			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+			861: export SO_GEN_ERROR2
+			862: fi
+			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+			871: echo $SO_GEN_ERROR
+			872: fi
+			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+			881: echo $SO_GEN_ERROR2
+			882: fi
+		}
+	}
+	switches
+	{
+       	bs_sourceroot SOURCE_ROOT_TMP
+		bsclient
+		cap
+		cax
+		compath STAR_COMPATH
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
+		l10n L10N_framework
+		ojdk16
+		ojdk16path
+		pro
+		sourceroot
+		sysbaseroot
+	}
+}
+unxsols4
+{
+	environment
+	{
+		bs_sourceroot
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT_USED TRUE
+		}
+		cap
+		{
+			COPYALL TRUE
+			COPY_PACKED TRUE
+			DEVROOT %SOL_TMP%$/r
+			PCLEAN_PATH %SOLARROOT%/etools
+			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		cax
+		{
+			COPYALL FALSE
+			DEVROOT %SOL_TMP%$/r
+			PCLEAN_PATH %SOL_TMP%$/r/etools
+			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		common
+		{
+			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+			*deliver %PERL% %SOLARENV%/bin/deliver.pl
+			*mkout %PERL% %SOLARENV%/bin/mkout.pl
+			*r: cd %SOLARROOT%
+			*s: cd %SOLARVERSION%
+			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
+			DMAKEROOT %SOLARENV%/inc/startup
+			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
+			PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
+			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
+			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
+			SOLAR_JAVA TRUE
+			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
+		}
+		common0
+		{
+			SOLAR_ENV_ROOT /so/env
+			SOLAR_LICENSE_FILE /opt/SUNWspro/license_dir/sunpro.lic,1
+			SOLAR_SOURCE_ROOT %DRIVE_O%
+			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
+		}
+		common1
+		{
+			COMPATH /so/env/compilers/SUNWS12_p/sparc/SUNWspro
+			DEVROOT %SOLAR_ENV_ROOT%
+			LFS_CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+			PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl
+			PKGFORMAT pkg
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+			SOLARROOT %SOLAR_ENV_ROOT%
+			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLAR_JDK13PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.3.1_01.sparc
+			SOLAR_JDK14PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.4.2_11.sparc
+			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_06.sparc
+			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-solaris-sparc
+			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+		}
+		common2
+		{
+			BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
+			COM C52
+			COMEX 4
+			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+			COMMON_ENV_TOOLS %SOLARROOT%$/etools
+			CPU S
+			CPUNAME SPARC
+			CVER C52
+			ENABLE_EVOAB2 TRUE
+			ENV_TOOLS %SOLARROOT%/et_solaris_sparc/%WORK_STAMP%/bin
+			GUI UNX
+			GUIBASE unx
+			GVER VCL
+			INPATH unxsols4%PROEXT%
+			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
+			OUTPATH unxsols4
+			SOLAR_STLLIBPATH %SOLARVERSION%$/unxsols4%PROEXT%$/lib%UPDMINOREXT%
+			SOLAR_STLPATH %SOLARVERSION%$/unxsols4%PROEXT%$/inc%UPDMINOREXT%$/stl
+			SYSBASE %SOLAR_SYSBASE_ROOT%
+			TEMP /var/tmp
+			TMP /var/tmp
+		}
+		common:3 IF %UPDATER% == YES
+		{
+			TEMP /tmp
+			TMP /tmp
+		}
+		compath
+		{
+			COMPATH %STAR_COMPATH%
+		}
+		distroot:0 if X%DIST_ROOT%X != XX
+		{
+			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+			SOLARVER %DIST_ROOT%/%WORK_STAMP%
+			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+		}
+		envroot:0 if X%ENV_ROOT%X != XX
+		{
+			SOLAR_ENV_ROOT %ENV_ROOT%
+		}
+		jdk14
+		{
+			JAVA_HOME %JDK14PATH%
+			JDKINC %JDK14PATH%/include:%JDK14PATH%/include/solaris
+			JDKINCS -I%JDK14PATH%/include -I%JDK14PATH%/include/solaris
+			JDKLIB %JDK14PATH%/jre/lib/sparc:%JDK14PATH%/lib:%JDK14PATH%/jre/lib/sparc/native_threads:%JDK14PATH%/jre/plugin/sparc:%JDK14PATH%/jre/lib/sparc/motif21
+			JDKLIBS -L%JDK14PATH%/jre/lib/sparc -L%JDK14PATH%/lib -L%JDK14PATH%/jre/lib/sparc/native_threads -L%JDK14PATH%/jre/plugin/sparc -L%JDK14PATH%/jre/lib/sparc/motif21
+			JDKPATH %JDK14PATH%/bin
+			JDK_VERSION 142
+			XCLASSPATH .:%JDK14PATH%/jre/lib/rt.jar
+		}
+		jdk14path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK14PATH %JDK_PATH%
+		}
+		jdk15
+		{
+			JAVA_HOME %JDK15PATH%
+			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
+			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
+			JDKLIB %JDK15PATH%/jre/lib/sparc:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/sparc/native_threads:%JDK15PATH%/jre/plugin/sparc:%JDK15PATH%/jre/lib/sparc/motif21
+			JDKLIBS -L%JDK15PATH%/jre/lib/sparc -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/sparc/native_threads -L%JDK15PATH%/jre/plugin/sparc -L%JDK15PATH%/jre/lib/sparc/motif21
+			JDKPATH %JDK15PATH%/bin
+			JDK_VERSION 150
+			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+		}
+		jdk15path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK15PATH %JDK_PATH%
+		}
+		ojdk16
+		{
+			JAVA_HOME %OJDK16PATH%
+			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/solaris
+			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/solaris
+			JDKLIB %OJDK16PATH%/jre/lib/sparc:%OJDK16PATH%/lib:%OJDK16PATH%/jre/lib/sparc/native_threads:%OJDK16PATH%/jre/plugin/sparc:%OJDK16PATH%/jre/lib/sparc/xawt
+			JDKLIBS -L%OJDK16PATH%/jre/lib/sparc -L%OJDK16PATH%/lib -L%OJDK16PATH%/jre/lib/sparc/native_threads -L%OJDK16PATH%/jre/plugin/sparc -L%OJDK16PATH%/jre/lib/sparc/xawt
+			JDKPATH %OJDK16PATH%/bin
+			JDK_VERSION 160
+			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
+		}
+		ojdk16path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_OJDK16PATH %JDK_PATH%
+		}
+		pro
+		{
+			PROSWITCH -DPRODUCT
+		}
+		sourceroot:0 if X%SOURCE_ROOT%X != XX
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+			SOURCE_ROOT_USED TRUE
+		}
+		sysbaseroot
+		{
+			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+		}
+	}
+	extern
+	{
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LM_LICENSE_FILE
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
+	}
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk14path:0 jdk15path:0 ojdk16path:0  sysbaseroot cap cax compath common2 common:3 pro common jdk14 jdk15 ojdk16
+	reset
+	{
+		CLASSPATH
+	}
+	script
+	{
+		csh 
+		{
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			600: umask 002
+			800: rehash
+            820: wrapfetch.sh
+			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+		}
+		sh
+		{
+			400: if [ $COPYALL ]; then
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			415: fi
+			600: umask 002
+			800: hash -r
+            820: wrapfetch.sh
+			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+			851: export SO_GEN_ERROR
+			852: fi
+			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+			861: export SO_GEN_ERROR2
+			862: fi
+			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+			871: echo $SO_GEN_ERROR
+			872: fi
+			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+			881: echo $SO_GEN_ERROR2
+			882: fi
+		}
+	}
+	switches
+	{
+       	bs_sourceroot SOURCE_ROOT_TMP
+		bsclient
+		cap
+		cax
+		compath STAR_COMPATH
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
+		l10n L10N_framework
+		ojdk16
+		ojdk16path
+		pro
+		sourceroot
+		sysbaseroot
+	}
+}
+unxsolu4
+{
+	environment
+	{
+		bs_sourceroot
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT_USED TRUE
+		}
+		cap
+		{
+			COPYALL TRUE
+			COPY_PACKED TRUE
+			DEVROOT %SOL_TMP%$/r
+			PCLEAN_PATH %SOLARROOT%/etools
+			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		cax
+		{
+			COPYALL FALSE
+			DEVROOT %SOL_TMP%$/r
+			PCLEAN_PATH %SOL_TMP%$/r/etools
+			PERL %SOL_TMP%$/r$/bt_solaris_sparc$/bin$/perl
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		common
+		{
+			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+			*deliver %PERL% %SOLARENV%/bin/deliver.pl
+			*mkout %PERL% %SOLARENV%/bin/mkout.pl
+			*r: cd %SOLARROOT%
+			*s: cd %SOLARVERSION%
+			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
+			DMAKEROOT %SOLARENV%/inc/startup
+			ENABLE_GNOMEVFS
+			FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
+			FREETYPE_LIBS -L%SYSBASE%/usr/sfw/lib/sparcv9 -lfreetype
+			LIBXML_CFLAGS -I%SYSBASE%/usr/include/libxml2
+			LIBXML_LIBS -L%SYSBASE%/usr/lib/sparcv9 -lxml2 -lpthread -lz -lm -lsocket -lnsl
+			LIBXSLT_CFLAGS -I%SYSBASE%/usr/include/libxml2
+			LIBXSLT_LIBS -L%SYSBASE%/usr/lib/sparcv9 -lxslt -lxml2 -lpthread -lz -lm -lsocket -lnsl
+			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
+			PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
+			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
+			SOLAREXTRALIB -L%COMPATH%$/lib -L../lib -L%SYSBASE%/usr/lib -L/lib -L/usr/lib -L/usr/dt/lib -L/usr/openwin/lib -L%SOLAR_STLLIBPATH%
+			SOLAR_JAVA TRUE
+			SYSTEM_FREETYPE YES
+			SYSTEM_LIBXML YES
+			SYSTEM_LIBXSLT YES
+			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+			__cdpath %DRIVE_O%/%WORK_STAMP%/ooo%UPDMINOREXT%
+		}
+		common0
+		{
+			SOLAR_ENV_ROOT /so/env
+			SOLAR_SOURCE_ROOT %DRIVE_O%
+			SOLAR_SYSBASE_ROOT /so/env/solaris_2.10_sparc
+		}
+		common1
+		{
+			COMPATH /so/env/compilers/SUNWS12m1/sparc/SUNWspro
+			DEVROOT %SOLAR_ENV_ROOT%
+			PERL %SOLAR_ENV_ROOT%/bt_solaris_sparc/bin/perl
+			PKGFORMAT pkg
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+			SOLARROOT %SOLAR_ENV_ROOT%
+			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLAR_JDK15PATH %SOLAR_ENV_ROOT%/Solaris_JDK_1.5.0_15.sparc
+			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+			USE_SYSTEM_STL YES
+		}
+		common2
+		{
+			BUILD_TOOLS %SOLARROOT%/bt_solaris_sparc/%WORK_STAMP%/bin
+			COM C52
+			COMEX 4
+			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+			COMMON_ENV_TOOLS %SOLARROOT%$/etools
+			CPU U
+			CPUNAME SPARC
+			CVER C52
+			ENV_TOOLS %SOLARROOT%/et_solaris_sparc/%WORK_STAMP%/bin
+			GUI UNX
+			GUIBASE unx
+			GVER VCL
+			INPATH unxsolu4%PROEXT%
+			JDK15PATH %SOLAR_JDK15PATH%
+			OS SOLARIS
+			OUTPATH unxsolu4
+			SOLAR_STLLIBPATH %SOLARVERSION%$/unxsolu4%PROEXT%$/lib%UPDMINOREXT%
+			SOLAR_STLPATH %SOLARVERSION%$/unxsolu4%PROEXT%$/inc%UPDMINOREXT%$/stl
+			SYSBASE %SOLAR_SYSBASE_ROOT%
+			TEMP /var/tmp
+			TMP /var/tmp
+		}
+		common:3 IF %UPDATER% == YES
+		{
+			TEMP /tmp
+			TMP /tmp
+		}
+		compath
+		{
+			COMPATH %STAR_COMPATH%
+		}
+		distroot:0 if X%DIST_ROOT%X != XX
+		{
+			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+			SOLARVER %DIST_ROOT%/%WORK_STAMP%
+			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+		}
+		envroot:0 if X%ENV_ROOT%X != XX
+		{
+			SOLAR_ENV_ROOT %ENV_ROOT%
+		}
+		jdk15
+		{
+			JAVA_HOME %JDK15PATH%
+			JDKINC %JDK15PATH%/include:%JDK15PATH%/include/solaris
+			JDKINCS -I%JDK15PATH%/include -I%JDK15PATH%/include/solaris
+			JDKLIB %JDK15PATH%/jre/lib/sparcv9:%JDK15PATH%/lib:%JDK15PATH%/jre/lib/sparcv9/native_threads:%JDK15PATH%/jre/lib/sparcv9/server:%JDK15PATH%/jre/plugin/sparcv9:%JDK15PATH%/jre/lib/sparcv9/motif21
+			JDKLIBS -L%JDK15PATH%/jre/lib/sparcv9 -L%JDK15PATH%/lib -L%JDK15PATH%/jre/lib/sparcv9/native_threads -L%JDK15PATH%/jre/lib/sparcv9/server -L%JDK15PATH%/jre/plugin/sparcv9 -L%JDK15PATH%/jre/lib/sparcv9/motif21
+			JDKPATH %JDK15PATH%/bin/sparcv9
+			JDK_VERSION 150
+			XCLASSPATH .:%JDK15PATH%/jre/lib/rt.jar
+		}
+		jdk15path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK15PATH %JDK_PATH%
+		}
+		pro
+		{
+			PROSWITCH -DPRODUCT
+		}
+		sourceroot:0 if X%SOURCE_ROOT%X != XX
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+			SOURCE_ROOT_USED TRUE
+		}
+		sysbaseroot
+		{
+			SOLAR_SYSBASE_ROOT %SYSBASE_ROOT%
+		}
+	}
+	extern
+	{
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LM_LICENSE_FILE
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		SYSBASE_ROOT
+		USER
+	}
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 jdk15path:0 sysbaseroot cap cax compath common2 common:3 pro common jdk15
+	reset
+	{
+		CLASSPATH
+	}
+	script
+	{
+		csh
+		{
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			600: umask 002
+			800: rehash
+            820: wrapfetch.sh
+			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+		}
+		sh
+		{
+			400: if [ $COPYALL ]; then
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			415: fi
+			600: umask 002
+			800: hash -r
+            820: wrapfetch.sh
+			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+			851: export SO_GEN_ERROR
+			852: fi
+			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+			861: export SO_GEN_ERROR2
+			862: fi
+			870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+			871: echo $SO_GEN_ERROR
+			872: fi
+			880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+			881: echo $SO_GEN_ERROR2
+			882: fi
+		}
+	}
+	switches
+	{
+       	bs_sourceroot SOURCE_ROOT_TMP
+		bsclient
+		cap
+		cax
+		compath STAR_COMPATH
+		distroot
+		envroot
+		jdk15
+		jdk15path
+		l10n L10N_framework
+		pro
+		sourceroot
+		sysbaseroot
+	}
+}
+unxubti8
+{
+	environment
+	{
+		bs_sourceroot
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT_USED TRUE
+		}
+		cap
+		{
+			COPYALL TRUE
+			COPY_PACKED TRUE
+			DEVROOT %SOL_TMP%$/r
+			PCLEAN_PATH %SOLARROOT%/etools
+			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		cax
+		{
+			COPYALL FALSE
+			DEVROOT %SOL_TMP%$/r
+			PCLEAN_PATH %SOL_TMP%$/r/etools
+			PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		common
+		{
+			*build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
+			*build_client nice %PERL% %SOLARENV%/bin/build_client.pl
+			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+			*deliver %PERL% %SOLARENV%/bin/deliver.pl
+			*mkout %PERL% %SOLARENV%/bin/mkout.pl
+			*r: cd %SOLARROOT%
+			*s: cd %SOLARVERSION%
+			*zipdep %PERL% %SOLARENV%/bin/zipdep.pl
+			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+			DELIVER deliver.pl
+			DMAKEROOT %SOLARENV%/inc/startup
+			HAVE_GCC_VISIBILITY_FEATURE TRUE
+			LD_LIBRARY_PATH .:/usr/lib:/usr/lib/jvm/java-6-openjdk/jre/lib/i386:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/xawt:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/client:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/native_threads:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:
+			MKOUT mkout.pl
+			SOLAREXTRAINC -I%SOLAR_STLPATH%
+			SOLAREXTRALIB -L../lib
+			SOLAR_JAVA TRUE
+			ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
+		}
+		common0
+		{
+			SOLAR_ENV_ROOT /so/env
+			SOLAR_SOURCE_ROOT %DRIVE_O%
+		}
+		common1
+		{
+			AGG_VERSION 2300
+			ANT /usr/share/ant/bin/ant
+			ANT_HOME /usr/share/ant
+			ANT_LIB /usr/share/ant/lib
+			AWTLIB -ljawt
+			CC gcc
+			COMPATH /usr/bin
+			CXX g++
+			DEVROOT %SOLAR_ENV_ROOT%
+			EXCEPTIONS dwarf2
+			EXTERNAL_WARNINGS_NOT_ERRORS 1
+			GNUMAKE make
+			GXX_INCLUDE_PATH /usr/include/c++/4.2
+			HAVE_LD_HASH_STYLE TRUE
+			JAVACOMPILER /usr/bin/javac
+			JAVADOC /usr/bin/javadoc
+			JDK sun
+			LFS_CFLAGS -D_FILE_OFFSET_BITS=64
+			PAM YES
+			PAM_LINK NO
+			PERL /usr/bin/perl
+			PKGFORMAT deb
+			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
+			SOLARROOT %SOLAR_ENV_ROOT%
+			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
+			SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
+			SOLAR_PLUGIN TRUE
+			SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+			VBA_EXTENSION NO
+			WITH_LANG en-US de
+			XAU_LIBS -lXau
+			XCLASSPATH /usr/lib/jvm/java-6-openjdk/jre/lib/rt.jar:.
+			XINERAMA_LINK dynamic
+			ZIPDEP zipdep.pl
+		}
+		common2
+		{
+			ENABLE_GRAPHITE TRUE
+            BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin
+			COM GCC
+			COMMON_BUILD_TOOLS %SRC_ROOT%/external/common
+			COMMON_ENV_TOOLS %SOLARROOT%$/etools
+			CPU I
+			CPUNAME INTEL
+			CVER C341
+			GUI UNX
+			GUIBASE unx
+			GVER VCL
+			INPATH unxubti8%PROEXT%
+			NO_BSYMBOLIC TRUE
+			OJDK16PATH /usr/lib/jvm/java-6-openjdk
+			OS LINUX
+			OUTPATH unxubti8
+			RPM /usr/bin/rpmbuild
+			SOLAR_STLPATH %SOLARVERSION%$/unxubti8%PROEXT%$/inc%UPDMINOREXT%$/stl
+			TEMP /tmp
+			TMP /tmp
+		}
+		compath
+		{
+			COMPATH /usr/bin
+		}
+		debug
+		{
+			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
+		}
+		distroot:0 if X%DIST_ROOT%X != XX
+		{
+			SOLARVER %DIST_ROOT%/%WORK_STAMP%
+			SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
+		}
+		envroot:0 IF X%ENV_ROOT%X != XX
+		{
+			SOLAR_ENV_ROOT %ENV_ROOT%
+		}
+		jdk15
+		{
+			JAVA_HOME %OJDK16PATH%
+			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
+			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
+			JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/jre/lib/i386/client:%OJDK16PATH%/jre/lib/i386/xawt
+			JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/jre/lib/i386/client -L%OJDK16PATH%/jre/lib/i386/native_threads
+			JDKPATH %OJDK16PATH%/bin
+			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
+		}
+		jdk15path:0 IF X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK15PATH %JDK_PATH%
+		}
+		ojdk16
+		{
+			JAVA_HOME %OJDK16PATH%
+			JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
+			JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
+			JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/jre/lib/i386/client:%OJDK16PATH%/jre/lib/i386/xawt
+			JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/jre/lib/i386/client -L%OJDK16PATH%/jre/lib/i386/native_threads
+			JDKPATH %OJDK16PATH%/bin
+			XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
+		}
+		ojdk16path:0 IF X%JDK_PATH%X != XX
+		{
+			SOLAR_OJDK16PATH %JDK_PATH%
+		}
+		pro
+		{
+			PROSWITCH -DPRODUCT
+		}
+		sourceroot:0 IF X%SOURCE_ROOT%X != XX
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+			SOURCE_ROOT_USED TRUE
+		}
+	}
+	extern
+	{
+		DIST_ROOT
+		ENV_ROOT
+		HOME
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+		USER
+	}
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 cap cax compath common2 pro common jdk15 ojdk16 debug
+	reset
+	{
+		CLASSPATH
+		COPYALL
+		ENABLE_CRASHDUMP
+	}
+	restore
+	{
+		INCLUDE
+	}
+	script
+	{
+		csh
+		{
+			400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			600: umask 002
+			800: rehash
+            820: wrapfetch.sh
+		}
+		sh
+		{
+			400: if [ $COPYALL ]; then
+			410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			415: fi
+			600: umask 002
+			800: hash -r
+            820: wrapfetch.sh
+		}
+	}
+	switches
+	{
+       	bs_sourceroot SOURCE_ROOT_TMP
+		bsclient
+		cap
+		cax
+		debug
+		distroot
+		envroot
+		jdk15
+		l10n L10N_framework
+		ojdk16
+		ojdk16path
+		pro
+		sourceroot
+	}
+}
+wntgcci1
+{
+	environment
+	{
+		bs_sourceroot
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT_USED TRUE
+		}
+		cap
+		{
+			COMPATH %SOL_TMP%$/r$/MinGW
+			COPYALL TRUE
+			COPY_PACKED TRUE
+			DEVROOT %SOL_TMP%$/r
+			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
+			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
+			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		cax
+		{
+			COMPATH %SOL_TMP%$/r$/MinGW
+			COPYALL FALSE
+			FSDK %SOL_TMP%$/r$/msvc7net$/FrameworkSDK
+			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
+			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc7net$/Common7$/ide
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		common
+		{
+			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
+			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
+			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+			*deliver %PERL% %SOLARENV%$/bin$/deliver.pl
+			*dmake *dmake %PROFULLSWITCH%
+			*mkout %PERL% %SOLARENV%$/bin$/mkout.pl
+			*o cd %SOLARENV%$/..
+			*r cd %SOLARROOT%
+			*s cd %SOLARVERSION%
+			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
+			BIG_SVX
+			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
+			DMAKEROOT %SOLARENV%$/inc$/startup
+			ILIB .$:%UPDMINOREXT%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/lib$:%FSDK%$/lib$:%COMPATH%$/lib$:
+			JDK13PATH %SOLAR_JDK13PATH%
+			JDK14PATH %SOLAR_JDK14PATH%
+			JDK15PATH %SOLAR_JDK15PATH%
+			LIB .$:%UPDMINOREXT%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/lib$:%PSDK%$/lib$/x86$:%FSDK%$/lib$:%COMPATH%$/lib$:%SOLAR_STLLIBPATH%
+			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
+			PATH %PATH%$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%SHARED_COM_SDK_PATH%$:%PSDK%$/bin$:%FSDK%$/bin
+			PSDKINC -I%PSDK%$/include
+			SOLAREXTRAINC -I%COMPATH%$/lib$/gcc-lib$/mingw32$/3.2$/include -I%DSDK%$/include
+			SOLAR_JAVA TRUE
+			XCLASSPATH .
+			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+		}
+		common0
+		{
+			SOLAR_ENV_ROOT r:
+			SOLAR_SOURCE_ROOT o:
+		}
+		common1
+		{
+			COMPATH %SOLAR_ENV_ROOT%$/MinGW
+			#			FSDK %SOLAR_ENV_ROOT%$/msvc7net$/FrameworkSDK
+			DEVROOT %SOLAR_ENV_ROOT%
+			NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
+			PERL %SOLAR_ENV_ROOT%$/btw$/perl$/bin$/perl
+			PKGFORMAT some_dummy
+			PSDK %SOLAR_ENV_ROOT%$/MinGW$/w32api
+			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc7net$/Common7$/ide
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOLAR_ENV_ROOT%
+			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+		}
+		common2
+		{
+			ENABLE_GRAPHITE TRUE
+            BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
+			CALL_CDECL TRUE
+			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+			COM GCC
+			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+			COMMON_ENV_TOOLS %SOLARROOT%$/etools
+			COMP_ENV wntgcci1
+			CPU I
+			CPUNAME INTEL
+			CVER M1300
+			DYNAMIC_CRT TRUE
+			ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
+			GUI WNT
+			GUIBASE WIN
+			GVER NT351
+			INPATH wntgcci1%PROEXT%
+			OS WNT
+			OUTPATH wntgcci1
+			SET_EXEPTIONS TRUE
+			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
+			SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
+			SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
+			SOLAR_STLPATH %SOLARVERSION%$/wntgcci1%PROEXT%$/inc%UPDMINOREXT%$/stl
+			SORT sort -T %TMP%
+			use_shl_versions TRUE
+		}
+		compath
+		{
+			COMPATH %STAR_COMPATH%
+		}
+		distroot:0 if X%DIST_ROOT%X != XX
+		{
+			SHARED_SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
+			SOLARVER %DIST_ROOT%$/%WORK_STAMP%
+			SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
+		}
+		envroot:0 IF X%ENV_ROOT%X != XX
+		{
+			SOLAR_ENV_ROOT %ENV_ROOT%
+		}
+		jdk14
+		{
+			HOMEDRIVE %DEVROOT%
+			HOMEPATH $/jdk141
+			JAVAHOME %JDK14PATH%
+			JAVA_HOME %JDK14PATH%
+			JDKINC %JDK14PATH%$/include$/win32$:%JDK14PATH%$/include
+			JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
+			JDKLIB -L%JDK14PATH%$/lib
+			JDKLIBS -L%JDK14PATH%$/lib
+			JDKPATH %JDK14PATH%$/bin
+			JDK_VERSION 142
+			JREPATH %JDK14PATH%$/jre$/bin$/client
+			XCLASSPATH .$:%JDK14PATH%$/jre$/lib$/rt.jar
+		}
+		jdk14path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK14PATH %JDK_PATH%
+		}
+		jdk15
+		{
+			HOMEDRIVE %DEVROOT%
+			HOMEPATH $/jdk151
+			JAVAHOME %JDK15PATH%
+			JAVA_HOME %JDK15PATH%
+			JDKINC %JDK15PATH%$/include$/win32$:%JDK15PATH%$/include
+			JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
+			JDKLIB -L%JDK15PATH%$/lib
+			JDKLIBS -L%JDK15PATH%$/lib
+			JDKPATH %JDK15PATH%$/bin
+			JDK_VERSION 150
+			JREPATH %JDK15PATH%$/jre$/bin$/client
+			XCLASSPATH .$:%JDK15PATH%$/jre$/lib$/rt.jar
+		}
+		jdk15path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK15PATH %JDK_PATH%
+		}
+		psdk
+		{
+			PSDK %STAR_PSDK%
+		}
+		sourceroot:0 if X%SOURCE_ROOT%X != XX
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+			SOURCE_ROOT_USED TRUE
+		}
+	}
+	extern
+	{
+		COMSPEC
+		DIST_ROOT
+		ENV_ROOT
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+	}
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
+	reset
+	{
+		COPYALL
+		NSIS_PATH
+		SOLAR_ENV_ROOT
+		WST
+	}
+	script
+	{
+		csh
+		{
+			150: setenv MYENV_PATH $PATH
+			160: setenv PATH $SSX_PATH
+			200: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			260: setenv PATH $MYENV_PATH
+			270: unsetenv MYENV_PATH
+			850: if ( "$?SO_GEN_ERROR" == 0 ) setenv SO_GEN_ERROR
+			851: if ( "$?SO_GEN_ERROR2" == 0 ) setenv SO_GEN_ERROR2
+			900: if ( "$?SO_GEN_ERROR" == 1 ) echo $SO_GEN_ERROR
+			901: if ( "$?SO_GEN_ERROR2" == 1 ) echo $SO_GEN_ERROR2
+		}
+		sh
+		{
+			150: export MYENV_PATH=$PATH
+			160: export PATH=$SSX_PATH
+			260: export PATH=$MYENV_PATH
+			270: unset MYENV_PATH
+			400: if [ $COPYALL ]; then
+			410: $SOLAR_ENV_ROOT/btw/perl/bin/perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			415: fi
+			850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+			851: export SO_GEN_ERROR
+			852: fi
+			860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+			861: export SO_GEN_ERROR
+			862: fi
+			870: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+			871: echo $SO_GEN_ERROR
+			872: fi
+			880: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+			881: echo $SO_GEN_ERROR
+			882: fi
+		}
+	}
+	switches
+	{
+       	bs_sourceroot SOURCE_ROOT_TMP
+		bsclient
+		cap
+		cax
+		compath STAR_COMPATH
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
+		l10n L10N_framework
+		pro
+		psdk STAR_PSDK
+		sourceroot
+	}
+}
+wntmsci11
+{
+	environment
+	{
+		bs_sourceroot
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT %SOURCE_ROOT_TMP%
+			SOURCE_ROOT_USED TRUE
+		}
+		cap
+		{
+			COMPATH %SOL_TMP%$/r$/msvc8p
+			COMPROOT %SOL_TMP%$/r$/msvc8p
+			COPYALL TRUE
+			COPY_PACKED TRUE
+			DEVROOT %SOL_TMP%$/r
+			DSDK %SOL_TMP%$/r$/msvc8p$/DirectXSDK
+			FSDK %SOL_TMP%$/r$/msvc8p$/Sdk$/v2.0
+			PCLEAN_PATH %SOLARROOT%$/etw
+			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
+			PSDK %SOL_TMP%$/r$/msvc8p$/PlatformSDK
+			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc8p$/Common7$/ide
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		cax
+		{
+			COMPATH %SOL_TMP%$/r$/msvc8p
+			COMPROOT %SOL_TMP%$/r$/msvc8p
+			COPYALL FALSE
+			DSDK %COMPATH%$/DirectXSDK
+			FSDK %COMPATH%$/Sdk$/v2.0
+			PCLEAN_PATH %SOL_TMP%$/r$/etw
+			PERL %SOL_TMP%$/r$/btw$/perl$/bin$/perl
+			PSDK %COMPATH%$/PlatformSDK
+			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/ide
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+		}
+		common
+		{
+			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
+			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
+			*copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+			*deliver %PERL% %SOLARENV%$/bin$/deliver.pl
+			*mkout %PERL% %SOLARENV%$/bin$/mkout.pl
+			*mwscommit %PERL% %COMMON_ENV_TOOLS%/mwscommit.pl
+			*o cdd %SOLARENV%$/..
+			*r cdd %SOLARROOT%
+			*s cdd %SOLARVERSION%
+			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
+			BIG_SVX
+			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
+			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
+			DMAKEROOT %SOLARENV%$/inc$/startup
+			ILIB .$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/vc$/lib$:%PSDK%$/lib$:%FSDK%$/lib$:%DSDK%$/lib$/x86
+			JDK13PATH %SOLAR_JDK13PATH%
+			JDK14PATH %SOLAR_JDK14PATH%
+			JDK15PATH %SOLAR_JDK15PATH%
+			LIB .$:%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%$:%PSDK%$/vc$/lib$:%PSDK%$/lib$:%FSDK%$/lib$:%DSDK%$/lib$/x86$:%SOLAR_STLLIBPATH%
+			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
+			MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%/mwscommit.pl
+			PATH %PATH%$:%SHARED_COM_SDK_PATH%$:%PSDK%$/vc$/bin$:%PSDK%$/bin$:%FSDK%$/bin$:%DSDK%$/bin$/Utilities$/bin$/x86$:%PACKMS%
+			PROF_EDITION TRUE
+			PSDKINC -I%PSDK%$/vc$/include -I%PSDK%$/include -I%COMPATH%$/PlatformSDK_VC8$/include
+			SOLAREXTRAINC -I%DSDK%$/include
+			SOLAR_JAVA TRUE
+			TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
+			VISTA_MANIFEST TRUE
+			WINDOWS_VISTA_PSDK TRUE
+			XCLASSPATH .
+			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+		}
+		common0
+		{
+			BS_ROOT n:
+			SOLAR_ENV_ROOT r:
+			SOLAR_SOURCE_ROOT o:
+		}
+		common1
+		{
+			COMPATH %SOLAR_ENV_ROOT%$/msvc8p
+			COMPROOT %SOLAR_ENV_ROOT%$/msvc8p
+			DEVROOT %SOLAR_ENV_ROOT%
+			DSDK %SOLAR_ENV_ROOT%$/msvc8p$/DirectXSDK
+			FSDK %SOLAR_ENV_ROOT%$/msvc8p$/Sdk$/v2.0
+			PERL %SOLAR_ENV_ROOT%$/btw$/perl$/bin$/perl
+            PKGFORMAT msi
+			PSDK %SOLAR_ENV_ROOT%$/msvc8p$/PlatformSDK
+			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc8p$/Common7$/ide
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOLAR_ENV_ROOT%
+			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+		}
+		common2
+		{
+			ENABLE_GRAPHITE TRUE
+            BUILD_TOOLS %SOLARROOT%$/btw$/%WORK_STAMP%
+			CALL_CDECL TRUE
+			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:o:$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+			COM MSC
+			COMEX 11
+			COMMON_BUILD_TOOLS %SOLARROOT%$/btools
+			COMMON_ENV_TOOLS %SOLARROOT%$/etools
+			COMP_ENV wntmsci11
+			CPU I
+			CPUNAME INTEL
+			CVER M1400
+			DYNAMIC_CRT TRUE
+			ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
+			GUI WNT
+			GUIBASE WIN
+			GVER NT351
+			INPATH wntmsci11%PROEXT%
+			OS WNT
+			OUTPATH wntmsci11
+			PACKMS %SO_PACK%$/wntmsci11$/MS
+			SET_EXEPTIONS TRUE
+			SHIPDRIVE %BS_ROOT%$/ship$/install
+			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
+			SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
+			SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
+			SOLAR_STLPATH %SOLARVERSION%$/wntmsci11%PROEXT%$/inc%UPDMINOREXT%$/stl
+			SORT sort -T %TMP%
+			use_shl_versions TRUE
+		}
+		compath
+		{
+			COMPATH %STAR_COMPATH%
+		}
+		distroot:0 if X%DIST_ROOT%X != XX
+		{
+			SHARED_SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
+			SOLARVER %DIST_ROOT%$/%WORK_STAMP%
+			SOLARVERSION %DIST_ROOT%$/%WORK_STAMP%
+		}
+		envroot:0 IF X%ENV_ROOT%X != XX
+		{
+			SOLAR_ENV_ROOT %ENV_ROOT%
+		}
+		jdk14
+		{
+			HOMEDRIVE %DEVROOT%
+			HOMEPATH $/jdk141
+			JAVAHOME %JDK14PATH%
+			JAVA_HOME %JDK14PATH%
+			JDKINC %JDK14PATH%$/include$/win32$:%JDK14PATH%$/include
+			JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
+			JDKLIB %JDK14PATH%$/lib
+			JDKLIBS %JDK14PATH%$/lib
+			JDKPATH %JDK14PATH%$/bin
+			JDK_VERSION 142
+			JREPATH %JDK14PATH%$/jre$/bin$/client
+			XCLASSPATH .$:%JDK14PATH%$/jre$/lib$/rt.jar
+		}
+		jdk14path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK14PATH %JDK_PATH%
+		}
+		jdk15
+		{
+			HOMEDRIVE %DEVROOT%
+			HOMEPATH $/jdk151
+			JAVAHOME %JDK15PATH%
+			JAVA_HOME %JDK15PATH%
+			JDKINC %JDK15PATH%$/include$/win32$:%JDK15PATH%$/include
+			JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
+			JDKLIB %JDK15PATH%$/lib
+			JDKLIBS %JDK15PATH%$/lib
+			JDKPATH %JDK15PATH%$/bin
+			JDK_VERSION 150
+			JREPATH %JDK15PATH%$/jre$/bin$/client
+			XCLASSPATH .$:%JDK15PATH%$/jre$/lib$/rt.jar
+		}
+		jdk15path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK15PATH %JDK_PATH%
+		}
+		psdk
+		{
+			PSDK %STAR_PSDK%
+		}
+		sourceroot:0 if X%SOURCE_ROOT%X != XX
+		{
+			SOLAR_SOURCE_ROOT %SOURCE_ROOT%
+			SOURCE_ROOT_USED TRUE
+		}
+	}
+	extern
+	{
+		COMSPEC
+		DIST_ROOT
+		ENV_ROOT
+		JDK_PATH
+		LOCALINI
+		SOL_TMP
+		SOURCE_ROOT
+	}
+	order common0 bs_sourceroot envroot:0 sourceroot:0 common1 distroot:0 cap cax psdk compath common2 jdk14path:0 jdk15path:0 common jdk14 jdk15
+	reset
+	{
+		COPYALL
+		SOLAR_ENV_ROOT
+		WST
+	}
+	script
+	{
+		post
+		{
+			150: set MYENV_PATH=%PATH
+			160: set PATH=%SSX_PATH
+			200: if "%COPYALL%"=="TRUE" %SOLAR_ENV_ROOT%\btw\perl\bin\perl %SOLAR_ENV_ROOT%\etools\lucopy.pl -all %BTARGET% $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+			260: set PATH=%MYENV_PATH
+			270: unset MYENV_PATH
+			400: if "%SO_GEN_ERROR%" NE "" @echo %SO_GEN_ERROR%
+			401: if "%SO_GEN_ERROR2%" NE "" echo %SO_GEN_ERROR2%
+		}
+	}
+	switches
+	{
+       	bs_sourceroot SOURCE_ROOT_TMP
+		bsclient
+		cap
+		cax
+		compath STAR_COMPATH
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
+		l10n L10N_framework
+		pro
+		psdk STAR_PSDK
+		sourceroot
+	}
+}
+wntmsci12
+{
+	environment
+	{
+		bs_sourceroot
+		{
+			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
+			SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
+			SOURCE_ROOT_USED TRUE
+		}
+		cap
+		{
+			BUILD_TOOLS %SOL_TMP%$/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%$/r$/etw$/%WORK_STAMP%
+			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
+			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+			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
+			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
+
+		}
+		cax
+		{
+			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%$/r$/etw$/%WORK_STAMP%
+			FSDK %COMPATH%$/Sdk$/v3.5
+			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
+			PCLEAN_PATH %SOL_TMP%$/r$/etw
+			PERL %SOL_TMP%$/r$/%PERLDIR%
+			PSDK %COMPATH%$/PlatformSDK$/v6.1
+			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
+		}
+		common
+		{
+			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
+			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
+			*copyprj %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
+			*deliver %PERL% %SOLARENV%$/bin$/deliver.pl
+			*mkout %PERL% %SOLARENV%$/bin$/mkout.pl
+			*mwscommit %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
+			*o cd %SOLARENV%$/..
+			*r cd %SOLARROOT%
+			*s cd %SOLARVERSION%
+			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
+			*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
+			BIG_SVX
+			COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
+			CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
+			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
+			DMAKEROOT %SOLARENV%$/inc$/startup
+			ENABLE_PCH TRUE
+			ILIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86
+			JDK13PATH %SOLAR_JDK13PATH%
+			JDK14PATH %SOLAR_JDK14PATH%
+			JDK15PATH %SOLAR_JDK15PATH%
+			LIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86;%SOLAR_STLLIBPATH%
+			LIBMGR_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/lib.exe
+			LINK_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/link.exe
+			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
+			MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
+			OJDK16PATH %SOLAR_OJDK16PATH%
+			PATH $cp(%PSDK%$/Bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
+			PROF_EDITION TRUE
+			PSDKINC -I%PSDK%$/include
+			SOLAREXTRAINC -I%DSDK%$/include
+			SOLAR_JAVA TRUE
+			TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
+			USE_DIRECTX5 TRUE
+			WINDOWS_VISTA_PSDK TRUE
+			SYSBASE TRUE
+            WITH_VC_REDIST TRUE
+			XCLASSPATH .
+			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+			BUILD_X64 TRUE
+			CHECK_LUCENCE_INDEXER_OUTPUT TRUE
+		}
+		common0
+		{
+			BS_ROOT n:
+			SOLAR_ENV_ROOT r:
+			SOLAR_SOURCE_ROOT o:
+			BTOOLDIR %WORK_STAMP%$/cygtools
+			PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
+		}
+		common02
+		{
+			PERL perl
+		}
+		common1
+		{
+			COMPATH %SOLAR_ENV_ROOT%$/msvc9p
+			COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
+			DEVROOT %SOLAR_ENV_ROOT%
+			DSDK %SOLAR_ENV_ROOT%$/msvc9p$/DirectXSDK
+			FSDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v3.5
+			F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0
+			NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
+			PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
+            PKGFORMAT msi
+			PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/v6.1
+			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOLAR_ENV_ROOT%
+			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+#			TEMP $dp(%TEMP%)
+#			TMP $dp(%TMP%)
+		}
+		common2
+		{
+			ENABLE_GRAPHITE TRUE
+            BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
+			CALL_CDECL TRUE
+			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
+			COM MSC
+			COMEX 12
+			COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools)
+			COMMON_ENV_TOOLS %SOLARROOT%$/etools
+			COMP_ENV wntmsci12
+			CPU I
+			CPUNAME INTEL
+			CVER M1500
+			DYNAMIC_CRT TRUE
+			ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
+			GUI WNT
+			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
+			PACKMS %SO_PACK%$/wntmsci12$/MS
+			SET_EXEPTIONS TRUE
+			SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install
+			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
+			SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
+			SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
+			SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586
+			SOLAR_STLPATH %SOLARVERSION%$/wntmsci12%PROEXT%$/inc%UPDMINOREXT%$/stl
+			SORT sort -T %TMP%
+#			TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe
+			use_shl_versions TRUE
+		}
+		common:3 IF %UPDATER% == YES
+		{
+			SHIPDRIVE %BS_ROOT%$/ship$/install
+		}
+		compath
+		{
+			COMPATH $dp(%STAR_COMPATH%)
+		}
+		distroot:0 if X%DIST_ROOT%X != XX
+		{
+			SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
+			SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%)
+			SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
+		}
+		envroot:0 IF X%ENV_ROOT%X != XX
+		{
+			SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
+		}
+		jdk14
+		{
+#			HOMEDRIVE %DEVROOT%
+#			HOMEPATH $/jdk141
+			JAVAHOME %JDK14PATH%
+			JAVA_HOME %JDK14PATH%
+			JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
+			JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
+			JDKLIB %JDK14PATH%$/lib
+			JDKLIBS %JDK14PATH%$/lib
+			JDKPATH %JDK14PATH%$/bin
+			JDK_VERSION 142
+			JREPATH %JDK14PATH%$/jre$/bin$/client
+			XCLASSPATH .;%JDK14PATH%$/jre$/lib$/rt.jar
+		}
+		jdk14path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK14PATH $dp(%JDK_PATH%)
+		}
+		jdk15
+		{
+#			HOMEDRIVE %DEVROOT%
+#			HOMEPATH $/jdk151
+			JAVAHOME %JDK15PATH%
+			JAVA_HOME %JDK15PATH%
+			JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
+			JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
+			JDKLIB %JDK15PATH%$/lib
+			JDKLIBS %JDK15PATH%$/lib
+			JDKPATH %JDK15PATH%$/bin
+			JDK_VERSION 150
+			JREPATH %JDK15PATH%$/jre$/bin$/client
+			XCLASSPATH .;%JDK15PATH%$/jre$/lib$/rt.jar
+		}
+		jdk15path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK15PATH $dp(%JDK_PATH%)
+		}
+		ojdk16
+		{
+#			HOMEDRIVE %DEVROOT%
+#			HOMEPATH $/openjdk-6-b08-windows-i586
+			JAVA_HOME %OJDK16PATH%
+			JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include
+			JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32
+			JDKLIB %OJDK16PATH%$/lib
+			JDKLIBS %OJDK16PATH%$/lib
+			JDKPATH %OJDK16PATH%$/bin
+			JDK_VERSION 160
+			JREPATH %OJDK16PATH%$/jre$/bin$/client
+			XCLASSPATH .;%OJDK16PATH%$/jre$/lib$/rt.jar
+		}
+		ojdk16path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_OJDK16PATH $dp(%JDK_PATH%)
+		}
+		pro
+		{
+			RES_ENUS TRUE
+		}
+		psdk
+		{
+			PSDK $dp(%STAR_PSDK%)
+		}
+		sourceroot:0 if X%SOURCE_ROOT%X != XX
+		{
+			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
+			SOURCE_ROOT_USED TRUE
+		}
+		tmp
+		{
+			SOL_TMP $dp(%SOL_TMP_DIR%)
+		}
+	}
+	extern
+	{
+		COMSPEC
+		DIST_ROOT
+		ENV_ROOT
+		JDK_PATH
+		LOCALINI
+		OSTYPE
+		$dp(SOL_TMP)
+		$dp(SOURCE_ROOT)
+		$dp(TMP)
+		$dp(TEMP)
+	}
+	order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
+	reset
+	{
+		COPYALL
+		CXX_X64_BINARY
+		DB2IMP
+		GCRINC
+		GCRLIB
+		GCRPATH
+		LIBMGR_X64_BINARY
+		LINK_X64_BINARY
+		NSIS_PATH
+		OLD_CHAOS
+		PERLDIR
+		SOLAR_ENV_ROOT
+		TFDEF
+		TFDIR
+		WST
+	}
+	script
+	{
+         sh
+            {
+            400: if [ $COPYALL ]; then
+            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            600: umask 002
+            800: hash -r
+            820: wrapfetch.sh
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851:       export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861:       export SO_GEN_ERROR2
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+            871:       echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+            881:       echo $SO_GEN_ERROR2
+            882: fi
+        }
+	}
+	switches
+	{
+       	bs_sourceroot SOURCE_ROOT_TMP
+		bsclient
+		cap
+		cax
+		compath STAR_COMPATH
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
+		l10n L10N_framework
+		ojdk16
+		ojdk16path
+		pro
+		psdk STAR_PSDK
+		sourceroot
+		tmp SOL_TMP_DIR
+	}
+}
+wntmsci13
+{
+	environment
+	{
+		bs_sourceroot
+		{
+			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
+			SOURCE_ROOT $dp(%SOURCE_ROOT_TMP%)
+			SOURCE_ROOT_USED TRUE
+		}
+		cap
+		{
+			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%$/r$/etw$/%WORK_STAMP%
+			FSDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v3.5
+			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+			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
+			SHARED_COM_SDK_PATH %SOL_TMP%$/r$/msvc9p$/Common7$/IDE
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
+
+		}
+		cax
+		{
+			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%$/r$/etw$/%WORK_STAMP%
+			FSDK %COMPATH%$/Sdk$/v3.5
+			F20SDK %SOL_TMP%$/r$/msvc9p$/Sdk$/v2.0
+			NSIS_PATH %SOL_TMP%$/r$/NSIS_242_unicode
+			PCLEAN_PATH %SOL_TMP%$/r$/etw
+			PERL %SOL_TMP%$/r$/%PERLDIR%
+			PSDK %COMPATH%$/PlatformSDK$/v6.1
+			SHARED_COM_SDK_PATH %COMPATH%$/Common7$/IDE
+			SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOL_TMP%$/r
+			SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%
+			SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
+#			TOUCH %SOL_TMP%$/r$/btw$/%BTOOLDIR%$/touch.exe
+		}
+		common
+		{
+			*build %PERL% %SOLARENV%$/bin$/build.pl %PROFULLSWITCH%
+			*build_client %PERL% %SOLARENV%$/bin$/build_client.pl
+			*copyprj %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
+			*deliver %PERL% %SOLARENV%$/bin$/deliver.pl
+			*mkout %PERL% %SOLARENV%$/bin$/mkout.pl
+			*mwscommit %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
+			*o cd %SOLARENV%$/..
+			*r cd %SOLARROOT%
+			*s cd %SOLARVERSION%
+			*zipdep %PERL% %SOLARENV%$/bin$/zipdep.pl
+			*z_ooo %PERL% %SOLARENV%$/bin$/z_ooo.pl
+			BIG_SVX
+			COPYPRJ %PERL% %COMMON_ENV_TOOLS%$/copyprj.pl
+			CXX_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/cl.exe
+			DELIVER %PERL% %SOLARENV%$/bin$/deliver.pl
+			DMAKEROOT %SOLARENV%$/inc$/startup
+			ENABLE_PCH TRUE
+			ILIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86
+			JDK13PATH %SOLAR_JDK13PATH%
+			JDK14PATH %SOLAR_JDK14PATH%
+			JDK15PATH %SOLAR_JDK15PATH%
+			LIB .;%SOLARVERSION%$/%INPATH%$/lib%UPDMINOREXT%;%COMPATH%$/lib;%PSDK%$/lib;%DSDK%$/lib$/x86;%SOLAR_STLLIBPATH%
+			LIBMGR_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/lib.exe
+			LINK_X64_BINARY %COMPROOT%$/bin$/x86_amd64$/link.exe
+			MKOUT %PERL% %SOLARENV%$/bin$/mkout.pl
+			MWSCOMMIT %PERL% %COMMON_ENV_TOOLS%$/mwscommit.pl
+			OJDK16PATH %SOLAR_OJDK16PATH%
+			PATH $cp(%PSDK%$/Bin)$:%PATH%$:$cp(%SHARED_COM_SDK_PATH%)$:$cp(%COMPATH%$/bin)$:$cp(%FSDK%)$:$cp(%F20SDK%)$/bin$:$cp(%DSDK%$/Utilities$/bin$/x86)$:$cp(%PACKMS%)
+			PROF_EDITION TRUE
+			PSDKINC -I%PSDK%$/include
+			SOLAREXTRAINC -I%DSDK%$/include
+			SOLAR_JAVA TRUE
+			TRUSTED_MANIFEST_LOCATION %SOLARENV%$/inc
+			USE_DIRECTX5 TRUE
+			WINDOWS_VISTA_PSDK TRUE
+			SYSBASE TRUE
+            WITH_VC_REDIST TRUE
+			XCLASSPATH .
+			ZIPDEP %PERL% %SOLARENV%$/bin$/zipdep.pl
+			BUILD_X64 TRUE
+		}
+		common0
+		{
+			BS_ROOT n:
+			SOLAR_ENV_ROOT r:
+			SOLAR_SOURCE_ROOT o:
+			BTOOLDIR %WORK_STAMP%$/cygtools
+			PERLDIR btw$/%WORK_STAMP%$/cygtools$/perl
+		}
+		common02
+		{
+			PERL perl
+		}
+		common1
+		{
+			COMPATH %SOLAR_ENV_ROOT%$/msvc9p
+			COMPROOT %SOLAR_ENV_ROOT%$/msvc9p
+			DEVROOT %SOLAR_ENV_ROOT%
+			DSDK %SOLAR_ENV_ROOT%$/msvc9p$/DirectXSDK
+			FSDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v3.5
+			F20SDK %SOLAR_ENV_ROOT%$/msvc9p$/Sdk$/v2.0
+			NSIS_PATH %SOLAR_ENV_ROOT%$/NSIS_242_unicode
+			PERL %SOLAR_ENV_ROOT%$/%PERLDIR%
+            PKGFORMAT msi
+			PSDK %SOLAR_ENV_ROOT%$/msvc9p$/PlatformSDK$/v6.1
+			SHARED_COM_SDK_PATH %SOLAR_ENV_ROOT%$/msvc9p$/Common7$/ide
+			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+			SOLARENV %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
+			SOLARROOT %SOLAR_ENV_ROOT%
+			SOLARVER %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+			SOLARVERSION %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%
+			SO_PACK %SOLAR_ENV_ROOT%$/pack$/%WORK_STAMP%
+			SRC_ROOT %SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%
+#			TEMP $dp(%TEMP%)
+#			TMP $dp(%TMP%)
+		}
+		common2
+		{
+			ENABLE_GRAPHITE TRUE
+            BUILD_TOOLS %SOLARROOT%$/btw$/%BTOOLDIR%
+			CALL_CDECL TRUE
+			CDPATHx %CDPATH%$:..$:..$/..$:..$/..$/..$:..$/source$:..$/..$/source$:$cp(%SOLAR_SOURCE_ROOT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%)
+			COM MSC
+			COMEX 12
+			COMMON_BUILD_TOOLS $cp(%SOLARROOT%$/btools)
+			COMMON_ENV_TOOLS %SOLARROOT%$/etools
+			COMP_ENV wntmsci13
+			CPU I
+			CPUNAME INTEL
+			CVER M1500
+			DYNAMIC_CRT TRUE
+			ENV_TOOLS %SOLARROOT%$/etw$/%WORK_STAMP%
+			GUI WNT
+			GUIBASE WIN
+			GVER NT351
+			INPATH wntmsci13%PROEXT%
+			MOZILLABUILD %SOLARROOT%/mozilla-build-1.3
+			OS WNT
+			OUTPATH wntmsci13
+			PACKMS %SO_PACK%$/wntmsci13$/MS
+			SET_EXEPTIONS TRUE
+			SHIPDRIVE %SOLAR_ENV_ROOT%$/ship$/install
+			SOLAR_JDK13PATH %SOLARROOT%$/jdk1.3
+			SOLAR_JDK14PATH %SOLARROOT%$/j2sdk1.4.2_11
+			SOLAR_JDK15PATH %SOLARROOT%$/jdk1.5.0.06
+			SOLAR_OJDK16PATH %SOLARROOT%$/openjdk-6-b08-windows-i586
+			SOLAR_STLPATH %SOLARVERSION%$/wntmsci13%PROEXT%$/inc%UPDMINOREXT%$/stl
+			SORT sort -T %TMP%
+#			TOUCH %SOLARROOT%$/btw$/%BTOOLDIR%$/touch.exe
+			use_shl_versions TRUE
+		}
+		common:3 IF %UPDATER% == YES
+		{
+			SHIPDRIVE %BS_ROOT%$/ship$/install
+		}
+		compath
+		{
+			COMPATH $dp(%STAR_COMPATH%)
+		}
+		distroot:0 if X%DIST_ROOT%X != XX
+		{
+			SHARED_SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
+			SOLARVER $dp(%DIST_ROOT%$/%WORK_STAMP%)
+			SOLARVERSION $dp(%DIST_ROOT%$/%WORK_STAMP%)
+		}
+		envroot:0 IF X%ENV_ROOT%X != XX
+		{
+			SOLAR_ENV_ROOT $dp(%ENV_ROOT%)
+		}
+		jdk14
+		{
+#			HOMEDRIVE %DEVROOT%
+#			HOMEPATH $/jdk141
+			JAVAHOME %JDK14PATH%
+			JAVA_HOME %JDK14PATH%
+			JDKINC %JDK14PATH%$/include$/win32;%JDK14PATH%$/include
+			JDKINCS -I%JDK14PATH%$/include -I%JDK14PATH%$/include$/win32
+			JDKLIB %JDK14PATH%$/lib
+			JDKLIBS %JDK14PATH%$/lib
+			JDKPATH %JDK14PATH%$/bin
+			JDK_VERSION 142
+			JREPATH %JDK14PATH%$/jre$/bin$/client
+			XCLASSPATH .;%JDK14PATH%$/jre$/lib$/rt.jar
+		}
+		jdk14path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK14PATH $dp(%JDK_PATH%)
+		}
+		jdk15
+		{
+#			HOMEDRIVE %DEVROOT%
+#			HOMEPATH $/jdk151
+			JAVAHOME %JDK15PATH%
+			JAVA_HOME %JDK15PATH%
+			JDKINC %JDK15PATH%$/include$/win32;%JDK15PATH%$/include
+			JDKINCS -I%JDK15PATH%$/include -I%JDK15PATH%$/include$/win32
+			JDKLIB %JDK15PATH%$/lib
+			JDKLIBS %JDK15PATH%$/lib
+			JDKPATH %JDK15PATH%$/bin
+			JDK_VERSION 150
+			JREPATH %JDK15PATH%$/jre$/bin$/client
+			XCLASSPATH .;%JDK15PATH%$/jre$/lib$/rt.jar
+		}
+		jdk15path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_JDK15PATH $dp(%JDK_PATH%)
+		}
+		ojdk16
+		{
+#			HOMEDRIVE %DEVROOT%
+#			HOMEPATH $/openjdk-6-b08-windows-i586
+			JAVA_HOME %OJDK16PATH%
+			JDKINC %OJDK16PATH%$/include$/win32;%OJDK16PATH%$/include
+			JDKINCS -I%OJDK16PATH%$/include -I%OJDK16PATH%$/include$/win32
+			JDKLIB %OJDK16PATH%$/lib
+			JDKLIBS %OJDK16PATH%$/lib
+			JDKPATH %OJDK16PATH%$/bin
+			JDK_VERSION 160
+			JREPATH %OJDK16PATH%$/jre$/bin$/client
+			XCLASSPATH .;%OJDK16PATH%$/jre$/lib$/rt.jar
+		}
+		ojdk16path:0 if X%JDK_PATH%X != XX
+		{
+			SOLAR_OJDK16PATH $dp(%JDK_PATH%)
+		}
+		pro
+		{
+			RES_ENUS TRUE
+		}
+		psdk
+		{
+			PSDK $dp(%STAR_PSDK%)
+		}
+		sourceroot:0 if X%SOURCE_ROOT%X != XX
+		{
+			SOLAR_SOURCE_ROOT $dp(%SOURCE_ROOT%)
+			SOURCE_ROOT_USED TRUE
+		}
+		tmp
+		{
+			SOL_TMP $dp(%SOL_TMP_DIR%)
+		}
+	}
+	extern
+	{
+		COMSPEC
+		DIST_ROOT
+		ENV_ROOT
+		JDK_PATH
+		LOCALINI
+		OSTYPE
+		$dp(SOL_TMP)
+		$dp(SOURCE_ROOT)
+		$dp(TMP)
+		$dp(TEMP)
+	}
+	order common0 bs_sourceroot tmp envroot:0 sourceroot:0 pro common1 distroot:0 cap cax common02 psdk compath common2 common:3 jdk14path:0 jdk15path:0 ojdk16path:0 common jdk14 jdk15 ojdk16
+	reset
+	{
+		COPYALL
+		CXX_X64_BINARY
+		DB2IMP
+		GCRINC
+		GCRLIB
+		GCRPATH
+		LIBMGR_X64_BINARY
+		LINK_X64_BINARY
+		NSIS_PATH
+		OLD_CHAOS
+		PERLDIR
+		SOLAR_ENV_ROOT
+		TFDEF
+		TFDIR
+		WST
+	}
+	script
+	{
+         sh
+            {
+            400: if [ $COPYALL ]; then
+            410:    perl $SOLAR_ENV_ROOT/etools/lucopy.pl all $MAXPROC $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
+            415: fi
+            600: umask 002
+            800: hash -r
+            820: wrapfetch.sh
+            850: if [ "0$SO_GEN_ERROR" -eq 0 ]; then
+            851:       export SO_GEN_ERROR
+            852: fi
+            860: if [ "0$SO_GEN_ERROR2" -eq 0 ]; then
+            861:       export SO_GEN_ERROR2
+            862: fi
+            870: if [ "0$SO_GEN_ERROR" -ne 0 ]; then
+            871:       echo $SO_GEN_ERROR
+            872: fi
+            880: if [ "0$SO_GEN_ERROR2" -ne 0 ]; then
+            881:       echo $SO_GEN_ERROR2
+            882: fi
+        }
+	}
+	switches
+	{
+       	bs_sourceroot SOURCE_ROOT_TMP
+		bsclient
+		cap
+		cax
+		compath STAR_COMPATH
+		distroot
+		envroot
+		jdk14
+		jdk14path
+		jdk15
+		jdk15path
+		l10n L10N_framework
+		ojdk16
+		ojdk16path
+		pro
+		psdk STAR_PSDK
+		sourceroot
+		tmp SOL_TMP_DIR
+	}
+}
+
-- 
cgit 


From c899df67d0d260c3e6f56f2ea90f8e2f183f52bf Mon Sep 17 00:00:00 2001
From: obo <obo@openoffice.org>
Date: Wed, 30 Jun 2010 17:18:24 +0200
Subject: OOO330

---
 solenv/inc/minor.mk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'solenv')

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 42eb91b48474..b6c424446dcf 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
-RSCVERSION=300
-RSCREVISION=300m84(Build:9512)
-BUILD=9512
-LAST_MINOR=m84
-SOURCEVERSION=DEV300
+RSCVERSION=330
+RSCREVISION=330m0(Build:9513)
+BUILD=9513
+LAST_MINOR=m0
+SOURCEVERSION=OOO330
-- 
cgit 


From f50707e6b60370518cc411b8cb7d213f062bd59f Mon Sep 17 00:00:00 2001
From: obo <obo@openoffice.org>
Date: Wed, 30 Jun 2010 17:36:00 +0200
Subject: masterfix: #i10000# set WITH_LANG to all languages

---
 solenv/config/sooo330.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'solenv')

diff --git a/solenv/config/sooo330.ini b/solenv/config/sooo330.ini
index 3e80e1460885..529bdb599439 100644
--- a/solenv/config/sooo330.ini
+++ b/solenv/config/sooo330.ini
@@ -93,7 +93,7 @@ common
 			product full
 			PROEXT .pro
 			PROFULLSWITCH product=full
-			WITH_LANG en-US de es fr hu it ja ko nl pl pt pt-BR ru sv th tr zh-CN zh-TW ar
+			WITH_LANG en-US af ar as ast be-BY bg bn bo br brx bs ca ca-XV cs cy da de dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kid kk km kn ko kok ks ku lt lv mai mk ml mn mni mr my nb ne nl nn nr ns oc om or pa-IN pap pl pt pt-BR ro ru rw sa-IN sat sd sh si sk sl sr ss st sv sw-TZ ta te tg th tn tr ts ug uk ur uz ve vi xh zh-CN zh-TW zu
 		}
 		pro:1 IF %UPDATER% != YES
 		{
-- 
cgit 


From 09834f7dbd7086e6bf1c360c443fe5cf12c55b53 Mon Sep 17 00:00:00 2001
From: obo <obo@openoffice.org>
Date: Thu, 1 Jul 2010 16:10:56 +0200
Subject: #i10000# enable crash reporter for MWS build

---
 solenv/config/sooo330.ini | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'solenv')

diff --git a/solenv/config/sooo330.ini b/solenv/config/sooo330.ini
index 529bdb599439..d38c87344596 100644
--- a/solenv/config/sooo330.ini
+++ b/solenv/config/sooo330.ini
@@ -66,6 +66,7 @@ common
 		}
 		common:3 IF %UPDATER% != YES
 		{
+            ENABLE_CRASHDUMP DUMMY
 		}
 		crashdump
 		{
@@ -90,6 +91,7 @@ common
 		pro:0 IF %UPDATER% == YES
 		{
 			DELIVER_TO_ZIP TRUE
+			ENABLE_CRASHDUMP TRUE
 			product full
 			PROEXT .pro
 			PROFULLSWITCH product=full
-- 
cgit 


From 3d31ac2617ceb452debc86e2da1e7cade20cd123 Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Fri, 2 Jul 2010 12:40:16 +0200
Subject: vgbugs10: verbose dmake output in html mode

---
 solenv/bin/build.pl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'solenv')

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index 445b33b37b1e..8240b5b6206e 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1132,6 +1132,7 @@ sub get_commands {
     while ($arg = pop(@dmake_args)) {
         $dmake .= ' '.$arg;
     };
+    $dmake .= ' verbose=true' if ($html);
 };
 
 #
-- 
cgit 


From 850ea2c2fd327efed4542a9fb62afe70a3043a5e Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Fri, 2 Jul 2010 15:48:55 +0200
Subject: native317 #i112626# typical instead of complete installation

---
 solenv/bin/make_installer.pl                  | 10 ++---
 solenv/bin/modules/installer/control.pm       | 10 +++++
 solenv/bin/modules/installer/epmfile.pm       | 54 +++++++++++++++++++++++++++
 solenv/bin/modules/installer/globals.pm       |  1 +
 solenv/bin/modules/installer/parameter.pm     |  2 +-
 solenv/bin/modules/installer/scriptitems.pm   |  2 +-
 solenv/bin/modules/installer/systemactions.pm | 26 ++++++++++++-
 7 files changed, 97 insertions(+), 8 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 127f28cd7631..335ecf961253 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -655,7 +655,6 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
     $installer::globals::globalinfo_copied = 1;
 
     my $logminor = "";
-    my $avoidlanginlog = 0;
     if ( $installer::globals::updatepack ) { $logminor = $installer::globals::lastminor; }
     else { $logminor = $installer::globals::minor; }
 
@@ -663,14 +662,15 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
     my $loglanguagestring_orig = $loglanguagestring;
     if (length($loglanguagestring) > $installer::globals::max_lang_length)
     {
+        my $number_of_languages = installer::systemactions::get_number_of_langs($loglanguagestring);
         chomp(my $shorter = `echo $loglanguagestring | md5sum | sed -e "s/ .*//g"`);
-        $loglanguagestring = $shorter;
-        $avoidlanginlog = 1;
+        my $id = substr($shorter, 0, 8); # taking only the first 8 digits
+        $loglanguagestring = "lang_" . $number_of_languages . "_id_" . $id;
     }
 
     $installer::globals::logfilename = "log_" . $installer::globals::build;
     if ( $logminor ne "" ) { $installer::globals::logfilename .= "_" . $logminor; }
-    if ( ! $avoidlanginlog ) { $installer::globals::logfilename .= "_" . $loglanguagestring; }
+    $installer::globals::logfilename .= "_" . $loglanguagestring;
     $installer::globals::logfilename .= ".log";
     $loggingdir = $loggingdir . $loglanguagestring . $installer::globals::separator;
     installer::systemactions::create_directory($loggingdir);
@@ -732,7 +732,7 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ )
 
     if (!($installer::globals::is_copy_only_project))
     {
-        if ( $installer::globals::iswindowsbuild )
+        if (( $installer::globals::iswindowsbuild ) && ( $installer::globals::packageformat ne "archive" ) && ( $installer::globals::packageformat ne "installed" ))
         {
             installer::windows::msiglobal::set_global_code_variables($languagesarrayref, $languagestringref, $allvariableshashref, $alloldproperties);
         }
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index f4edc8129255..bd700be38758 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -405,6 +405,16 @@ sub determine_ship_directory
     my $shipdrive = $ENV{'SHIPDRIVE'};
 
     my $languagestring = $$languagesref;
+
+    if (length($languagestring) > $installer::globals::max_lang_length )
+    {
+        my $number_of_languages = installer::systemactions::get_number_of_langs($languagestring);
+        chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
+        # $languagestring = $shorter;
+        my $id = substr($shorter, 0, 8); # taking only the first 8 digits
+        $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
+    }
+
     my $productstring = $installer::globals::product;
     my $productsubdir = "";
 
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 136eca913dd9..b7c348973de6 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2308,6 +2308,54 @@ sub determine_rpm_version
     return $rpmversion;
 }
 
+####################################################
+# Writing some info about rpm into the log file
+####################################################
+
+sub log_rpm_info
+{
+    my $systemcall = "";
+    my $infoline = "";
+
+    $infoline = "\nLogging rpmrc content using --showrc\n\n";
+    push( @installer::globals::logfileinfo, $infoline);
+
+    if ( $installer::globals::rpm ne "" )
+    {
+        $systemcall = "$installer::globals::rpm --showrc |";
+    }
+    else
+    {
+        $systemcall = "rpm --showrc |";
+    }
+
+    my @fullrpmout = ();
+
+    open (RPM, "$systemcall");
+    while (<RPM>) {push(@fullrpmout, $_); }
+    close (RPM);
+
+    if ( $#fullrpmout > -1 )
+    {
+        for ( my $i = 0; $i <= $#fullrpmout; $i++ )
+        {
+            my $rpmout = $fullrpmout[$i];
+            $rpmout =~ s/\s*$//g;
+
+            $infoline = "$rpmout\n";
+            push( @installer::globals::logfileinfo, $infoline);
+        }
+    }
+    else
+    {
+        $infoline = "Problem in systemcall: $systemcall : No return value\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+
+    $infoline = "End of logging rpmrc\n\n";
+    push( @installer::globals::logfileinfo, $infoline);
+}
+
 #################################################
 # Systemcall to start the packaging process
 #################################################
@@ -2560,6 +2608,12 @@ sub create_packages_without_epm
             mkdir($buildroot = $dir . "/" . $epmdir . "BUILD/");
         }
 
+        if ( ! $installer::globals::rpminfologged )
+        {
+            log_rpm_info();
+            $installer::globals::rpminfologged = 1;
+        }
+
         my $systemcall = "$rpmcommand -bb --define \"_unpackaged_files_terminate_build  0\" $specfilename --target $target $buildrootstring 2\>\&1 |";
 
         installer::logger::print_message( "... $systemcall ...\n" );
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 71429e278f4e..ccef960e0337 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -179,6 +179,7 @@ BEGIN
     $rpm = "";
     $rpmcommand = "";
     $rpmquerycommand = "";
+    $rpminfologged = 0;
     $debian = "";
     $installertypedir = "";
     $controlledmakecabversion = "5";
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 0961b598902f..d3ce8a1d3a32 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -530,7 +530,7 @@ sub control_required_parameter
         # and the UpgradeCode for the product are defined.
         # The name "codes.txt" can be overwritten in Product definition with CODEFILENAME (msiglobal.pm)
 
-        if ($installer::globals::iswindowsbuild)
+        if (( $installer::globals::iswindowsbuild ) && ( $installer::globals::packageformat ne "archive" ) && ( $installer::globals::packageformat ne "installed" ))
         {
             $installer::globals::codefilename = $installer::globals::idttemplatepath  . $installer::globals::separator . $installer::globals::codefilename;
             installer::files::check_file($installer::globals::codefilename);
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index a073e60a6697..7a2c4cb3f5e3 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -1868,7 +1868,7 @@ sub remove_Languagepacklibraries_from_Installset
     }
 
     $infoline = "\n";
-    push( @installer::globals::logfileinfo, $infoline);
+    push( @installer::globals::globallogfileinfo, $infoline);
 
     return \@newitemsarray;
 }
diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm
index 981dc40f3209..24b070574189 100644
--- a/solenv/bin/modules/installer/systemactions.pm
+++ b/solenv/bin/modules/installer/systemactions.pm
@@ -291,6 +291,27 @@ sub remove_empty_directory
     }
 }
 
+#######################################################################
+# Calculating the number of languages in the string
+#######################################################################
+
+sub get_number_of_langs
+{
+    my ($languagestring) = @_;
+
+    my $number = 1;
+
+    my $workstring = $languagestring;
+
+    while ( $workstring =~ /^\s*(.*)_(.*?)\s*$/ )
+    {
+        $workstring = $1;
+        $number++;
+    }
+
+    return $number;
+}
+
 #######################################################################
 # Creating the directories, in which files are generated or unzipped
 #######################################################################
@@ -380,8 +401,11 @@ sub create_directories
 
             if (length($languagestring) > $installer::globals::max_lang_length )
             {
+                my $number_of_languages = get_number_of_langs($languagestring);
                 chomp(my $shorter = `echo $languagestring | md5sum | sed -e "s/ .*//g"`);
-                $languagestring = $shorter;
+                # $languagestring = $shorter;
+                my $id = substr($shorter, 0, 8); # taking only the first 8 digits
+                $languagestring = "lang_" . $number_of_languages . "_id_" . $id;
             }
 
             $path = $path . $languagestring  . $installer::globals::separator;
-- 
cgit 


From 49aafa184a89d4ba04a2cbf0840f757cee142f7e Mon Sep 17 00:00:00 2001
From: Kai Sommerfeld <kso@openoffice.org>
Date: Sun, 4 Jul 2010 11:38:46 +0200
Subject: #i110653# - bumped minor version to 3

---
 solenv/inc/version.hrc    | 6 +++---
 solenv/inc/version_so.hrc | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'solenv')

diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
index d4c205f942b9..9c2b9be4189a 100644
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -26,14 +26,14 @@
  *************************************************************************/
 
 #define VERSION         3
-#define SUBVERSION      2
+#define SUBVERSION      3
 //#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_CONCEPT   0
 //#define VER_BETA      6
 #define VER_FINAL       0
 
@@ -54,7 +54,7 @@
 #endif
 
 // -----------------------------------------------------------------------
-//              language/character set specification table
+//                  language/character set specification table
 // -----------------------------------------------------------------------
 
 RCD_LANGUAGE rcdata
diff --git a/solenv/inc/version_so.hrc b/solenv/inc/version_so.hrc
index 70ea1c193ee6..9773f10fdddf 100644
--- a/solenv/inc/version_so.hrc
+++ b/solenv/inc/version_so.hrc
@@ -26,14 +26,14 @@
  *************************************************************************/
 
 #define VERSION         9
-#define SUBVERSION      2
+#define SUBVERSION      3
 //#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_CONCEPT   0
 //#define VER_BETA      6
 #define VER_FINAL       0
 
@@ -54,7 +54,7 @@
 #endif
 
 // -----------------------------------------------------------------------
-//              language/character set specification table
+//                  language/character set specification table
 // -----------------------------------------------------------------------
 
 RCD_LANGUAGE rcdata
-- 
cgit 


From b67c80ea3c76fc4c2c39d66c970f6a46e4b6b9cf Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Wed, 7 Jul 2010 12:09:57 +0200
Subject: native317 #i112626# solving logging problem

---
 solenv/bin/modules/installer/epmfile.pm | 1 +
 1 file changed, 1 insertion(+)

(limited to 'solenv')

diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index b7c348973de6..92ed8af952f6 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2343,6 +2343,7 @@ sub log_rpm_info
             $rpmout =~ s/\s*$//g;
 
             $infoline = "$rpmout\n";
+            $infoline =~ s/error/e_r_r_o_r/i;  # avoiding log problems
             push( @installer::globals::logfileinfo, $infoline);
         }
     }
-- 
cgit 


From 2b814f262f6c1644814ecea8d56c1f07faccc468 Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Wed, 7 Jul 2010 12:16:12 +0200
Subject: native317 #i112626# solving logging problem

---
 solenv/bin/modules/installer/epmfile.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 92ed8af952f6..f8e35f208251 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -2343,7 +2343,7 @@ sub log_rpm_info
             $rpmout =~ s/\s*$//g;
 
             $infoline = "$rpmout\n";
-            $infoline =~ s/error/e_r_r_o_r/i;  # avoiding log problems
+            $infoline =~ s/error/e_r_r_o_r/gi;  # avoiding log problems
             push( @installer::globals::logfileinfo, $infoline);
         }
     }
-- 
cgit 


From 94cb0ba6337befecf82c553e645f7bbc6aa38967 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed, 7 Jul 2010 15:37:18 +0200
Subject: txtl10n: #i113008# add support for xtx files (single text files)

---
 solenv/inc/target.mk      |  1 +
 solenv/inc/tg_xtxmerge.mk | 67 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100755 solenv/inc/tg_xtxmerge.mk

(limited to 'solenv')

diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 1a4ad6e182a0..13874a0d810a 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -2043,6 +2043,7 @@ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY :
 
 .INCLUDE : tg_merge.mk
 .INCLUDE : tg_propmerge.mk
+.INCLUDE : tg_xtxmerge.mk
 
 wordcount:
     wc *.* >> $(TMP)/wc.lst
diff --git a/solenv/inc/tg_xtxmerge.mk b/solenv/inc/tg_xtxmerge.mk
new file mode 100755
index 000000000000..7fb661d345db
--- /dev/null
+++ b/solenv/inc/tg_xtxmerge.mk
@@ -0,0 +1,67 @@
+#*************************************************************************
+#
+# 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 "$(XTXFILES)"!=""
+ALLTAR : $(MISC)/$(TARGET).pmerge.mk $(XTXFILES)
+
+$(MISC)/$(TARGET).pmerge.mk :  $(XTXFILES)
+
+$(XTXFILES) : $(LOCALIZESDF)
+
+.INCLUDE .IGNORE : $(MISC)/$(TARGET).pmerge.mk
+
+.IF "$(alllangiso)"!="$(last_merge)"
+MERGEPHONY:=.PHONY
+.ENDIF          # "$(alllangiso)" != "$(last_merge)"
+
+$(COMMONMISC)/$(PACKAGE)/%.xtx $(MERGEPHONY) : %.xtx
+    @@-$(MKDIRHIER) $(@:d)
+.IF "$(WITH_LANG)"==""
+    $(COMMAND_ECHO)$(COPY) $< $@
+.ELSE          # "$(WITH_LANG)"==""
+    @@-$(RM) $@
+    $(COMMAND_ECHO)@noop $(assign PMERGELIST+:=$(<:f))
+    $(COMMAND_ECHO)@noop $(assign PDESTDIR:=$(@:d))
+.ENDIF          # "$(WITH_LANG)"==""
+
+$(MISC)/$(TARGET).pmerge.mk : $(PMERGELIST)
+.IF "$(WITH_LANG)"!=""
+# xtxex command file requirements:
+# - one file per line
+# - no spaces
+# - no empty lines
+# $(uniq ...) to workaround $assign adding the value twice...
+    @noop $(assign PMERGEFILELIST:=$(uniq $(PMERGELIST)))
+    $(COMMAND_ECHO) $(SOLARBINDIR)/xtxex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR) -i @$(mktmp $(PMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF)
+.ENDIF          # "$(WITH_LANG)"!=""
+
+    @-$(RM) $@
+    $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
+
+.ENDIF          # "$(XTXFILES)"!=""
+
+
-- 
cgit 


From 1ac22a94e060d6de3af716ce818eb5efa0e90d4c Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Thu, 8 Jul 2010 12:26:34 +0200
Subject: vgbugs10: added new add_repository method

---
 solenv/bin/modules/SourceConfig.pm | 139 ++++++++++++++++++-------------------
 1 file changed, 69 insertions(+), 70 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index 0bf4e7a1508d..06d72d06fe4c 100644
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -38,7 +38,7 @@ package SourceConfig;
 use strict;
 
 use constant SOURCE_CONFIG_FILE_NAME => 'source_config';
-use constant SOURCE_CONFIG_VERSION => 2;
+use constant SOURCE_CONFIG_VERSION => 3;
 
 use Carp;
 use Cwd;
@@ -95,14 +95,10 @@ sub new {
     $self->{WARNINGS} = [];
     $self->{REPORT_MESSAGES} = [];
     $self->{CONFIG_FILE_CONTENT} = [];
-    $self->{DEFAULT_REPOSITORY} = undef;
-    if (defined $self->{USER_SOURCE_ROOT}) {
-        ${$self->{REPOSITORIES}}{File::Basename::basename($self->{USER_SOURCE_ROOT})} = $self->{USER_SOURCE_ROOT};
-        $self->{DEFAULT_REPOSITORY} = File::Basename::basename($self->{USER_SOURCE_ROOT});
-    };
     $self->{SOURCE_CONFIG_FILE} = get_config_file($self->{SOURCE_ROOT}) if (!defined $self->{SOURCE_CONFIG_FILE});
     $self->{SOURCE_CONFIG_DEFAULT} = $self->{SOURCE_ROOT} .'/'.SOURCE_CONFIG_FILE_NAME;
     read_config_file($self);
+       get_module_paths($self);
     bless($self, $class);
     return $self;
 }
@@ -119,6 +115,19 @@ sub get_repositories
     return sort keys %{$self->{REPOSITORIES}};
 }
 
+sub add_repository
+{
+    my $self        = shift;
+    my $new_rep_path = shift;
+    $new_rep_path = Cwd::realpath($new_rep_path);
+    my $new_rep_name = File::Basename::basename($new_rep_path);
+    if (defined ${$self->{REPOSITORIES}}{$new_rep_name}) {
+        croak("Repository $new_rep_name is already defined!!");
+    };
+    ${$self->{REPOSITORIES}}{$new_rep_name} = $new_rep_path;
+    $self -> get_repository_module_paths($new_rep_name);
+}
+
 sub get_config_file_default_path {
     my $self        = shift;
     return $self->{SOURCE_CONFIG_DEFAULT};
@@ -132,7 +141,6 @@ sub get_config_file_path {
 sub get_module_repository {
     my $self = shift;
     my $module = shift;
-    $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}});
     if (defined ${$self->{MODULE_REPOSITORY}}{$module}) {
         return ${$self->{MODULE_REPOSITORY}}{$module};
     } else {
@@ -144,7 +152,6 @@ sub get_module_repository {
 sub get_module_path {
     my $self = shift;
     my $module = shift;
-    $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}});
     if (defined ${$self->{MODULE_PATHS}}{$module}) {
         return ${$self->{MODULE_PATHS}}{$module};
     } else {
@@ -156,10 +163,17 @@ sub get_module_path {
 sub get_module_build_list {
     my $self = shift;
     my $module = shift;
-    $self -> get_buildlist_paths() if (!scalar keys %{$self->{MODULE_BUILD_LIST_PATHS}});
     if (defined ${$self->{MODULE_BUILD_LIST_PATHS}}{$module}) {
         return ${$self->{MODULE_BUILD_LIST_PATHS}}{$module};
     } else {
+        my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names
+        foreach (@possible_build_lists) {
+            my $possible_path = ${$self->{MODULE_PATHS}}{$module} . "/prj/$_";
+            if (-e $possible_path) {
+                ${$self->{MODULE_BUILD_LIST_PATHS}}{$module} = $possible_path;
+                return $possible_path;
+            };
+        };
         Carp::cluck("No build list in module $module found!!\n") if ($self->{DEBUG});
         return undef;
     };
@@ -169,7 +183,6 @@ sub get_all_modules
 {
     my $self = shift;
     my $module = shift;
-    $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}});
     return sort keys %{$self->{MODULE_PATHS}};
 };
 
@@ -179,7 +192,6 @@ sub get_active_modules
     if (scalar keys %{$self->{ACTIVATED_MODULES}}) {
         return sort keys %{$self->{ACTIVATED_MODULES}};
     }
-    $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}});
        return sort keys %{$self->{REAL_MODULES}};
 }
 
@@ -190,49 +202,42 @@ sub is_active
     if (scalar keys %{$self->{ACTIVATED_MODULES}}) {
         return exists ($self->{ACTIVATED_MODULES}{$module});
     }
-       $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}});
     return exists ($self->{REAL_MODULES}{$module});
 }
 
 ##### private methods #####
 
-sub get_buildlist_paths {
+sub get_repository_module_paths {
     my $self        = shift;
-    $self -> get_module_paths() if (!scalar keys %{$self->{MODULE_PATHS}});
-    my @possible_build_lists = ('build.lst', 'build.xlist'); # build lists names
-    foreach my $module (keys %{$self->{MODULE_PATHS}}) {
-        foreach (@possible_build_lists) {
-            my $possible_path = ${$self->{MODULE_PATHS}}{$module} . "/prj/$_";
-            ${$self->{MODULE_BUILD_LIST_PATHS}}{$module} = $possible_path if (-e $possible_path);
+    my $repository        = shift;
+    my $repository_path = ${$self->{REPOSITORIES}}{$repository};
+    if (opendir DIRHANDLE, $repository_path) {
+        foreach my $module (readdir(DIRHANDLE)) {
+            next if (($module =~ /^\.+/) || (!-d "$repository_path/$module"));
+            my $module_entry = $module;
+            if (($module !~ s/\.lnk$//) && ($module !~ s/\.link$//)) {
+                $self->{REAL_MODULES}{$module}++;
+            }
+            my $possible_path = "$repository_path/$module_entry";
+            if (-d $possible_path) {
+                if (defined ${$self->{MODULE_PATHS}}{$module}) {
+                    close DIRHANDLE;
+                    croak("Ambiguous paths for module $module: $possible_path and " . ${$self->{MODULE_PATHS}}{$module});
+                };
+                ${$self->{MODULE_PATHS}}{$module} = $possible_path;
+                ${$self->{MODULE_REPOSITORY}}{$module} = $repository;
+            }
         };
+        close DIRHANDLE;
+    } else {
+        croak("Cannot read $repository_path repository content");
     };
 };
 
 sub get_module_paths {
     my $self        = shift;
     foreach my $repository (keys %{$self->{REPOSITORIES}}) {
-        my $repository_path = ${$self->{REPOSITORIES}}{$repository};
-        if (opendir DIRHANDLE, $repository_path) {
-            foreach my $module (readdir(DIRHANDLE)) {
-                next if (($module =~ /^\.+/) || (!-d "$repository_path/$module"));
-                my $module_entry = $module;
-                if (($module !~ s/\.lnk$//) && ($module !~ s/\.link$//)) {
-                    $self->{REAL_MODULES}{$module}++;
-                }
-                my $possible_path = "$repository_path/$module_entry";
-                if (-d $possible_path) {
-                    if (defined ${$self->{MODULE_PATHS}}{$module}) {
-                        close DIRHANDLE;
-                        croak("Ambiguous paths for module $module: $possible_path and " . ${$self->{MODULE_PATHS}}{$module});
-                    };
-                    ${$self->{MODULE_PATHS}}{$module} = $possible_path;
-                    ${$self->{MODULE_REPOSITORY}}{$module} = $repository;
-                }
-            };
-            close DIRHANDLE;
-        } else {
-            croak("Cannot read $_ repository content");
-        };
+        get_repository_module_paths($self, $repository);
     };
     my @false_actives = ();
     foreach (keys %{$self->{ACTIVATED_MODULES}}) {
@@ -249,32 +254,22 @@ sub get_config_file {
     return '';
 };
 
-sub get_repository_root {
+#
+# Fallback - default repository is based on the object initialization parameter...
+#
+sub get_fallback_repository {
     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;
-        };
+    if (defined $self->{USER_SOURCE_ROOT}) {
+        ${$self->{REPOSITORIES}}{File::Basename::basename($self->{USER_SOURCE_ROOT})} = $self->{USER_SOURCE_ROOT};
+        return;
     };
-    Carp::cluck('Cannot open/find source_config and/or determine hg root directory for ' . cwd() . ". Taking $ENV{SOLARSRC} as default repository\n\n");
-    return $ENV{SOLARSRC};
+    croak('Cannot determine repository. Please make your checks!!');
 };
 
 sub read_config_file {
     my $self = shift;
     if (!$self->{SOURCE_CONFIG_FILE}) {
-        my $repository_root = get_repository_root($self);
-        ${$self->{REPOSITORIES}}{File::Basename::basename($repository_root)} = $repository_root;
+        get_fallback_repository($self);
         return;
     };
     my $repository_section = 0;
@@ -307,11 +302,6 @@ sub read_config_file {
                     if (defined $ENV{UPDMINOREXT}) {
                         $repository_source_path .= $ENV{UPDMINOREXT};
                     };
-                    if ((defined $self->{DEFAULT_REPOSITORY}) && (${$self->{REPOSITORIES}}{$self->{DEFAULT_REPOSITORY}} eq $repository_source_path)) {
-                        delete ${$self->{REPOSITORIES}}{$self->{DEFAULT_REPOSITORY}};
-                        $self->{DEFAULT_REPOSITORY} = undef;
-
-                    };
                     ${$self->{REPOSITORIES}}{$1} = $repository_source_path;
                     ${$self->{ACTIVATED_REPOSITORIES}}{$1}++;
                     next;
@@ -325,9 +315,7 @@ sub read_config_file {
         };
         close SOURCE_CONFIG_FILE;
         if (!scalar keys %{$self->{REPOSITORIES}}) {
-            # Fallback - default repository is the directory where is our module...
-            my $hg_root = get_repository_root($self);
-            ${$self->{REPOSITORIES}}{File::Basename::basename($hg_root)} = $hg_root;
+            get_fallback_repository($self);
         };
     } else {
         croak('Cannot open ' . $self->{SOURCE_CONFIG_FILE} . 'for reading');
@@ -381,15 +369,18 @@ sub remove_activated_modules {
 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}});
+    croak('Empty repository list passed for addition to source_config') if (!scalar @{$self->{NEW_REPOSITORIES}});
     $self->{VERBOSE} = shift;
+    foreach (@{$self->{NEW_REPOSITORIES}}) {
+        $self->add_repository($_);
+    };
     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}});
+    croak('Empty module list passed for addition to source_config') if (!scalar @{$self->{NEW_MODULES}});
     $self->{VERBOSE} = shift;
     generate_config_file($self);
 };
@@ -537,6 +528,8 @@ SourceConfig - Perl extension for parsing general info databases
     # Get repositories for the actual workspace:
     $a->get_repositories();
 
+    # Add a repository new_repository for the actual workspace (via full path):
+    $a->add_repository(/DEV300/new_repository);
 
 =head1 DESCRIPTION
 
@@ -561,6 +554,11 @@ SourceConfig::get_repositories()
 Returns sorted list of active repositories for the actual workspace
 
 
+SourceConfig::add_repository(REPOSITORY_PATH)
+
+Adds a repository to the list of active repositories
+
+
 SourceConfig::get_active_modules()
 
 Returns a sorted list of active modules
@@ -624,6 +622,7 @@ Removes all activated repositories from the source_config file
 SourceConfig::new()
 SourceConfig::get_version()
 SourceConfig::get_repositories()
+SourceConfig::add_repository()
 SourceConfig::get_active_modules()
 SourceConfig::get_all_modules()
 SourceConfig::get_module_path($module)
-- 
cgit 


From 46d6b860e537ba02a9d1374ab28096d4e7c70eb3 Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Mon, 12 Jul 2010 11:04:05 +0200
Subject: jl154 #162868# unopkg is back in packaging and installation

---
 solenv/bin/modules/installer/simplepackage.pm | 124 +++++++++++---------------
 1 file changed, 50 insertions(+), 74 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index fdf9fc6fa4c3..09d4f9781e3f 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -82,10 +82,9 @@ sub get_extensions_dir
 
 sub register_extensions
 {
-    my ($officedir, $languagestringref) = @_;
+    my ($officedir, $languagestringref, $presetsdir) = @_;
 
     my $programdir = $officedir . $installer::globals::separator;
-    # if ( $installer::globals::sundirhostname ne "" ) { $programdir = $programdir . $installer::globals::sundirhostname . $installer::globals::separator; }
     if ( $installer::globals::officedirhostname ne "" ) { $programdir = $programdir . $installer::globals::officedirhostname . $installer::globals::separator; }
     $programdir = $programdir . "program";
 
@@ -94,9 +93,6 @@ sub register_extensions
 
     my $infoline = "";
 
-    # my $unopkgfile = $officedir . $installer::globals::separator . "program" .
-    #               $installer::globals::separator . $installer::globals::unopkgfile;
-
     my $unopkgfile = $installer::globals::unopkgfile;
 
     my $unopkgexists = 1;
@@ -107,87 +103,64 @@ sub register_extensions
         push( @installer::globals::logfileinfo, $infoline);
     }
 
-    # my $extensiondir = $officedir . $installer::globals::separator . "share" .
-    #           $installer::globals::separator . "extension" .
-    #           $installer::globals::separator . "install";
-
-    my $extensiondir = ".." . $installer::globals::separator . "share" . $installer::globals::separator . "extension" . $installer::globals::separator . "install";
-
-    my $allextensions = installer::systemactions::find_file_with_file_extension("oxt", $extensiondir);
-
-    if (( $#{$allextensions} > -1 ) && ( $unopkgexists ))
+    if ( $unopkgexists )
     {
         my $currentdir = cwd();
         print "... current dir: $currentdir ...\n";
         $infoline = "Current dir: $currentdir\n";
         push( @installer::globals::logfileinfo, $infoline);
 
-        for ( my $i = 0; $i <= $#{$allextensions}; $i++ )
-        {
-            my $oneextension = $extensiondir . $installer::globals::separator . ${$allextensions}[$i];
-
-            # 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"); }
+        if ( ! -f $unopkgfile ) { installer::exiter::exit_program("ERROR: $unopkgfile not found!", "register_extensions"); }
 
-            my $localtemppath = installer::systemactions::create_directories("uno", $languagestringref);
+        my $localtemppath = installer::systemactions::create_directories("uno", $languagestringref);
 
-            if ( $installer::globals::iswindowsbuild )
+        if ( $installer::globals::iswindowsbuild )
+        {
+            if ( $^O =~ /cygwin/i )
             {
-                if ( $^O =~ /cygwin/i )
-                {
-                    $localtemppath = $installer::globals::cyg_temppath;
-                }
-                else
-                {
-                    $windowsslash = "\/";
-                }
-                $localtemppath =~ s/\\/\//g;
-                $localtemppath = "/".$localtemppath;
+                $localtemppath = $installer::globals::cyg_temppath;
             }
-            my $systemcall = $unopkgfile . " add --shared --suppress-license --verbose " . $oneextension . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
+            else
+            {
+                $windowsslash = "\/";
+            }
+            $localtemppath =~ s/\\/\//g;
+            $localtemppath = "/".$localtemppath;
+        }
 
-            print "... $systemcall ...\n";
+        my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=file://" . $presetsdir . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
 
-            $infoline = "Systemcall: $systemcall\n";
-            push( @installer::globals::logfileinfo, $infoline);
+        print "... $systemcall ...\n";
 
-            my @unopkgoutput = ();
+        $infoline = "Systemcall: $systemcall\n";
+        push( @installer::globals::logfileinfo, $infoline);
 
-            open (UNOPKG, $systemcall);
-            while (<UNOPKG>)
-            {
-                my $lastline = $_;
-                push(@unopkgoutput, $lastline);
-            }
-            close (UNOPKG);
+        my @unopkgoutput = ();
+
+        open (UNOPKG, $systemcall);
+        while (<UNOPKG>)
+        {
+            my $lastline = $_;
+            push(@unopkgoutput, $lastline);
+        }
+        close (UNOPKG);
 
-            my $returnvalue = $?;   # $? contains the return value of the systemcall
+        my $returnvalue = $?;   # $? contains the return value of the systemcall
 
-            if ($returnvalue)
-            {
-                # Writing content of @unopkgoutput only in the error case into the log file. Sometimes it
-                # contains strings like "Error" even in the case of success. This causes a packaging error
-                # when the log file is analyzed at the end, even if there is no real error.
-                for ( my $j = 0; $j <= $#unopkgoutput; $j++ ) { push( @installer::globals::logfileinfo, "$unopkgoutput[$j]"); }
+        if ($returnvalue)
+        {
+            # Writing content of @unopkgoutput only in the error case into the log file. Sometimes it
+            # contains strings like "Error" even in the case of success. This causes a packaging error
+            # when the log file is analyzed at the end, even if there is no real error.
+            for ( my $j = 0; $j <= $#unopkgoutput; $j++ ) { push( @installer::globals::logfileinfo, "$unopkgoutput[$j]"); }
 
-                $infoline = "ERROR: Could not execute \"$systemcall\"!\nExitcode: '$returnvalue'\n";
-                push( @installer::globals::logfileinfo, $infoline);
-                installer::exiter::exit_program("ERROR: $systemcall failed!", "register_extensions");
-            }
-            else
-            {
-                $infoline = "Success: Executed \"$systemcall\" successfully!\n";
-                push( @installer::globals::logfileinfo, $infoline);
-            }
+            $infoline = "ERROR: Could not execute \"$systemcall\"!\nExitcode: '$returnvalue'\n";
+            push( @installer::globals::logfileinfo, $infoline);
+            installer::exiter::exit_program("ERROR: $systemcall failed!", "register_extensions");
         }
-    }
-    else
-    {
-        if ( ! ( $#{$allextensions} > -1 ))
+        else
         {
-            $infoline = "No extensions located in directory $extensiondir.\n";
+            $infoline = "Success: Executed \"$systemcall\" successfully!\n";
             push( @installer::globals::logfileinfo, $infoline);
         }
     }
@@ -655,6 +628,8 @@ sub create_simple_package
     installer::logger::print_message( "... creating directories ...\n" );
     installer::logger::include_header_into_logfile("Creating directories:");
 
+    my $presetsdir = "";
+
     for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
     {
         my $onedir = ${$dirsref}[$i];
@@ -662,6 +637,8 @@ sub create_simple_package
         if ( $onedir->{'HostName'} )
         {
             my $destdir = $subfolderdir . $installer::globals::separator . $onedir->{'HostName'};
+            if ( $destdir =~ /\Wpresets\s*$/ ) { $presetsdir = $destdir; }
+
             if ( ! -d $destdir )
             {
                 if ( $^O =~ /cygwin/i ) # Cygwin performance check
@@ -787,19 +764,18 @@ sub create_simple_package
         system($localcall);
     }
 
-    # Registering the extensions
-
-    # installer::logger::print_message( "... registering extensions ...\n" );
-    # installer::logger::include_header_into_logfile("Registering extensions:");
-    # register_extensions($subfolderdir, $languagestringref);
-
     installer::logger::print_message( "... removing superfluous directories ...\n" );
     installer::logger::include_header_into_logfile("Removing superfluous directories:");
 
     my $extensionfolder = get_extensions_dir($subfolderdir);
-
     installer::systemactions::remove_empty_dirs_in_folder($extensionfolder);
 
+    # Registering the extensions
+
+    installer::logger::print_message( "... registering extensions ...\n" );
+    installer::logger::include_header_into_logfile("Registering extensions:");
+    register_extensions($subfolderdir, $languagestringref, $presetsdir);
+
     if ( $installer::globals::compiler =~ /^unxmacx/ )
     {
         installer::worker::put_scpactions_into_installset("$installdir/$packagename");
-- 
cgit 


From 034fc5820ef2e9394fc07bcd0e262af699c6cbb4 Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Mon, 12 Jul 2010 13:26:09 +0200
Subject: jl154 #162868# unopkg is back in packaging and installation

---
 solenv/bin/modules/installer/simplepackage.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 09d4f9781e3f..4db664fbce62 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -82,7 +82,7 @@ sub get_extensions_dir
 
 sub register_extensions
 {
-    my ($officedir, $languagestringref, $presetsdir) = @_;
+    my ($officedir, $languagestringref, $bundleddir) = @_;
 
     my $programdir = $officedir . $installer::globals::separator;
     if ( $installer::globals::officedirhostname ne "" ) { $programdir = $programdir . $installer::globals::officedirhostname . $installer::globals::separator; }
@@ -128,7 +128,7 @@ sub register_extensions
             $localtemppath = "/".$localtemppath;
         }
 
-        my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=file://" . $presetsdir . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
+        my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $bundleddir . "\"" . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
 
         print "... $systemcall ...\n";
 
@@ -628,7 +628,7 @@ sub create_simple_package
     installer::logger::print_message( "... creating directories ...\n" );
     installer::logger::include_header_into_logfile("Creating directories:");
 
-    my $presetsdir = "";
+    my $bundleddir = "";
 
     for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
     {
@@ -637,7 +637,7 @@ sub create_simple_package
         if ( $onedir->{'HostName'} )
         {
             my $destdir = $subfolderdir . $installer::globals::separator . $onedir->{'HostName'};
-            if ( $destdir =~ /\Wpresets\s*$/ ) { $presetsdir = $destdir; }
+            if ( $destdir =~ /\Wbundled\s*$/ ) { $bundleddir = $destdir; }
 
             if ( ! -d $destdir )
             {
@@ -774,7 +774,7 @@ sub create_simple_package
 
     installer::logger::print_message( "... registering extensions ...\n" );
     installer::logger::include_header_into_logfile("Registering extensions:");
-    register_extensions($subfolderdir, $languagestringref, $presetsdir);
+    register_extensions($subfolderdir, $languagestringref, $bundleddir);
 
     if ( $installer::globals::compiler =~ /^unxmacx/ )
     {
-- 
cgit 


From 6efd2ceb1d4eb10d139dbc5128ab5042283fe56d Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Mon, 12 Jul 2010 15:22:50 +0200
Subject: jl154 #162868# unopkg is back in packaging and installation

---
 solenv/bin/modules/installer/simplepackage.pm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'solenv')

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 4db664fbce62..f8ef517577ff 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -119,6 +119,8 @@ sub register_extensions
             if ( $^O =~ /cygwin/i )
             {
                 $localtemppath = $installer::globals::cyg_temppath;
+                $bundleddir = qx{cygpath -m "$bundleddir"};
+                chomp($bundleddir);
             }
             else
             {
-- 
cgit 


From ce95b85ffe0fa3faa0e6402195877c5cd623877b Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Mon, 12 Jul 2010 16:20:39 +0200
Subject: jl154 #162868# unopkg is back in packaging and installation

---
 solenv/bin/modules/installer/simplepackage.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index f8ef517577ff..dae7c95b8834 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -130,7 +130,7 @@ sub register_extensions
             $localtemppath = "/".$localtemppath;
         }
 
-        my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $bundleddir . "\"" . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
+        my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file:///" . $bundleddir . "\"" . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
 
         print "... $systemcall ...\n";
 
-- 
cgit 


From 7e0f1587c19c29fe6aa0b83a08e6515e65d050e7 Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Mon, 12 Jul 2010 18:02:39 +0200
Subject: jl154 #162868# unopkg is back in packaging and installation

---
 solenv/bin/modules/installer/simplepackage.pm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index dae7c95b8834..423d0b74eb4c 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -114,6 +114,8 @@ sub register_extensions
 
         my $localtemppath = installer::systemactions::create_directories("uno", $languagestringref);
 
+        my $slash = "";
+
         if ( $installer::globals::iswindowsbuild )
         {
             if ( $^O =~ /cygwin/i )
@@ -122,15 +124,11 @@ sub register_extensions
                 $bundleddir = qx{cygpath -m "$bundleddir"};
                 chomp($bundleddir);
             }
-            else
-            {
-                $windowsslash = "\/";
-            }
             $localtemppath =~ s/\\/\//g;
-            $localtemppath = "/".$localtemppath;
+            $slash = "/"; # Third slash for Windows. Other OS pathes already start with "/"
         }
 
-        my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file:///" . $bundleddir . "\"" . " -env:UserInstallation=file://" . $localtemppath . " 2\>\&1 |";
+        my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $bundleddir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " 2\>\&1 |";
 
         print "... $systemcall ...\n";
 
-- 
cgit 


From 7fd246545dfb3e55249f3646d351dfc797090a59 Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Tue, 13 Jul 2010 16:04:45 +0200
Subject: OOO330

---
 solenv/inc/minor.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'solenv')

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index b6c424446dcf..b33381249d4c 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=330
-RSCREVISION=330m0(Build:9513)
-BUILD=9513
-LAST_MINOR=m0
+RSCREVISION=330m1(Build:9514)
+BUILD=9514
+LAST_MINOR=m1
 SOURCEVERSION=OOO330
-- 
cgit 


From b592f04ebec1fb34a4d7f87281c5ad8a70cb581e Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Tue, 13 Jul 2010 16:11:56 +0200
Subject: masterfix: #i10000# set BUILD_STAX to YES in setsolar environment

---
 solenv/config/sooo330.ini | 1 +
 solenv/config/ssolar.cmn  | 1 +
 2 files changed, 2 insertions(+)

(limited to 'solenv')

diff --git a/solenv/config/sooo330.ini b/solenv/config/sooo330.ini
index d38c87344596..dcd0c0564afe 100644
--- a/solenv/config/sooo330.ini
+++ b/solenv/config/sooo330.ini
@@ -8,6 +8,7 @@ common
 			BIG_SVX TRUE
 			BMP_WRITES_FLAG TRUE
 			BUILD_SPECIAL TRUE
+			BUILD_STAX YES
 			BUILD_TYPE SO OOo EXT BINFILTER MORE_FONTS BSH CURL DICTIONARIES HSQLDB HUNSPELL HYPHEN MYTHES JPEG LIBXML2 LIBXMLSEC LPSOLVE MOZ NEON TWAIN PYTHON ZLIB SANE UNIXODBC X11_EXTENSIONS LIBWPD EPM ODK MSFONTEXTRACT MATHMLDTD BOOST MDDS 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
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index 937c345e2de8..de332146a1f0 100644
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@@ -44,6 +44,7 @@ common
 		BUILD_TOOLS
         BUILD_TYPE
 		BUILD_SPECIAL
+		BUILD_STAX
         BUILD_X64
 		CLASSPATH
 		CALL_CDECL
-- 
cgit 


From eb7457324001e55c3788967d23ab34d503a0295e Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Tue, 13 Jul 2010 17:44:56 +0200
Subject: txtl10n: #113125# Support of help tree files in the L10N process

---
 solenv/inc/target.mk      |   2 +-
 solenv/inc/tg_xmerge.mk   | 116 ++++++++++++++++++++++++++++++++++++++++++++++
 solenv/inc/tg_xtxmerge.mk |  67 --------------------------
 3 files changed, 117 insertions(+), 68 deletions(-)
 create mode 100755 solenv/inc/tg_xmerge.mk
 delete mode 100755 solenv/inc/tg_xtxmerge.mk

(limited to 'solenv')

diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 13874a0d810a..68f312119f4b 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -2043,7 +2043,7 @@ $(subst,$(OUTPATH),$(COMMON_OUTDIR) $(BIN))/hid.lst .PHONY :
 
 .INCLUDE : tg_merge.mk
 .INCLUDE : tg_propmerge.mk
-.INCLUDE : tg_xtxmerge.mk
+.INCLUDE : tg_xmerge.mk
 
 wordcount:
     wc *.* >> $(TMP)/wc.lst
diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
new file mode 100755
index 000000000000..f172b2c16eea
--- /dev/null
+++ b/solenv/inc/tg_xmerge.mk
@@ -0,0 +1,116 @@
+#*************************************************************************
+#
+# 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 "$(XTXFILES)"!=""
+
+ALLTAR : $(MISC)/$(TARGET).xtx.pmerge.mk $(XTXFILES)
+
+.IF "$(L10NEXT)"==""
+L10NEXT:=.txt
+.ENDIF
+
+
+$(MISC)/$(TARGET).xtx.pmerge.mk :  $(XTXFILES)
+
+$(XTXFILES) : $(LOCALIZESDF)
+
+.INCLUDE .IGNORE : $(MISC)/$(TARGET).xtx.pmerge.mk
+
+.IF "$(alllangiso)"!="$(last_merge)"
+XTXMERGEPHONY:=.PHONY
+.ENDIF          # "$(alllangiso)" != "$(last_merge)"
+
+$(COMMONMISC)/$(PACKAGE)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
+    @@-$(MKDIRHIER) $(@:d)
+.IF "$(WITH_LANG)"==""
+    $(COMMAND_ECHO)$(COPY) $< $@
+.ELSE          # "$(WITH_LANG)"==""
+    @@-$(RM) $@
+    $(COMMAND_ECHO)@noop $(assign PMERGELIST+:=$(<:f))
+    $(COMMAND_ECHO)@noop $(assign PDESTDIR:=$(@:d))
+.ENDIF          # "$(WITH_LANG)"==""
+
+$(MISC)/$(TARGET).xtx.pmerge.mk : $(PMERGELIST)
+.IF "$(WITH_LANG)"!=""
+# xtxex command file requirements:
+# - one file per line
+# - no spaces
+# - no empty lines
+# $(uniq ...) to workaround $assign adding the value twice...
+    @noop $(assign PMERGEFILELIST:=$(uniq $(PMERGELIST)))
+#    $(COMMAND_ECHO) 
+    $(SOLARBINDIR)/xtxex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR) -i @$(mktmp $(PMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[fileNoExt]_[language]$(L10NEXT)" 
+
+.ENDIF          # "$(WITH_LANG)"!=""
+
+    @-$(RM) $@
+    $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
+
+.ENDIF          # "$(XTXFILES)"!=""
+
+.IF "$(XHTFILES)"!=""
+ALLTAR : $(MISC)/$(TARGET).xht.pmerge.mk $(XHTFILES)
+
+$(MISC)/$(TARGET).xht.pmerge.mk :  $(XHTFILES)
+
+$(XHTFILES) : $(LOCALIZESDF)
+
+.INCLUDE .IGNORE : $(MISC)/$(TARGET).xht.pmerge.mk
+
+.IF "$(alllangiso)"!="$(last_merge)"
+XHTMERGEPHONY:=.PHONY
+.ENDIF          # "$(alllangiso)" != "$(last_merge)"
+
+$(COMMONMISC)/$(PACKAGE)/en-US/%.tree $(XHTMERGEPHONY) : %.xht
+    @@-$(MKDIRHIER) $(@:d)
+.IF "$(WITH_LANG)"==""
+    $(COMMAND_ECHO)$(COPY) $< $@
+.ELSE          # "$(WITH_LANG)"==""
+    @@-$(RM) $@
+    $(COMMAND_ECHO)@noop $(assign PMERGELIST1+:=$(<:f))
+    $(COMMAND_ECHO)@noop $(assign PDESTDIR1:=$(@:d:d:d))
+.ENDIF          # "$(WITH_LANG)"==""
+
+$(MISC)/$(TARGET).xht.pmerge.mk : $(PMERGELIST1)
+.IF "$(WITH_LANG)"!=""
+# xtxex command file requirements:
+# - one file per line
+# - no spaces
+# - no empty lines
+# $(uniq ...) to workaround $assign adding the value twice...
+    @noop $(assign PMERGEFILELIST1:=$(uniq $(PMERGELIST1)))
+#    $(COMMAND_ECHO) 
+# filename,fileNoExt,language,extension,pathPrefix,pathPostFix,path
+    $(SOLARBINDIR)/xhtex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR1) -i @$(mktmp $(PMERGEFILELIST1:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[language]/[fileNoExt].tree" 
+.ENDIF          # "$(WITH_LANG)"!=""
+
+    @-$(RM) $@
+    $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
+
+.ENDIF          # "$(XHTFILES)"!=""
+
+
diff --git a/solenv/inc/tg_xtxmerge.mk b/solenv/inc/tg_xtxmerge.mk
deleted file mode 100755
index 7fb661d345db..000000000000
--- a/solenv/inc/tg_xtxmerge.mk
+++ /dev/null
@@ -1,67 +0,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.
-#
-#*************************************************************************
-
-.IF "$(XTXFILES)"!=""
-ALLTAR : $(MISC)/$(TARGET).pmerge.mk $(XTXFILES)
-
-$(MISC)/$(TARGET).pmerge.mk :  $(XTXFILES)
-
-$(XTXFILES) : $(LOCALIZESDF)
-
-.INCLUDE .IGNORE : $(MISC)/$(TARGET).pmerge.mk
-
-.IF "$(alllangiso)"!="$(last_merge)"
-MERGEPHONY:=.PHONY
-.ENDIF          # "$(alllangiso)" != "$(last_merge)"
-
-$(COMMONMISC)/$(PACKAGE)/%.xtx $(MERGEPHONY) : %.xtx
-    @@-$(MKDIRHIER) $(@:d)
-.IF "$(WITH_LANG)"==""
-    $(COMMAND_ECHO)$(COPY) $< $@
-.ELSE          # "$(WITH_LANG)"==""
-    @@-$(RM) $@
-    $(COMMAND_ECHO)@noop $(assign PMERGELIST+:=$(<:f))
-    $(COMMAND_ECHO)@noop $(assign PDESTDIR:=$(@:d))
-.ENDIF          # "$(WITH_LANG)"==""
-
-$(MISC)/$(TARGET).pmerge.mk : $(PMERGELIST)
-.IF "$(WITH_LANG)"!=""
-# xtxex command file requirements:
-# - one file per line
-# - no spaces
-# - no empty lines
-# $(uniq ...) to workaround $assign adding the value twice...
-    @noop $(assign PMERGEFILELIST:=$(uniq $(PMERGELIST)))
-    $(COMMAND_ECHO) $(SOLARBINDIR)/xtxex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR) -i @$(mktmp $(PMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF)
-.ENDIF          # "$(WITH_LANG)"!=""
-
-    @-$(RM) $@
-    $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
-
-.ENDIF          # "$(XTXFILES)"!=""
-
-
-- 
cgit 


From 3e46665171ba27887ae60b0648a691ae6213d5a9 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Tue, 13 Jul 2010 17:47:46 +0200
Subject: txtl10n: #113125# Support of help tree files in the L10N process

---
 solenv/inc/tg_xmerge.mk | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'solenv')

diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
index f172b2c16eea..26c81ff9dc9b 100755
--- a/solenv/inc/tg_xmerge.mk
+++ b/solenv/inc/tg_xmerge.mk
@@ -33,7 +33,6 @@ ALLTAR : $(MISC)/$(TARGET).xtx.pmerge.mk $(XTXFILES)
 L10NEXT:=.txt
 .ENDIF
 
-
 $(MISC)/$(TARGET).xtx.pmerge.mk :  $(XTXFILES)
 
 $(XTXFILES) : $(LOCALIZESDF)
@@ -62,14 +61,11 @@ $(MISC)/$(TARGET).xtx.pmerge.mk : $(PMERGELIST)
 # - no empty lines
 # $(uniq ...) to workaround $assign adding the value twice...
     @noop $(assign PMERGEFILELIST:=$(uniq $(PMERGELIST)))
-#    $(COMMAND_ECHO) 
-    $(SOLARBINDIR)/xtxex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR) -i @$(mktmp $(PMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[fileNoExt]_[language]$(L10NEXT)" 
-
+    $(COMMAND_ECHO) $(SOLARBINDIR)/xtxex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR) -i @$(mktmp $(PMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[fileNoExt]_[language]$(L10NEXT)" 
 .ENDIF          # "$(WITH_LANG)"!=""
 
     @-$(RM) $@
     $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
-
 .ENDIF          # "$(XTXFILES)"!=""
 
 .IF "$(XHTFILES)"!=""
@@ -103,14 +99,11 @@ $(MISC)/$(TARGET).xht.pmerge.mk : $(PMERGELIST1)
 # - no empty lines
 # $(uniq ...) to workaround $assign adding the value twice...
     @noop $(assign PMERGEFILELIST1:=$(uniq $(PMERGELIST1)))
-#    $(COMMAND_ECHO) 
-# filename,fileNoExt,language,extension,pathPrefix,pathPostFix,path
-    $(SOLARBINDIR)/xhtex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR1) -i @$(mktmp $(PMERGEFILELIST1:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[language]/[fileNoExt].tree" 
+# Variables for the pattern filename,fileNoExt,language,extension,pathPrefix,pathPostFix,path
+    $(COMMAND_ECHO) $(SOLARBINDIR)/xhtex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR1) -i @$(mktmp $(PMERGEFILELIST1:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[language]/[fileNoExt].tree" 
 .ENDIF          # "$(WITH_LANG)"!=""
-
     @-$(RM) $@
     $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
-
 .ENDIF          # "$(XHTFILES)"!=""
 
 
-- 
cgit 


From bde51d314523b7b9f4934c21a9d4f4612a57b36e Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Tue, 13 Jul 2010 18:57:19 +0200
Subject: jl154 #162868# unopkg is back in packaging and installation

---
 solenv/bin/modules/installer/epmfile.pm       | 48 +++++++--------------------
 solenv/bin/modules/installer/simplepackage.pm | 11 ++++--
 2 files changed, 21 insertions(+), 38 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 136eca913dd9..3fd7316c63db 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -762,32 +762,12 @@ sub replace_many_variables_in_shellscripts
     foreach $key (keys %{$variableshashref})
     {
         my $value = $variableshashref->{$key};
-        if ( ! $value =~ /.oxt/ ) { $value = lc($value); }  # lowercase !
-        if ( $installer::globals::issolarisbuild) { $value =~ s/\.org/org/g; }  # openofficeorg instead of openoffice.org
+        # $value = lc($value);  # lowercase !
+        # if ( $installer::globals::issolarisbuild) { $value =~ s/\.org/org/g; }    # openofficeorg instead of openoffice.org
         replace_variable_in_shellscripts($scriptref, $value, $key);
     }
 }
 
-#######################################
-# Setting oxt file name variable
-#######################################
-
-sub set_oxt_filename
-{
-    my ($filesinpackage, $allvariables) = @_;
-
-    for ( my $i = 0; $i <= $#{$filesinpackage}; $i++ )
-    {
-        my $onefile = ${$filesinpackage}[$i];
-        if ( $onefile->{'Name'} =~ /.oxt\s*$/ )
-        {
-            $allvariables->{'OXTFILENAME'} = $onefile->{'Name'};
-            # $allvariables->{'FULLOXTFILENAME'} = $onefile->{'destination'};
-            last;  # only one oxt file for each rpm!
-        }
-    }
-}
-
 #######################################
 # Adding shell scripts to epm file
 #######################################
@@ -796,9 +776,6 @@ sub adding_shellscripts_to_epm_file
 {
     my ($epmfileref, $shellscriptsfilename, $localrootpath, $allvariableshashref, $filesinpackage) = @_;
 
-    # Setting variable for ${OXTFILENAME} into $allvariableshashref, if this is a RPM with an extension
-    set_oxt_filename($filesinpackage, $allvariableshashref);
-
     # $installer::globals::shellscriptsfilename
 
     push( @{$epmfileref}, "\n\n" );
@@ -1803,26 +1780,27 @@ sub is_extension_package
 # share/extension/install
 ######################################################################
 
-sub get_extension_name
+sub contains_extension_dir
 {
     my ($prototypefile) = @_;
 
-    my $extensionName = "";
+    my $contains_extension_dir = 0;
+
+    # d none opt/openoffice.org3/share/extensions/
 
     for ( my $i = 0; $i <= $#{$prototypefile}; $i++ )
     {
         my $line = ${$prototypefile}[$i];
-        if ( $line =~ /^\s*f\s+none\s+share\/extension\/install\/(\w+?\.oxt)\s*\=/ )
+        if ( $line =~ /^\s*d\s+none\s.*\/share\/extensions\// )
         {
-            $extensionName = $1;
+            $contains_extension_dir = 1;
             last;
         }
     }
 
-    return $extensionName;
+    return $contains_extension_dir;
 }
 
-
 ############################################################
 # A Solaris patch contains 7 specific scripts
 ############################################################
@@ -1839,9 +1817,9 @@ sub add_scripts_into_prototypefile
     $path = $path . $installer::globals::separator;
 
     my @newlines = ();
-    my $extensionname = get_extension_name($prototypefile);
+    my $is_extension_package = contains_extension_dir($prototypefile);
 
-    if ( $extensionname ne "" )
+    if ( $is_extension_package )
     {
         for ( my $i = 0; $i <= $#installer::globals::solarispatchscriptsforextensions; $i++ )
         {
@@ -1865,9 +1843,7 @@ sub add_scripts_into_prototypefile
             my $scriptfile = installer::files::read_file($sourcefilename);
 
             # Replacing variables
-            my $oldstring = "\$\{OXTFILENAME\}";
-            replace_variables_in_shellscripts_for_patch($scriptfile, $destpath, $oldstring, $extensionname);
-            $oldstring = "PRODUCTDIRECTORYNAME";
+            my $oldstring = "PRODUCTDIRECTORYNAME";
             replace_variables_in_shellscripts_for_patch($scriptfile, $destpath, $oldstring, $staticpath);
 
             # Saving file
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 423d0b74eb4c..3ad13edd61ff 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -84,6 +84,15 @@ sub register_extensions
 {
     my ($officedir, $languagestringref, $bundleddir) = @_;
 
+    my $infoline = "";
+
+    if ( $bundleddir eq "" )
+    {
+        $infoline = "ERROR: Failed to determine directory \"bundled\" in \"presets\" folder for extension registration! Please check your installation set.\n";
+        push( @installer::globals::logfileinfo, $infoline);
+        installer::exiter::exit_program($infoline, "register_extensions");
+    }
+
     my $programdir = $officedir . $installer::globals::separator;
     if ( $installer::globals::officedirhostname ne "" ) { $programdir = $programdir . $installer::globals::officedirhostname . $installer::globals::separator; }
     $programdir = $programdir . "program";
@@ -91,8 +100,6 @@ sub register_extensions
     my $from = cwd();
     chdir($programdir);
 
-    my $infoline = "";
-
     my $unopkgfile = $installer::globals::unopkgfile;
 
     my $unopkgexists = 1;
-- 
cgit 


From 0db2d911659eed658bdc163731be27ac29e8767a Mon Sep 17 00:00:00 2001
From: Joachim Lingner <jl@openoffice.org>
Date: Thu, 15 Jul 2010 16:48:34 +0200
Subject: jl154 #162868# remove basis/presets/bundled/bundled.ini, and create
 always share/extensions folder

---
 solenv/bin/modules/installer/simplepackage.pm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 3ad13edd61ff..9eb8522ebfd6 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -82,13 +82,13 @@ sub get_extensions_dir
 
 sub register_extensions
 {
-    my ($officedir, $languagestringref, $bundleddir) = @_;
+    my ($officedir, $languagestringref, $presetsdir) = @_;
 
     my $infoline = "";
 
-    if ( $bundleddir eq "" )
+    if ( $presetsdir eq "" )
     {
-        $infoline = "ERROR: Failed to determine directory \"bundled\" in \"presets\" folder for extension registration! Please check your installation set.\n";
+        $infoline = "ERROR: Failed to determine directory \"presets\" for extension registration! Please check your installation set.\n";
         push( @installer::globals::logfileinfo, $infoline);
         installer::exiter::exit_program($infoline, "register_extensions");
     }
@@ -128,13 +128,16 @@ sub register_extensions
             if ( $^O =~ /cygwin/i )
             {
                 $localtemppath = $installer::globals::cyg_temppath;
-                $bundleddir = qx{cygpath -m "$bundleddir"};
-                chomp($bundleddir);
+                $presetsdir = qx{cygpath -m "$presetsdir"};
+                chomp($presetsdir);
             }
             $localtemppath =~ s/\\/\//g;
             $slash = "/"; # Third slash for Windows. Other OS pathes already start with "/"
         }
 
+        $presetsdir =~ s/\/\s*$//g;
+        my $bundleddir = $presetsdir . "/bundled";
+
         my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $bundleddir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " 2\>\&1 |";
 
         print "... $systemcall ...\n";
@@ -635,7 +638,7 @@ sub create_simple_package
     installer::logger::print_message( "... creating directories ...\n" );
     installer::logger::include_header_into_logfile("Creating directories:");
 
-    my $bundleddir = "";
+    my $presetsdir = "";
 
     for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
     {
@@ -644,7 +647,7 @@ sub create_simple_package
         if ( $onedir->{'HostName'} )
         {
             my $destdir = $subfolderdir . $installer::globals::separator . $onedir->{'HostName'};
-            if ( $destdir =~ /\Wbundled\s*$/ ) { $bundleddir = $destdir; }
+            if ( $destdir =~ /\Wpresets\s*$/ ) { $presetsdir = $destdir; }
 
             if ( ! -d $destdir )
             {
@@ -781,7 +784,7 @@ sub create_simple_package
 
     installer::logger::print_message( "... registering extensions ...\n" );
     installer::logger::include_header_into_logfile("Registering extensions:");
-    register_extensions($subfolderdir, $languagestringref, $bundleddir);
+    register_extensions($subfolderdir, $languagestringref, $presetsdir);
 
     if ( $installer::globals::compiler =~ /^unxmacx/ )
     {
-- 
cgit 


From b6c7b932e7ad2a6d27fa62674926d1e8675ad83d Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Mon, 19 Jul 2010 13:07:06 +0200
Subject: #162096# use RepositoryHelper for missing source_config

---
 solenv/bin/modules/SourceConfig.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index 06d72d06fe4c..84b25135cc3d 100644
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -42,6 +42,7 @@ use constant SOURCE_CONFIG_VERSION => 3;
 
 use Carp;
 use Cwd;
+use RepositoryHelper;
 use File::Basename;
 use File::Temp qw(tmpnam);
 
@@ -261,9 +262,10 @@ sub get_fallback_repository {
     my $self = shift;
     if (defined $self->{USER_SOURCE_ROOT}) {
         ${$self->{REPOSITORIES}}{File::Basename::basename($self->{USER_SOURCE_ROOT})} = $self->{USER_SOURCE_ROOT};
-        return;
+    } else {
+        my $repository_root = RepositoryHelper->new()->get_repository_root();
+        ${$self->{REPOSITORIES}}{File::Basename::basename($repository_root)} = $repository_root;
     };
-    croak('Cannot determine repository. Please make your checks!!');
 };
 
 sub read_config_file {
-- 
cgit 


From 067095785bbc0922e12bb4677d20b1927e411607 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Tue, 20 Jul 2010 13:11:02 +0200
Subject: txtl10n: #i113008# #i113125# rename .xht to .tree

---
 solenv/inc/tg_xmerge.mk | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'solenv')

diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
index 26c81ff9dc9b..943b8074fc38 100755
--- a/solenv/inc/tg_xmerge.mk
+++ b/solenv/inc/tg_xmerge.mk
@@ -68,20 +68,20 @@ $(MISC)/$(TARGET).xtx.pmerge.mk : $(PMERGELIST)
     $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
 .ENDIF          # "$(XTXFILES)"!=""
 
-.IF "$(XHTFILES)"!=""
-ALLTAR : $(MISC)/$(TARGET).xht.pmerge.mk $(XHTFILES)
+.IF "$(TREEFILE)"!=""
+ALLTAR : $(MISC)/$(TARGET).tree.pmerge.mk $(TREEFILE)
 
-$(MISC)/$(TARGET).xht.pmerge.mk :  $(XHTFILES)
+$(MISC)/$(TARGET).tree.pmerge.mk :  $(TREEFILE)
 
-$(XHTFILES) : $(LOCALIZESDF)
+$(TREEFILE) : $(LOCALIZESDF)
 
-.INCLUDE .IGNORE : $(MISC)/$(TARGET).xht.pmerge.mk
+.INCLUDE .IGNORE : $(MISC)/$(TARGET).tree.pmerge.mk
 
 .IF "$(alllangiso)"!="$(last_merge)"
-XHTMERGEPHONY:=.PHONY
+TREEMERGEPHONY:=.PHONY
 .ENDIF          # "$(alllangiso)" != "$(last_merge)"
 
-$(COMMONMISC)/$(PACKAGE)/en-US/%.tree $(XHTMERGEPHONY) : %.xht
+$(COMMONMISC)/$(PACKAGE)/en-US/%.tree $(TREEMERGEPHONY) : %.tree
     @@-$(MKDIRHIER) $(@:d)
 .IF "$(WITH_LANG)"==""
     $(COMMAND_ECHO)$(COPY) $< $@
@@ -91,7 +91,7 @@ $(COMMONMISC)/$(PACKAGE)/en-US/%.tree $(XHTMERGEPHONY) : %.xht
     $(COMMAND_ECHO)@noop $(assign PDESTDIR1:=$(@:d:d:d))
 .ENDIF          # "$(WITH_LANG)"==""
 
-$(MISC)/$(TARGET).xht.pmerge.mk : $(PMERGELIST1)
+$(MISC)/$(TARGET).tree.pmerge.mk : $(PMERGELIST1)
 .IF "$(WITH_LANG)"!=""
 # xtxex command file requirements:
 # - one file per line
@@ -104,6 +104,6 @@ $(MISC)/$(TARGET).xht.pmerge.mk : $(PMERGELIST1)
 .ENDIF          # "$(WITH_LANG)"!=""
     @-$(RM) $@
     $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
-.ENDIF          # "$(XHTFILES)"!=""
+.ENDIF          # "$(TREEFILE)"!=""
 
 
-- 
cgit 


From 756cb84194cbddd57d14d564ebecd8a229bb10a1 Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Wed, 21 Jul 2010 12:04:31 +0200
Subject: jl154 #162868# new share/prereg folder

---
 solenv/bin/modules/installer/simplepackage.pm | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 9eb8522ebfd6..5cbd10832eaf 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -71,9 +71,10 @@ sub get_extensions_dir
 
     my $extensiondir = $subfolderdir . $installer::globals::separator;
     if ( $installer::globals::officedirhostname ne "" ) { $extensiondir = $extensiondir . $installer::globals::officedirhostname . $installer::globals::separator; }
-    $extensiondir = $extensiondir . "share" . $installer::globals::separator . "extensions";
+    my $extensionsdir = $extensiondir . "share" . $installer::globals::separator . "extensions";
+    my $preregdir = $extensiondir . "share" . $installer::globals::separator . "prereg";
 
-    return $extensiondir;
+    return ( $extensionsdir, $preregdir );
 }
 
 ####################################################
@@ -82,13 +83,13 @@ sub get_extensions_dir
 
 sub register_extensions
 {
-    my ($officedir, $languagestringref, $presetsdir) = @_;
+    my ($officedir, $languagestringref, $preregdir) = @_;
 
     my $infoline = "";
 
-    if ( $presetsdir eq "" )
+    if ( $preregdir eq "" )
     {
-        $infoline = "ERROR: Failed to determine directory \"presets\" for extension registration! Please check your installation set.\n";
+        $infoline = "ERROR: Failed to determine directory \"prereg\" for extension registration! Please check your installation set.\n";
         push( @installer::globals::logfileinfo, $infoline);
         installer::exiter::exit_program($infoline, "register_extensions");
     }
@@ -128,17 +129,16 @@ sub register_extensions
             if ( $^O =~ /cygwin/i )
             {
                 $localtemppath = $installer::globals::cyg_temppath;
-                $presetsdir = qx{cygpath -m "$presetsdir"};
-                chomp($presetsdir);
+                $preregdir = qx{cygpath -m "$preregdir"};
+                chomp($preregdir);
             }
             $localtemppath =~ s/\\/\//g;
             $slash = "/"; # Third slash for Windows. Other OS pathes already start with "/"
         }
 
-        $presetsdir =~ s/\/\s*$//g;
-        my $bundleddir = $presetsdir . "/bundled";
+        $preregdir =~ s/\/\s*$//g;
 
-        my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $bundleddir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " 2\>\&1 |";
+        my $systemcall = $unopkgfile . " sync --verbose -env:BUNDLED_EXTENSIONS_USER=\"file://" . $slash . $preregdir . "\"" . " -env:UserInstallation=file://" . $slash . $localtemppath . " 2\>\&1 |";
 
         print "... $systemcall ...\n";
 
@@ -638,8 +638,6 @@ sub create_simple_package
     installer::logger::print_message( "... creating directories ...\n" );
     installer::logger::include_header_into_logfile("Creating directories:");
 
-    my $presetsdir = "";
-
     for ( my $i = 0; $i <= $#{$dirsref}; $i++ )
     {
         my $onedir = ${$dirsref}[$i];
@@ -647,7 +645,6 @@ sub create_simple_package
         if ( $onedir->{'HostName'} )
         {
             my $destdir = $subfolderdir . $installer::globals::separator . $onedir->{'HostName'};
-            if ( $destdir =~ /\Wpresets\s*$/ ) { $presetsdir = $destdir; }
 
             if ( ! -d $destdir )
             {
@@ -777,14 +774,14 @@ sub create_simple_package
     installer::logger::print_message( "... removing superfluous directories ...\n" );
     installer::logger::include_header_into_logfile("Removing superfluous directories:");
 
-    my $extensionfolder = get_extensions_dir($subfolderdir);
+    my ( $extensionfolder, $preregdir ) = get_extensions_dir($subfolderdir);
     installer::systemactions::remove_empty_dirs_in_folder($extensionfolder);
 
     # Registering the extensions
 
     installer::logger::print_message( "... registering extensions ...\n" );
     installer::logger::include_header_into_logfile("Registering extensions:");
-    register_extensions($subfolderdir, $languagestringref, $presetsdir);
+    register_extensions($subfolderdir, $languagestringref, $preregdir);
 
     if ( $installer::globals::compiler =~ /^unxmacx/ )
     {
-- 
cgit 


From c9f7f4a18b2e22346fe6f673d5bfe6738fb53870 Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Wed, 21 Jul 2010 17:26:17 +0200
Subject: vgbugs10: #162096# initialisation repository considered as active

---
 solenv/bin/modules/SourceConfig.pm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index 84b25135cc3d..25fd13f4fdb2 100644
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -96,6 +96,9 @@ sub new {
     $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}) if (!defined $self->{SOURCE_CONFIG_FILE});
     $self->{SOURCE_CONFIG_DEFAULT} = $self->{SOURCE_ROOT} .'/'.SOURCE_CONFIG_FILE_NAME;
     read_config_file($self);
@@ -260,12 +263,8 @@ sub get_config_file {
 #
 sub get_fallback_repository {
     my $self = shift;
-    if (defined $self->{USER_SOURCE_ROOT}) {
-        ${$self->{REPOSITORIES}}{File::Basename::basename($self->{USER_SOURCE_ROOT})} = $self->{USER_SOURCE_ROOT};
-    } else {
-        my $repository_root = RepositoryHelper->new()->get_repository_root();
-        ${$self->{REPOSITORIES}}{File::Basename::basename($repository_root)} = $repository_root;
-    };
+    my $repository_root = RepositoryHelper->new()->get_repository_root();
+    ${$self->{REPOSITORIES}}{File::Basename::basename($repository_root)} = $repository_root;
 };
 
 sub read_config_file {
-- 
cgit 


From 3de0fc7c234b7a37fe2c97276cec28e9d6379fa1 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed, 21 Jul 2010 19:05:43 +0200
Subject: txtl10n: #i113008# #i113125# changed output dir

---
 solenv/inc/tg_xmerge.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'solenv')

diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
index 943b8074fc38..e5fa65e742fb 100755
--- a/solenv/inc/tg_xmerge.mk
+++ b/solenv/inc/tg_xmerge.mk
@@ -81,7 +81,7 @@ $(TREEFILE) : $(LOCALIZESDF)
 TREEMERGEPHONY:=.PHONY
 .ENDIF          # "$(alllangiso)" != "$(last_merge)"
 
-$(COMMONMISC)/$(PACKAGE)/en-US/%.tree $(TREEMERGEPHONY) : %.tree
+$(OUT_HELP)/en-US/help.tree $(TREEMERGEPHONY) : help.tree
     @@-$(MKDIRHIER) $(@:d)
 .IF "$(WITH_LANG)"==""
     $(COMMAND_ECHO)$(COPY) $< $@
-- 
cgit 


From b9931f96e8f6bdeb562e849c861392b1f4d2128e Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Thu, 22 Jul 2010 16:44:05 +0200
Subject: txtl10n: #i113008# #i113125# cleanup / variable rename

---
 solenv/inc/tg_xmerge.mk | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'solenv')

diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
index e5fa65e742fb..b494cfd2fa6a 100755
--- a/solenv/inc/tg_xmerge.mk
+++ b/solenv/inc/tg_xmerge.mk
@@ -49,19 +49,19 @@ $(COMMONMISC)/$(PACKAGE)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
     $(COMMAND_ECHO)$(COPY) $< $@
 .ELSE          # "$(WITH_LANG)"==""
     @@-$(RM) $@
-    $(COMMAND_ECHO)@noop $(assign PMERGELIST+:=$(<:f))
-    $(COMMAND_ECHO)@noop $(assign PDESTDIR:=$(@:d))
+    $(COMMAND_ECHO)@noop $(assign XTXMERGELIST+:=$(<:f))
+    $(COMMAND_ECHO)@noop $(assign XTXDESTDIR:=$(@:d))
 .ENDIF          # "$(WITH_LANG)"==""
 
-$(MISC)/$(TARGET).xtx.pmerge.mk : $(PMERGELIST)
+$(MISC)/$(TARGET).xtx.pmerge.mk : $(XTXMERGELIST)
 .IF "$(WITH_LANG)"!=""
 # xtxex command file requirements:
 # - one file per line
 # - no spaces
 # - no empty lines
 # $(uniq ...) to workaround $assign adding the value twice...
-    @noop $(assign PMERGEFILELIST:=$(uniq $(PMERGELIST)))
-    $(COMMAND_ECHO) $(SOLARBINDIR)/xtxex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR) -i @$(mktmp $(PMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[fileNoExt]_[language]$(L10NEXT)" 
+    @noop $(assign XTXMERGEFILELIST:=$(uniq $(XTXMERGELIST)))
+    $(COMMAND_ECHO) $(SOLARBINDIR)/xtxex -p $(PRJNAME) -r $(PRJ) -o $(XTXDESTDIR) -i @$(mktmp $(XTXMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[fileNoExt]_[language]$(L10NEXT)" 
 .ENDIF          # "$(WITH_LANG)"!=""
 
     @-$(RM) $@
@@ -87,20 +87,20 @@ $(OUT_HELP)/en-US/help.tree $(TREEMERGEPHONY) : help.tree
     $(COMMAND_ECHO)$(COPY) $< $@
 .ELSE          # "$(WITH_LANG)"==""
     @@-$(RM) $@
-    $(COMMAND_ECHO)@noop $(assign PMERGELIST1+:=$(<:f))
-    $(COMMAND_ECHO)@noop $(assign PDESTDIR1:=$(@:d:d:d))
+    $(COMMAND_ECHO)@noop $(assign TREEMERGELIST+:=$(<:f))
+    $(COMMAND_ECHO)@noop $(assign TREEDESTDIR:=$(@:d:d:d))
 .ENDIF          # "$(WITH_LANG)"==""
 
-$(MISC)/$(TARGET).tree.pmerge.mk : $(PMERGELIST1)
+$(MISC)/$(TARGET).tree.pmerge.mk : $(TREEMERGELIST)
 .IF "$(WITH_LANG)"!=""
 # xtxex command file requirements:
 # - one file per line
 # - no spaces
 # - no empty lines
 # $(uniq ...) to workaround $assign adding the value twice...
-    @noop $(assign PMERGEFILELIST1:=$(uniq $(PMERGELIST1)))
+    @noop $(assign TREEMERGEFILELIST:=$(uniq $(TREEMERGELIST)))
 # Variables for the pattern filename,fileNoExt,language,extension,pathPrefix,pathPostFix,path
-    $(COMMAND_ECHO) $(SOLARBINDIR)/xhtex -p $(PRJNAME) -r $(PRJ) -o $(PDESTDIR1) -i @$(mktmp $(PMERGEFILELIST1:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[language]/[fileNoExt].tree" 
+    $(COMMAND_ECHO) $(SOLARBINDIR)/xhtex -p $(PRJNAME) -r $(PRJ) -o $(TREEDESTDIR) -i @$(mktmp $(TREEMERGEFILELIST:t"\n":s/ //)) -l $(alllangiso:s/ /,/) -f $(alllangiso:s/ /,/) -m $(LOCALIZESDF) -s"[path]/[language]/[fileNoExt].tree" 
 .ENDIF          # "$(WITH_LANG)"!=""
     @-$(RM) $@
     $(COMMAND_ECHO)echo last_merge=$(alllangiso) > $@
-- 
cgit 


From 17f90c9ee09008654e5f7bc9b80342252ac150fb Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Thu, 22 Jul 2010 17:06:05 +0200
Subject: txtl10n: #i113008# #i113125# cleanup / write to misc

---
 solenv/inc/tg_xmerge.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'solenv')

diff --git a/solenv/inc/tg_xmerge.mk b/solenv/inc/tg_xmerge.mk
index b494cfd2fa6a..fa3e2297184f 100755
--- a/solenv/inc/tg_xmerge.mk
+++ b/solenv/inc/tg_xmerge.mk
@@ -43,7 +43,7 @@ $(XTXFILES) : $(LOCALIZESDF)
 XTXMERGEPHONY:=.PHONY
 .ENDIF          # "$(alllangiso)" != "$(last_merge)"
 
-$(COMMONMISC)/$(PACKAGE)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
+$(MISC)/$(TARGET)/%$(L10NEXT) $(XTXMERGEPHONY) : %.xtx
     @@-$(MKDIRHIER) $(@:d)
 .IF "$(WITH_LANG)"==""
     $(COMMAND_ECHO)$(COPY) $< $@
-- 
cgit 


From 1745fd6f2bb0f1501df821725d5f4d95bde7b5e5 Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Fri, 23 Jul 2010 10:37:24 +0200
Subject: jl154 #162868# bundled folder in prereg folder

---
 solenv/bin/modules/installer/simplepackage.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 5cbd10832eaf..6b168febf6f1 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -72,7 +72,7 @@ sub get_extensions_dir
     my $extensiondir = $subfolderdir . $installer::globals::separator;
     if ( $installer::globals::officedirhostname ne "" ) { $extensiondir = $extensiondir . $installer::globals::officedirhostname . $installer::globals::separator; }
     my $extensionsdir = $extensiondir . "share" . $installer::globals::separator . "extensions";
-    my $preregdir = $extensiondir . "share" . $installer::globals::separator . "prereg";
+    my $preregdir = $extensiondir . "share" . $installer::globals::separator . "prereg" . $installer::globals::separator . "bundled";
 
     return ( $extensionsdir, $preregdir );
 }
-- 
cgit 


From 44224addb980da9a43e23e2789408585597f523f Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Fri, 23 Jul 2010 14:26:15 +0200
Subject: txtl10n: removal of verbose switch

---
 solenv/inc/_tg_srs.mk   | 20 ++++++++++----------
 solenv/inc/rules.mk     |  2 +-
 solenv/inc/settings.mk  |  3 ---
 solenv/inc/target.mk    |  2 +-
 solenv/inc/tg_config.mk |  2 +-
 solenv/inc/tg_help.mk   |  2 +-
 solenv/inc/tg_srs.mk    |  2 +-
 7 files changed, 15 insertions(+), 18 deletions(-)
 mode change 100644 => 100755 solenv/inc/tg_help.mk

(limited to 'solenv')

diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk
index 063f98f2f322..a71216f0a7e9 100644
--- a/solenv/inc/_tg_srs.mk
+++ b/solenv/inc/_tg_srs.mk
@@ -28,7 +28,7 @@ $(foreach,i,$(SRC1FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
@@ -81,7 +81,7 @@ $(foreach,i,$(SRC2FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
@@ -134,7 +134,7 @@ $(foreach,i,$(SRC3FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
@@ -187,7 +187,7 @@ $(foreach,i,$(SRC4FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
@@ -240,7 +240,7 @@ $(foreach,i,$(SRC5FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
@@ -293,7 +293,7 @@ $(foreach,i,$(SRC6FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
@@ -346,7 +346,7 @@ $(foreach,i,$(SRC7FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
@@ -399,7 +399,7 @@ $(foreach,i,$(SRC8FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
@@ -452,7 +452,7 @@ $(foreach,i,$(SRC9FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
@@ -505,7 +505,7 @@ $(foreach,i,$(SRC10FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESDF)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk
index 63c4d0cef28c..7ad8fd19f33f 100644
--- a/solenv/inc/rules.mk
+++ b/solenv/inc/rules.mk
@@ -722,7 +722,7 @@ $(COMMONMISC)/$(TARGET)/%.ulf : %.ulf
     @echo "Making:   " $(@:f)
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(ULFEX) $(ULFEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(ULFEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index c5283fb1b59e..cfd4d89bb3bc 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -964,9 +964,6 @@ RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) $(SOLARBINDIR)/rsc
     .IF "$(VERBOSE)" == "FALSE"
         VERBOSITY=-quiet
         ZIP_VERBOSITY=-q
-        TRANSEX_VERBOSITY=-QQ
-        CFGEX_VERBOSITY=-QQ
-        ULFEX_VERBOSITY=-QQ
     .ENDIF
 .ENDIF # "$(VERBOSE)" == "TRUE"
 COMPILE_ECHO_SWITCH=
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 68f312119f4b..0fe06145879d 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -1518,7 +1518,7 @@ $(LOCALIZE_ME_DEST) .PHONY : $(LOCALIZE_ME) $(LOCALIZESDF)
 .ENDIF			# "$(LASTRUN_MERGED)"=="TRUE"
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
-    $(COMMAND_ECHO)$(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o $(@:d)/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(TRANSEX) -p $(PRJNAME) -i $(@:b:+"_tmpl")$(@:e) -o $(@:d)/$(@:b:+"_tmpl")$(@:e).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $(@:d)$(@:b:+"_tmpl")$(@:e).$(INPATH) $@
 
 .ENDIF			# "$(WITH_LANG)"==""
diff --git a/solenv/inc/tg_config.mk b/solenv/inc/tg_config.mk
index bbc720ed600e..cfe2fe147ebe 100644
--- a/solenv/inc/tg_config.mk
+++ b/solenv/inc/tg_config.mk
@@ -137,7 +137,7 @@ $(XCU_LANG) : $(LOCALIZESDF)
 
 $(PROCESSOUT)/merge/$(PACKAGEDIR)/%.xcu : %.xcu
     @-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(CFGEX) $(CFGEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $@ -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(CFGEX)  -p $(PRJNAME) -i $(@:f) -o $@ -m $(LOCALIZESDF) -l all
 
 .IF "$(XCU_LANG)" != ""
 $(XCU_LANG) : $(XSLDIR)/alllang.xsl
diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk
old mode 100644
new mode 100755
index aa62b1cf477f..89f1ebabec6c
--- a/solenv/inc/tg_help.mk
+++ b/solenv/inc/tg_help.mk
@@ -45,7 +45,7 @@ $(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp
 
 $(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES)
 .IF "$(WITH_LANG)"!=""
-    $(AUGMENT_LIBRARY_PATH) $(HELPEX) -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
+    $(AUGMENT_LIBRARY_PATH) $(HELPEX)  -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
 .ELSE			# "$(WITH_LANG)"!=""
     cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(COMMONMISC)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@
 .ENDIF			# "$(WITH_LANG)"!=""
diff --git a/solenv/inc/tg_srs.mk b/solenv/inc/tg_srs.mk
index 347dd25569de..4e70eb06b1b4 100644
--- a/solenv/inc/tg_srs.mk
+++ b/solenv/inc/tg_srs.mk
@@ -56,7 +56,7 @@ $(foreach,i,$(SRC$(TNR)FILES) $(COMMONMISC)/$(TARGET)/$i) : $$(@:f) $(LOCALIZESD
     $(COMMAND_ECHO)-$(MKDIR) $(@:d)
     $(COMMAND_ECHO)-$(RM) $@
     $(COMMAND_ECHO)-$(MKDIRHIER)  $(COMMONMISC)$/$(PRJNAME)
-    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) $(TRANSEX_VERBOSITY) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
+    $(COMMAND_ECHO)$(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m $(LOCALIZESDF) -l all
     $(COMMAND_ECHO)$(RENAME) $@.$(INPATH) $@
     $(COMMAND_ECHO)-$(RM) $@.$(INPATH)
 
-- 
cgit 


From 09c8fbff452370467fd8c1e41566d77b1fc7517c Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Fri, 23 Jul 2010 17:23:58 +0200
Subject: masterfix: reset LOCALIZESDF if fetching localized sdf was not
 successful

---
 solenv/inc/settings.mk | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'solenv')

diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index c5283fb1b59e..76407f9f0384 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -827,6 +827,9 @@ LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(TRYSDF) $(THEN) echo $(TRYSDF) $(FI)
 .IF  "$(LOCALIZESDF)"==""
 LOCALSDFFILE:=$(COMMONMISC)$/$(PRJNAME)$/$(PATH_IN_MODULE)$/localize.sdf
 LOCALIZESDF:=$(strip $(shell @+$(IFEXIST) $(SOLARCOMMONSDFDIR)$/$(PRJNAME).zip $(THEN) echo $(LOCALSDFFILE) $(FI)))
+.IF  "$(LOCALIZESDF)"==""
+LOCALSDFFILE!:=
+.ENDIF			# "$(LOCALIZESDF)"==""
 .ENDIF			# "$(LOCALIZESDF)"==""
 # dummy target to keep the build happy.
 .IF  "$(LOCALIZESDF)"==""
-- 
cgit 


From 9fb75fb322f93b9c73da4d467c44b4f08a468853 Mon Sep 17 00:00:00 2001
From: Release Engineering <releng@openoffice.org>
Date: Fri, 23 Jul 2010 17:00:36 +0200
Subject: OOO330

---
 solenv/inc/minor.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'solenv')

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index b33381249d4c..ef764a7ee545 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=330
-RSCREVISION=330m1(Build:9514)
-BUILD=9514
-LAST_MINOR=m1
+RSCREVISION=330m2(Build:9516)
+BUILD=9516
+LAST_MINOR=m2
 SOURCEVERSION=OOO330
-- 
cgit 


From c11f617243f6ea58872a8e4c596917056474981d Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Mon, 26 Jul 2010 17:18:24 +0200
Subject: ooo330l10n: #i113424# add albanian language to builds

---
 solenv/config/sooo330.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'solenv')

diff --git a/solenv/config/sooo330.ini b/solenv/config/sooo330.ini
index dcd0c0564afe..6b20c69749d3 100644
--- a/solenv/config/sooo330.ini
+++ b/solenv/config/sooo330.ini
@@ -96,7 +96,7 @@ common
 			product full
 			PROEXT .pro
 			PROFULLSWITCH product=full
-			WITH_LANG en-US af ar as ast be-BY bg bn bo br brx bs ca ca-XV cs cy da de dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kid kk km kn ko kok ks ku lt lv mai mk ml mn mni mr my nb ne nl nn nr ns oc om or pa-IN pap pl pt pt-BR ro ru rw sa-IN sat sd sh si sk sl sr ss st sv sw-TZ ta te tg th tn tr ts ug uk ur uz ve vi xh zh-CN zh-TW zu
+			WITH_LANG en-US af ar as ast be-BY bg bn bo br brx bs ca ca-XV cs cy da de dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kid kk km kn ko kok ks ku lt lv mai mk ml mn mni mr my nb ne nl nn nr ns oc om or pa-IN pap pl pt pt-BR ro ru rw sa-IN sat sd sh si sk sl sq sr ss st sv sw-TZ ta te tg th tn tr ts ug uk ur uz ve vi xh zh-CN zh-TW zu
 		}
 		pro:1 IF %UPDATER% != YES
 		{
-- 
cgit 


From b1e16431c0965e13631af64627e000942960dc25 Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Tue, 27 Jul 2010 10:49:30 +0200
Subject: vgbugs10: #162096# initialisation repository is the only active
 repository when source_config is missing

---
 solenv/bin/modules/SourceConfig.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index 25fd13f4fdb2..c4b9cc01ec67 100644
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -101,6 +101,9 @@ sub new {
     };
     $self->{SOURCE_CONFIG_FILE} = get_config_file($self->{SOURCE_ROOT}) if (!defined $self->{SOURCE_CONFIG_FILE});
     $self->{SOURCE_CONFIG_DEFAULT} = $self->{SOURCE_ROOT} .'/'.SOURCE_CONFIG_FILE_NAME;
+    if (defined $self->{USER_SOURCE_ROOT}) {
+        ${$self->{REPOSITORIES}}{File::Basename::basename($self->{USER_SOURCE_ROOT})} = $self->{USER_SOURCE_ROOT};
+    };
     read_config_file($self);
        get_module_paths($self);
     bless($self, $class);
@@ -259,7 +262,7 @@ sub get_config_file {
 };
 
 #
-# Fallback - default repository is based on the object initialization parameter...
+# Fallback - fallback repository is based on RepositoryHelper educated guess
 #
 sub get_fallback_repository {
     my $self = shift;
@@ -270,7 +273,9 @@ sub get_fallback_repository {
 sub read_config_file {
     my $self = shift;
     if (!$self->{SOURCE_CONFIG_FILE}) {
-        get_fallback_repository($self);
+        if (!defined $self->{USER_SOURCE_ROOT}) {
+            get_fallback_repository($self);
+        };
         return;
     };
     my $repository_section = 0;
-- 
cgit 


From d3f9253b1c8bdf2060d95651ad503a83a9af0d26 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Tue, 27 Jul 2010 13:55:29 +0200
Subject: OOO330 masterfix: fix unpaired % sign

---
 solenv/prj/d.lst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'solenv')

diff --git a/solenv/prj/d.lst b/solenv/prj/d.lst
index 011796a62903..edbfc190c808 100644
--- a/solenv/prj/d.lst
+++ b/solenv/prj/d.lst
@@ -1,2 +1,2 @@
-mkdir: %_DEST%\bin%_EXT
+mkdir: %_DEST%\bin%_EXT%
 ..\inc\version.lst %_DEST%\bin%_EXT%\version.lst
-- 
cgit 


From ed6c3b782dab52934568a00974a5d1045a9d3e98 Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Wed, 28 Jul 2010 17:03:11 +0200
Subject: jl154 #162868# no registration of extensions in products without
 unopkg file

---
 solenv/bin/modules/installer/simplepackage.pm | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'solenv')

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 6b168febf6f1..518edc683c3d 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -111,6 +111,13 @@ sub register_extensions
         push( @installer::globals::logfileinfo, $infoline);
     }
 
+    if ( ! -f $unopkgfile )
+    {
+        $unopkgexists = 0;
+        $infoline = "Info: File $unopkgfile does not exist! Extensions cannot be registered.\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
+
     if ( $unopkgexists )
     {
         my $currentdir = cwd();
-- 
cgit 


From ee7fa0323dc78d994a79f41dfc5d5f41bebdc5f7 Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Thu, 29 Jul 2010 16:04:40 +0200
Subject: vgbugs10: #i162450# fix for regression

---
 solenv/bin/modules/SourceConfig.pm | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'solenv')

diff --git a/solenv/bin/modules/SourceConfig.pm b/solenv/bin/modules/SourceConfig.pm
index c4b9cc01ec67..dfaa797d8f48 100644
--- a/solenv/bin/modules/SourceConfig.pm
+++ b/solenv/bin/modules/SourceConfig.pm
@@ -307,6 +307,9 @@ sub read_config_file {
                     my $repository_source_path = $self->{SOURCE_ROOT} . "/$1";
                     if (defined $ENV{UPDMINOREXT}) {
                         $repository_source_path .= $ENV{UPDMINOREXT};
+                        if (defined ${$self->{REPOSITORIES}}{$1.$ENV{UPDMINOREXT}}) {
+                            delete ${$self->{REPOSITORIES}}{$1.$ENV{UPDMINOREXT}};
+                        };
                     };
                     ${$self->{REPOSITORIES}}{$1} = $repository_source_path;
                     ${$self->{ACTIVATED_REPOSITORIES}}{$1}++;
-- 
cgit 


From d070c1a0ff7e986e4b541549eab9ce373f756f72 Mon Sep 17 00:00:00 2001
From: Ingo Schmidt <is@openoffice.org>
Date: Fri, 30 Jul 2010 13:49:54 +0200
Subject: native323 #i113447# setting Windows update path correctly

---
 solenv/bin/modules/installer/windows/property.pm | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'solenv')

diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index e9f122a54d86..35866103d9fa 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -316,6 +316,11 @@ sub set_important_properties
     {
         my $onepropertyline = "OFFICEDIRHOSTNAME" . "\t" . $installer::globals::officedirhostname . "\n";
         push(@{$propertyfile}, $onepropertyline);
+
+        my $localofficedirhostname = $installer::globals::officedirhostname;
+        $localofficedirhostname =~ s/\//\\/g;
+        $onepropertyline = "OFFICEDIRHOSTNAME_" . "\t" . $localofficedirhostname . "\n";
+        push(@{$propertyfile}, $onepropertyline);
     }
 
     if ( $installer::globals::sundirhostname )
-- 
cgit 


From a572dbd314e59149ca8efb7f5e6334ed8138e76f Mon Sep 17 00:00:00 2001
From: "Matthias Huetsch [mhu]" <matthias.huetsch@oracle.com>
Date: Mon, 2 Aug 2010 19:01:49 +0200
Subject: mhu23 #i113531# use recommended Windows linker flags and DLL search
 path.

---
 solenv/inc/set_wntx64.mk | 13 +++++++++++++
 solenv/inc/wntmsci10.mk  |  2 +-
 solenv/inc/wntmsci11.mk  | 17 +++++++++++++++--
 3 files changed, 29 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 solenv/inc/set_wntx64.mk

(limited to 'solenv')

diff --git a/solenv/inc/set_wntx64.mk b/solenv/inc/set_wntx64.mk
old mode 100755
new mode 100644
index bf2ca9314f33..412fb3bd2821
--- a/solenv/inc/set_wntx64.mk
+++ b/solenv/inc/set_wntx64.mk
@@ -42,6 +42,10 @@ LIBMGR_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY) $(NOLOGO)
 IMPLIB_X64=$(WRAPCMD) $(LIBMGR_X64_BINARY)
 
 USE_CFLAGS_X64=-c -nologo -Gs $(NOLOGO) -Zm500 -Zc:forScope,wchar_t- -GR
+
+# Stack buffer overrun detection.
+CFLAGS+=-GS
+
 USE_CDEFS_X64+= -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
 .IF "$(debug)"!=""
 USE_CFLAGS_X64+=-Zi -Fd$(MISC_X64)/$(@:b).pdb
@@ -78,6 +82,15 @@ CDEFSOBJMT_X64+=-D_MT
 LINKFLAGS_X64=/MAP /OPT:NOREF
 .ENDIF
 
+# excetion handling protection
+LINKFLAGS+=-safeseh
+
+# enable DEP
+LINKFLAGS+=-nxcompat
+
+# enable ASLR
+LINKFLAGS+=-dynamicbase
+
 .IF "$(PRODUCT)"!="full"
 LINKFLAGS_X64+= -NODEFAULTLIB -DEBUG
 .ELSE # "$(PRODUCT)"!="full"
diff --git a/solenv/inc/wntmsci10.mk b/solenv/inc/wntmsci10.mk
index 6ed8327c8506..5c959f7d0e3c 100644
--- a/solenv/inc/wntmsci10.mk
+++ b/solenv/inc/wntmsci10.mk
@@ -34,7 +34,7 @@ JAVAFLAGSDEBUG=-g
 # SOLAR JAva Unterstuetzung nur fuer wntmsci
 
 ASM=ml
-AFLAGS=/c /Cp /coff
+AFLAGS=/c /Cp /coff /safeseh
 
 # architecture dependent flags for the C and C++ compiler that can be changed by
 # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
index b270a6a25cfe..972feb0a8fdc 100644
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsci11.mk
@@ -34,7 +34,7 @@ JAVAFLAGSDEBUG=-g
 # SOLAR JAva Unterstuetzung nur fuer wntmsci
 
 ASM=ml
-AFLAGS=/c /Cp /coff
+AFLAGS=/c /Cp /coff /safeseh
 
 # architecture dependent flags for the C and C++ compiler that can be changed by
 # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
@@ -82,6 +82,10 @@ COMPILE_ECHO_FILE=
 # lookup":
 # -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800
 CFLAGS+=-Zm500 -Zc:forScope,wchar_t- -GR
+
+# Stack buffer overrun detection.
+CFLAGS+=-GS
+
 CFLAGS+=-c -nologo -Gs $(NOLOGO)
 
 CDEFS+= -D_X86_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_NON_CONFORMING_SWPRINTFS
@@ -235,8 +239,17 @@ LINKOUTPUTFILTER= $(PIPEERROR) $(GREP) -v "LNK4197:"
 LINKFLAGS=/MAP /OPT:NOREF
 .ENDIF
 
+# excetion handling protection
+LINKFLAGS+=-safeseh
+
+# enable DEP
+LINKFLAGS+=-nxcompat
+
+# enable ASLR
+LINKFLAGS+=-dynamicbase
+
 .IF "$(linkinc)" != ""
-LINKFLAGS=-NODEFAULTLIB -INCREMENTAL:YES -DEBUG
+LINKFLAGS+=-NODEFAULTLIB -INCREMENTAL:YES -DEBUG
 MAPFILE=
 _VC_MANIFEST_INC=1
 .ELSE # "$(linkinc)" != ""
-- 
cgit 


From cfa4661ffead9220cd5126aa9e7023ee95e60c7b Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Tue, 3 Aug 2010 12:33:28 +0200
Subject: ooo330l10n: #i113424# pootle l10n update for ooo330

---
 solenv/config/sooo330.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'solenv')

diff --git a/solenv/config/sooo330.ini b/solenv/config/sooo330.ini
index 6b20c69749d3..3f9b52286a4e 100644
--- a/solenv/config/sooo330.ini
+++ b/solenv/config/sooo330.ini
@@ -96,7 +96,7 @@ common
 			product full
 			PROEXT .pro
 			PROFULLSWITCH product=full
-			WITH_LANG en-US af ar as ast be-BY bg bn bo br brx bs ca ca-XV cs cy da de dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kid kk km kn ko kok ks ku lt lv mai mk ml mn mni mr my nb ne nl nn nr ns oc om or pa-IN pap pl pt pt-BR ro ru rw sa-IN sat sd sh si sk sl sq sr ss st sv sw-TZ ta te tg th tn tr ts ug uk ur uz ve vi xh zh-CN zh-TW zu
+			WITH_LANG en-US ar bo ca da de es fr gl gu he hu is it ja ko ku lv mr nl or pl pt-BR pt si sv ta te tr ug kid
 		}
 		pro:1 IF %UPDATER% != YES
 		{
-- 
cgit 


From d92a4c0c271e77d985c48755ea1a1ce70665bac0 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Tue, 3 Aug 2010 18:42:41 +0200
Subject: masterfix: #i10000# l10n tool fix

---
 solenv/bin/jpropex | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100755 solenv/bin/jpropex

(limited to 'solenv')

diff --git a/solenv/bin/jpropex b/solenv/bin/jpropex
deleted file mode 100755
index 2d62d13b093e..000000000000
--- a/solenv/bin/jpropex
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-if [ x${SOLARENV}x = xx ]; then
-    echo No environment found, please use 'configure' or 'setsolar'
-    exit 1
-fi
-if [ x${JAVA_HOME}x = xx ]; then
-    echo No Java found!
-    exit 1
-fi
-exec java -DSOLARSRC=${SOLARSRC} -DWORK_STAMP=${WORK_STAMP} -DUSE_SHELL=  -jar ${SOLARVER}/${INPATH}/bin${UPDMINOREXT}/jpropex.jar "$@"
-- 
cgit 


From ff7872fa7f365582f43850c766074d2046ae36b0 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Tue, 3 Aug 2010 19:49:59 +0200
Subject: OOO330

---
 solenv/inc/minor.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'solenv')

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index ef764a7ee545..a4d473a07001 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=330
-RSCREVISION=330m2(Build:9516)
-BUILD=9516
-LAST_MINOR=m2
+RSCREVISION=330m3(Build:9519)
+BUILD=9519
+LAST_MINOR=m3
 SOURCEVERSION=OOO330
-- 
cgit 


From 08918310f5be95067647a534163ed9b49cf8943d Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Fri, 6 Aug 2010 13:36:52 +0200
Subject: masterfix: #i10000# fixed packing of long names for installsets

---
 solenv/bin/modules/installer/globals.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index ccef960e0337..582bd8c708b1 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -184,7 +184,7 @@ BEGIN
     $installertypedir = "";
     $controlledmakecabversion = "5";
     $saved_packages_path = "";
-    $max_lang_length = 65;
+    $max_lang_length = 50;
     $globalblock = "Globals";
     $rootmodulegid = "";
     %alllangmodules = ();
-- 
cgit 


From 52315eb71aeb56d0f633581f8d8b170311bceced Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Wed, 11 Aug 2010 14:52:58 +0200
Subject: OOO330

---
 solenv/inc/minor.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'solenv')

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index a4d473a07001..f2458486a3b1 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=330
-RSCREVISION=330m3(Build:9519)
-BUILD=9519
-LAST_MINOR=m3
+RSCREVISION=330m4(Build:9520)
+BUILD=9520
+LAST_MINOR=m4
 SOURCEVERSION=OOO330
-- 
cgit 


From 543f129680b7d9f68f2ec75c64f00a454e05f9c8 Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Wed, 18 Aug 2010 17:20:56 +0200
Subject: masterfix: #i113912# fixed creating log directory

---
 solenv/bin/build.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'solenv')

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
index d7bc7df26442..60a97fb2e764 100755
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -234,7 +234,7 @@
         if (defined $html_path) {
             $html_file = CorrectPath($html_path . '/' . $ENV{INPATH}. '.build.html');
         } else {
-            my $log_directory = Cwd::realpath(CorrectPath($StandDir . '/../log'));
+            my $log_directory = Cwd::realpath(CorrectPath($StandDir . '/..')) . '/log';
             if ((!-d $log_directory) && (!mkdir($log_directory))) {
                 print_error("Cannot create $log_directory for writing html file\n");
             };
-- 
cgit 


From dcbb257fe469bf746e525c6b9d87fd94ebb5ed94 Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Wed, 18 Aug 2010 17:38:47 +0200
Subject: OOO330

---
 solenv/inc/minor.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'solenv')

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index f2458486a3b1..a6e3941d89af 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=330
-RSCREVISION=330m4(Build:9520)
-BUILD=9520
-LAST_MINOR=m4
+RSCREVISION=330m5(Build:9521)
+BUILD=9521
+LAST_MINOR=m5
 SOURCEVERSION=OOO330
-- 
cgit 


From 63b41e2967bd928e01b57b010471c11c346da2f3 Mon Sep 17 00:00:00 2001
From: Vladimir Glazunov <vg@openoffice.org>
Date: Thu, 19 Aug 2010 15:13:01 +0200
Subject: #i113965# fix for start directory

---
 solenv/bin/build.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 solenv/bin/build.pl

(limited to 'solenv')

diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
old mode 100755
new mode 100644
index 60a97fb2e764..987d7fbb5bea
--- a/solenv/bin/build.pl
+++ b/solenv/bin/build.pl
@@ -1150,8 +1150,8 @@ sub get_stand_dir {
         print_error('Found no project to build');
     };
     $initial_module = substr($initial_dir, length($StandDir) + 1);
-    if ($initial_module =~ /\\|\//) {
-        $initial_module = File::Basename::dirname($initial_module);
+    if ($initial_module =~ /(\\|\/)/) {
+        $initial_module = $`;
     };
     $module_paths{$initial_module} = $StandDir . "/$initial_module";
 #    $build_list_paths{$initial_module} =$StandDir . '/prj/'.$_;
-- 
cgit