diff options
| author | Steven Knight <knight@baldmt.com> | 2009-05-13 04:01:15 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-05-13 04:01:15 (GMT) |
| commit | b30af6a70702108f3b6817deb6834d73ad529870 (patch) | |
| tree | dacd05c3809e1df3228bf54bbf5a812b897e9440 /src | |
| parent | b3f2908210bd9c3420338eb64e96a7004db079de (diff) | |
| download | SCons-b30af6a70702108f3b6817deb6834d73ad529870.zip SCons-b30af6a70702108f3b6817deb6834d73ad529870.tar.gz SCons-b30af6a70702108f3b6817deb6834d73ad529870.tar.bz2 | |
Add ipkg.py to the MANIFEST.in list and fix 1.5 fix
(string.split() instead of string methods).
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/MANIFEST.in | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/ipkg.py | 12 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in index e7c9bd8..7f18726 100644 --- a/src/engine/MANIFEST.in +++ b/src/engine/MANIFEST.in @@ -108,6 +108,7 @@ SCons/Tool/ilink.py SCons/Tool/ilink32.py SCons/Tool/install.py SCons/Tool/intelc.py +SCons/Tool/ipkg.py SCons/Tool/jar.py SCons/Tool/JavaCommon.py SCons/Tool/javac.py diff --git a/src/engine/SCons/Tool/ipkg.py b/src/engine/SCons/Tool/ipkg.py index 755c536..10fbc98 100644 --- a/src/engine/SCons/Tool/ipkg.py +++ b/src/engine/SCons/Tool/ipkg.py @@ -35,9 +35,10 @@ packages fake_root. __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" +import os +import string + import SCons.Builder -from os import popen -from os.path import dirname def generate(env): """Add Builders and construction variables for ipkg to an Environment.""" @@ -52,8 +53,11 @@ def generate(env): env['IPKG'] = 'ipkg-build' env['IPKGCOM'] = '$IPKG $IPKGFLAGS ${SOURCE}' - env['IPKGUSER'] = popen('id -un').read().strip() - env['IPKGGROUP'] = popen('id -gn').read().strip() + # TODO(1.5) + #env['IPKGUSER'] = os.popen('id -un').read().strip() + #env['IPKGGROUP'] = os.popen('id -gn').read().strip() + env['IPKGUSER'] = string.strip(os.popen('id -un').read()) + env['IPKGGROUP'] = string.strip(os.popen('id -gn').read()) env['IPKGFLAGS'] = SCons.Util.CLVar('-o $IPKGUSER -g $IPKGGROUP') env['IPKGSUFFIX'] = '.ipk' |