Merge remote-tracking branch 'origin/master' into jerry-sandbox

This commit is contained in:
Jerry (Xinyu Hou) 2015-06-09 10:59:49 -07:00
commit 7115db1176
1 changed files with 8 additions and 2 deletions

View File

@ -740,8 +740,14 @@ class InternalCommands:
shutil.copy(targetDir + "/syntool", bundleBinDir) shutil.copy(targetDir + "/syntool", bundleBinDir)
# Copy all generated plugins to the package # Copy all generated plugins to the package
bundlePluginDir = bundleBinDir + "/plugins" bundlePluginDir = bundleBinDir + "plugins"
shutil.copytree(targetDir + "/plugins", bundlePluginDir) pluginDir = targetDir + "/plugins"
print "Copying plugins dirtree: " + pluginDir
if os.path.isdir(pluginDir):
print "Copying to: " + bundlePluginDir
shutil.copytree(pluginDir, bundlePluginDir)
else:
print "pluginDir doesn't exist, skipping"
self.loadConfig() self.loadConfig()
if not self.macIdentity: if not self.macIdentity: