summaryrefslogtreecommitdiff
path: root/engine/SCons/Tool/zip.py
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2014-04-26 11:52:25 +0200
committerLuca Falavigna <dktrkranz@debian.org>2014-04-26 11:52:25 +0200
commitc58ef47cac0ffa49ecabdb228991a89fcdb4f8ef (patch)
tree677bf40bab72549a4c2dd882328a9896d1a08a87 /engine/SCons/Tool/zip.py
parentd4746a568b9d1464742de0788d39b08309e28cb0 (diff)
parent599d55e3999ad29f72fdc3a61d7c4bafc3171452 (diff)
Merge tag 'upstream/2.3.1'
Upstream version 2.3.1
Diffstat (limited to 'engine/SCons/Tool/zip.py')
-rw-r--r--engine/SCons/Tool/zip.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/engine/SCons/Tool/zip.py b/engine/SCons/Tool/zip.py
index 86ae55e..8a914cf 100644
--- a/engine/SCons/Tool/zip.py
+++ b/engine/SCons/Tool/zip.py
@@ -9,7 +9,7 @@ selection method.
"""
#
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/zip.py 2013/03/03 09:48:35 garyo"
+__revision__ = "src/engine/SCons/Tool/zip.py 2014/03/02 14:18:15 garyo"
import os.path
@@ -57,9 +57,9 @@ if internal_zip:
for fname in filenames:
path = os.path.join(dirpath, fname)
if os.path.isfile(path):
- zf.write(path)
+ zf.write(path, os.path.relpath(path, str(env.get('ZIPROOT', ''))))
else:
- zf.write(str(s))
+ zf.write(str(s), os.path.relpath(str(s), str(env.get('ZIPROOT', ''))))
zf.close()
else:
zipcompression = 0
@@ -88,6 +88,7 @@ def generate(env):
env['ZIPCOM'] = zipAction
env['ZIPCOMPRESSION'] = zipcompression
env['ZIPSUFFIX'] = '.zip'
+ env['ZIPROOT'] = SCons.Util.CLVar('')
def exists(env):
return internal_zip or env.Detect('zip')