diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-01-19 01:53:39 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-02-05 19:34:04 -0600 |
| commit | 9be1f79362c7c8d3b35d33567c4d337d37a5717f (patch) | |
| tree | f029c49986aa7d0921b66ed9175507e84149b15e | |
| parent | 4a9526d59bb3f207c74a757b338b7950f604d450 (diff) | |
avoid exporting un-necessary symbol/alias for stable scripts
| -rwxr-xr-x | set_soenv.in | 4 | ||||
| -rwxr-xr-x | solenv/bin/build.pl | 4 | ||||
| -rw-r--r-- | solenv/inc/settings.mk | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/set_soenv.in b/set_soenv.in index 8a52e9048011..87f3f22e28d7 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -646,9 +646,6 @@ if ( $platform =~ m/cygwin/ ) ToFile( "TOUCH", $WIN_TOUCH, "e" ); } -ToFile( "DELIVER", "deliver.pl", "e" ); -ToFile( "MKOUT", "mkout.pl", "e" ); -ToFile( "ZIPDEP", "zipdep.pl", "e" ); # # Writing the aliases to file. @@ -666,7 +663,6 @@ if ($platform =~ m/solaris|darwin|freebsd/) ToFile( "GNUPATCH", "@GNUPATCH@", "e"); } -ToFile( "ENV_SCRIPT", "$outfile", "e" ); # # Writing unset variables you might not need to file. # diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl index a641ca31f41f..21fb276ef1e5 100755 --- a/solenv/bin/build.pl +++ b/solenv/bin/build.pl @@ -191,7 +191,7 @@ my $verbose = 0; my @modules_built = (); - my $deliver_command = $ENV{DELIVER}; + my $deliver_command = "deliver.pl"; my %prj_platform = (); my $check_error_string = ''; my $dmake = ''; @@ -1512,7 +1512,7 @@ sub cancel_build { print STDERR "\n"; print STDERR "" . $ENV{'OOO_SHELL'} . "\n"; print STDERR "cd " . $ENV{'SRC_ROOT'} . "\n"; - print STDERR "source ./" . $ENV{'ENV_SCRIPT'} . "\n"; + print STDERR "source ./build_env\n"; print STDERR "cd $module\n"; if ($source_config->is_gbuild($module) ) { diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index c3eddcd4ed2b..65751ebcb8d5 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -271,6 +271,9 @@ PROFILE= DBGUTIL= dbgutil= +ZIPDEP:="zipdep.pl" + + # =========================================================================== # unter NT werden Variablennamen an untergeordnete makefiles UPPERCASE # weitergereicht, aber case significant ausgewertet! @@ -563,7 +566,7 @@ LOCAL_COMMON_OUT:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(OUT)) # target instead of using $(OUT)/inc/myworld.mk as target name. # (See iz62795) $(posix_PWD)/$(OUT)/inc/%world.mk : - @$(MKOUT) $(ROUT) + @mkout.pl $(ROUT) @echo $(EMQ)# > $@ .INCLUDE : $(posix_PWD)/$(OUT)/inc/myworld.mk |