From a11f234834a52457cfdcf58ee3240d33fb7e6bd5 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Thu, 27 Jan 2011 23:56:24 +0100 Subject: locales34: #i112240# for system icu >=4.4 add Close_Parenthesis to $CL Close_Punctuation; patch from --- set_soenv.in | 3 +++ 1 file changed, 3 insertions(+) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 8a99842291de..60cd140f5408 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1857,6 +1857,9 @@ if ($SYSTEM_PYTHON eq "NO") { ToFile( "HOME", "@HOME@", "e" ); } ToFile( "SYSTEM_ICU", "@SYSTEM_ICU@", "e" ); +ToFile( "ICU_MAJOR", "@ICU_MAJOR@", "e" ); +ToFile( "ICU_MINOR", "@ICU_MINOR@", "e" ); +ToFile( "ICU_MICRO", "@ICU_MICRO@", "e" ); ToFile( "SYSTEM_GENBRK", "@SYSTEM_GENBRK@", "e" ); ToFile( "SYSTEM_GENCCODE", "@SYSTEM_GENCCODE@", "e" ); ToFile( "SYSTEM_GENCMN", "@SYSTEM_GENCMN@", "e" ); -- cgit v1.2.3 From 3da39398054c05de5b9b7edc54f769dafd687550 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Tue, 1 Feb 2011 15:43:35 +0100 Subject: l10nmove: #i116586# Move l10n module into own repository --- set_soenv.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index 5061745103b1..d634be1834ad 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -78,7 +78,7 @@ my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV # Environment variables. my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL, - $UPD, $WORK_STAMP, $SOURCE_ROOT_DIR , + $UPD, $WORK_STAMP, $SOURCE_ROOT_DIR , $gb_REPOS, $SOLARSRC, $DEVROOT, $SOLARVER, $SOLARVERSION, $WORKDIR, $OUTDIR, $SOLARENV, $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH, @@ -983,6 +983,7 @@ $SOLARSRC = '$SRC_ROOT'; my @splitlist = split( /\//, $SRC_ROOT ); pop @splitlist; $SOURCE_ROOT_DIR = join("/", @splitlist); +$gb_REPOS = $SOURCE_ROOT_DIR."/ooo ".$SOURCE_ROOT_DIR."/sun ".$SOURCE_ROOT_DIR."/loc"; # default TARFILE_LOCATION if ('@TARFILE_LOCATION@' eq "DEFAULT") @@ -1964,6 +1965,8 @@ if ($platform !~ m/cygwin|os2/) { } ToFile( "SOLARSRC", $SOLARSRC, "e" ); ToFile( "SOURCE_ROOT_DIR", $SOURCE_ROOT_DIR, "e" ); +ToFile( "gb_REPOS", $gb_REPOS, "e" ); + if ( $platform =~ m/cygwin/ ) { ToFile( "ILIB", $ILIB, "e" ); -- cgit v1.2.3 From a17d76c92f42c70ab1369e3ca3343859d9e9b413 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Tue, 1 Feb 2011 16:24:30 +0100 Subject: l10nmove: #i116586# Move l10n module into own repository --- set_soenv.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index d634be1834ad..edef85af7d3a 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -983,7 +983,7 @@ $SOLARSRC = '$SRC_ROOT'; my @splitlist = split( /\//, $SRC_ROOT ); pop @splitlist; $SOURCE_ROOT_DIR = join("/", @splitlist); -$gb_REPOS = $SOURCE_ROOT_DIR."/ooo ".$SOURCE_ROOT_DIR."/sun ".$SOURCE_ROOT_DIR."/loc"; +$gb_REPOS = $SOURCE_ROOT_DIR."/ooo ".$SOURCE_ROOT_DIR."/loc"; # default TARFILE_LOCATION if ('@TARFILE_LOCATION@' eq "DEFAULT") -- cgit v1.2.3 From a0d42cf895223fdc944d76744eea8126aa0c0926 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Wed, 2 Feb 2011 16:23:08 +0100 Subject: l10nmove: #i116586# Move l10n module into own repository --- set_soenv.in | 2 +- solenv/bin/cws.pl | 7 +++---- solenv/bin/modules/CwsConfig.pm | 1 - solenv/config/sdev300.ini | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index edef85af7d3a..a07310634819 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -983,7 +983,7 @@ $SOLARSRC = '$SRC_ROOT'; my @splitlist = split( /\//, $SRC_ROOT ); pop @splitlist; $SOURCE_ROOT_DIR = join("/", @splitlist); -$gb_REPOS = $SOURCE_ROOT_DIR."/ooo ".$SOURCE_ROOT_DIR."/loc"; +$gb_REPOS = $SOURCE_ROOT_DIR."/ooo ".$SOURCE_ROOT_DIR."/l10n"; # default TARFILE_LOCATION if ('@TARFILE_LOCATION@' eq "DEFAULT") diff --git a/solenv/bin/cws.pl b/solenv/bin/cws.pl index 60e4987c6aa8..ec671d52884a 100644 --- a/solenv/bin/cws.pl +++ b/solenv/bin/cws.pl @@ -49,7 +49,6 @@ BEGIN { use lib (@lib_dirs); use Cws; -print "I am cws.pl from cws!" #### script id ##### @@ -1718,9 +1717,6 @@ sub do_fetch print_error("Can't create directory '$work_master': $!.", 8); } - hg_clone_cws_or_milestone('ooo', $cws, "$work_master/ooo", $clone_milestone_only); - hg_clone_cws_or_milestone('so', $cws, "$work_master/sun", $clone_milestone_only); - my %unique = map { $_ => 1 } split(/,/,$additional_repositories_opt); my @unique_repo_list = keys %unique; @@ -1733,6 +1729,9 @@ sub do_fetch } + hg_clone_cws_or_milestone('ooo', $cws, "$work_master/ooo", $clone_milestone_only); + hg_clone_cws_or_milestone('so', $cws, "$work_master/sun", $clone_milestone_only); + if ( get_source_config_for_milestone($masterws, $milestone) ) { # write source_config file my $source_config_file = "$work_master/source_config"; diff --git a/solenv/bin/modules/CwsConfig.pm b/solenv/bin/modules/CwsConfig.pm index 7e9630ee1331..dca09877654b 100644 --- a/solenv/bin/modules/CwsConfig.pm +++ b/solenv/bin/modules/CwsConfig.pm @@ -353,7 +353,6 @@ sub _get_hg_source if ( !defined($source) ) { $source = ""; } - #print "result = ".$source."\n"; $self->{$repository_source} = $source; } return $self->{$repository_source} ? $self->{$repository_source} : undef; diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini index 5f2125dbeae1..bdbbcec6f5f6 100644 --- a/solenv/config/sdev300.ini +++ b/solenv/config/sdev300.ini @@ -217,7 +217,7 @@ finish *o: cd %SOLARSRC% ALT_L10N_MODULE $expand(%SOLARSRC%/..)/sun/l10n_so TARFILE_LOCATION %SOURCE_ROOT_DIR%/ext_sources - gb_REPOS %SOURCE_ROOT_DIR%/ooo %SOURCE_ROOT_DIR%/sun %SOURCE_ROOT_DIR%/loc + gb_REPOS %SOURCE_ROOT_DIR%/ooo %SOURCE_ROOT_DIR%/sun %SOURCE_ROOT_DIR%/l10n gb_LOCALBUILDDIR %SOL_TMP%/gb_%CWS_WORK_STAMP%/%WORK_STAMP% } common_jre:0 IF %JREPATH% == -- cgit v1.2.3 From 6bb97c8b31d1eda069a560a82242cb6269a998b1 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Thu, 3 Feb 2011 16:29:56 +0100 Subject: l10nmove: #i116586# Move l10n module into own repository --- set_soenv.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index a07310634819..f7c829145fbd 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -983,7 +983,6 @@ $SOLARSRC = '$SRC_ROOT'; my @splitlist = split( /\//, $SRC_ROOT ); pop @splitlist; $SOURCE_ROOT_DIR = join("/", @splitlist); -$gb_REPOS = $SOURCE_ROOT_DIR."/ooo ".$SOURCE_ROOT_DIR."/l10n"; # default TARFILE_LOCATION if ('@TARFILE_LOCATION@' eq "DEFAULT") @@ -1497,6 +1496,10 @@ else # print "done\n"; +if ('@WITH_LANG@' ne "") +{ + $gb_REPOS = $SRC_ROOT." ".$SOURCE_ROOT_DIR."/l10n"; +} # # F. Setting the different aliases. -- cgit v1.2.3 From a3a148c0be866cebc2e77f2e9b2b843e4176d2ad Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Mon, 14 Feb 2011 18:48:22 +0100 Subject: l10nmove: add l10n repo to gb_REPOS --- set_soenv.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'set_soenv.in') diff --git a/set_soenv.in b/set_soenv.in index f7c829145fbd..8ee09904d054 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1496,9 +1496,11 @@ else # print "done\n"; +$gb_REPOS = $SRC_ROOT; + if ('@WITH_LANG@' ne "") { - $gb_REPOS = $SRC_ROOT." ".$SOURCE_ROOT_DIR."/l10n"; + $gb_REPOS .= " ".$SOURCE_ROOT_DIR."/l10n"; } # -- cgit v1.2.3