From 4f41d63d7a7244927f843ccf04e047a4e5041f8d Mon Sep 17 00:00:00 2001 From: Nagy Karoly Gabriel Date: Sat, 28 Feb 2009 00:13:07 +0200 Subject: [PATCH] scons: Updated (0.97 -> 1.2.0) --- develop/scons/environment.patch | 28 ++++++++++++---------------- develop/scons/scons.desc | 6 +++--- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/develop/scons/environment.patch b/develop/scons/environment.patch index 92accb1c1..276ccdb14 100644 --- a/develop/scons/environment.patch +++ b/develop/scons/environment.patch @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../scons/environment.patch +# Copyright (C) 2009 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -14,19 +15,14 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- -We must inherit the build environment to have the PATH to the wrappers as well -as their configuration. - - - Rene Rebe - ---- ./engine/SCons/Action.py.orig 2005-09-08 09:15:13.000000000 -0400 -+++ ./engine/SCons/Action.py 2005-11-12 02:19:01.160181888 -0300 -@@ -437,7 +437,7 @@ - escape = env.get('ESCAPE', lambda x: x) - - try: -- ENV = env['ENV'] -+ ENV = os.environ - except KeyError: - global default_ENV - if not default_ENV: +--- scons-1.2.0/engine/SCons/Action.py.orig 2008-12-21 08:59:59.000000000 +0200 ++++ scons-1.2.0/engine/SCons/Action.py 2009-02-28 00:06:33.000000000 +0200 +@@ -561,7 +561,7 @@ + def get_default_ENV(env): + global default_ENV + try: +- return env['ENV'] ++ return os.environ + except KeyError: + if not default_ENV: + import SCons.Environment diff --git a/develop/scons/scons.desc b/develop/scons/scons.desc index 40c528675..142195410 100644 --- a/develop/scons/scons.desc +++ b/develop/scons/scons.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../scons/scons.desc -[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2009 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] [COPY] More information can be found in the files COPYING and README. @@ -30,8 +30,8 @@ [L] OpenSource [S] Stable -[V] 0.97 +[V] 1.2.0 [P] X -----5---9 144.500 -[D] 2844810301 scons-0.97.tar.gz http://dl.sourceforge.net/sourceforge/scons/ +[D] 1323254154 scons-1.2.0.tar.gz http://dl.sourceforge.net/sourceforge/scons/