summaryrefslogtreecommitdiff
path: root/indra/lib
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-09-18 11:40:45 -0400
committerNat Goodspeed <nat@lindenlab.com>2012-09-18 11:40:45 -0400
commita507df6e284ca11badaceda43effcd101ea09bac (patch)
treef39203a05287368afe538cc28929b164d6a8f3a4 /indra/lib
parentdab915c1d2a2d08363944de8ac4362fbe162bea0 (diff)
SWAT-711: Create Mac app bundle symlinks only for .dylib files that exist.
Previous viewer_manifest.py unconditionally created Mac symlinks for all expected .dylib files. Recent change to revert to statically linking llcommon means we no longer build libllcommon.dylib, therefore we no longer copy it, therefore any symlink to that library will be broken by definition. Change to create symlinks for .dylib files that were successfully copied.
Diffstat (limited to 'indra/lib')
-rw-r--r--indra/lib/python/indra/util/llmanifest.py21
1 files changed, 21 insertions, 0 deletions
diff --git a/indra/lib/python/indra/util/llmanifest.py b/indra/lib/python/indra/util/llmanifest.py
index a4fb77357c..8feb6b97a9 100644
--- a/indra/lib/python/indra/util/llmanifest.py
+++ b/indra/lib/python/indra/util/llmanifest.py
@@ -621,6 +621,23 @@ class LLManifest(object):
d = src_re.sub(d_template, s.replace('\\', '/'))
yield os.path.normpath(s), os.path.normpath(d)
+ def path2basename(self, path, file):
+ """
+ It is a common idiom to write:
+ self.path(os.path.join(somedir, somefile), somefile)
+
+ So instead you can write:
+ self.path2basename(somedir, somefile)
+
+ Note that this is NOT the same as:
+ self.path(os.path.join(somedir, somefile))
+
+ which is the same as:
+ temppath = os.path.join(somedir, somefile)
+ self.path(temppath, temppath)
+ """
+ return self.path(os.path.join(path, file), file)
+
def path(self, src, dst=None):
sys.stdout.write("Processing %s => %s ... " % (src, dst))
sys.stdout.flush()
@@ -666,6 +683,10 @@ class LLManifest(object):
print "%d files" % count
+ # Let caller check whether we processed as many files as expected. In
+ # particular, let caller notice 0.
+ return count
+
def do(self, *actions):
self.actions = actions
self.construct()