diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/jar.py | 13 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 7656c6b..906f31f 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -470,6 +470,11 @@ RELEASE 0.97 - XXX - Document the new $FRAMEWORK* variables for Mac OS X. + From Kian Win Ong: + + - When building a .jar file and there is a $JARCHDIR, put the -C + in front of each .class file on the command line. + From Chris Pawling: - Have the linkloc tool use $MSVS_VERSION to select the Microsoft diff --git a/src/engine/SCons/Tool/jar.py b/src/engine/SCons/Tool/jar.py index b069990..ed93412 100644 --- a/src/engine/SCons/Tool/jar.py +++ b/src/engine/SCons/Tool/jar.py @@ -48,6 +48,8 @@ def jarSources(target, source, env, for_signature): # If we are changing the dir with -C, then sources should # be relative to that directory. src = src.get_path(src.fs.Dir(jarchdir)) + result.append('-C') + result.append(jarchdir) result.append(src) return result @@ -71,14 +73,6 @@ def jarFlags(target, source, env, for_signature): break return jarflags -def jarChdir(target, source, env, for_signature): - """If we have an Environment variable by the name - of JARCHDIR, then supply the command line option - '-C <dir>' to Jar.""" - if env.has_key('JARCHDIR'): - return [ '-C', '$JARCHDIR' ] - return [] - JarAction = SCons.Action.Action('$JARCOM', '$JARCOMSTR') JarBuilder = SCons.Builder.Builder(action = JarAction, @@ -97,8 +91,7 @@ def generate(env): env['_JARFLAGS'] = jarFlags env['_JARMANIFEST'] = jarManifest env['_JARSOURCES'] = jarSources - env['_JARCHDIR'] = jarChdir - env['JARCOM'] = '$JAR $_JARFLAGS $TARGET $_JARMANIFEST $_JARCHDIR $_JARSOURCES' + env['JARCOM'] = '$JAR $_JARFLAGS $TARGET $_JARMANIFEST $_JARSOURCES' env['JARSUFFIX'] = '.jar' def exists(env): |