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

This commit is contained in:
Jerry (Xinyu Hou) 2015-06-09 10:54:33 -07:00
commit 552f914549
1 changed files with 4 additions and 0 deletions

View File

@ -739,6 +739,10 @@ class InternalCommands:
shutil.copy(targetDir + "/synergys", bundleBinDir) shutil.copy(targetDir + "/synergys", bundleBinDir)
shutil.copy(targetDir + "/syntool", bundleBinDir) shutil.copy(targetDir + "/syntool", bundleBinDir)
# Copy all generated plugins to the package
bundlePluginDir = bundleBinDir + "/plugins"
shutil.copytree(targetDir + "/plugins", bundlePluginDir)
self.loadConfig() self.loadConfig()
if not self.macIdentity: if not self.macIdentity:
raise Exception("run config with --mac-identity") raise Exception("run config with --mac-identity")