Skip to content

Commit

Permalink
#5617 Remove plugins support from toolchain
Browse files Browse the repository at this point in the history
  • Loading branch information
SymlessRemoved authored and Andrew Nelless committed Sep 29, 2016
1 parent de81ac1 commit 2d9eede
Showing 1 changed file with 0 additions and 30 deletions.
30 changes: 0 additions & 30 deletions ext/toolchain/commands1.py
Original file line number Diff line number Diff line change
Expand Up @@ -741,16 +741,6 @@ def macPostGuiMake(self, target):
shutil.copy(targetDir + "/synergys", bundleBinDir)
shutil.copy(targetDir + "/syntool", bundleBinDir)

# Copy all generated plugins to the package
bundlePluginDir = bundleBinDir + "plugins"
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()
if not self.macIdentity:
raise Exception("run config with --mac-identity")
Expand Down Expand Up @@ -1151,14 +1141,12 @@ def distDeb(self):
controlFile.close()

targetBin = '%s/%s/usr/bin' % (debDir, package)
targetPlugin = '%s/%s/usr/lib/synergy/plugins' % (debDir, package)
targetShare = '%s/%s/usr/share' % (debDir, package)
targetApplications = "%s/applications" % targetShare
targetIcons = "%s/icons" % targetShare
targetDocs = "%s/doc/%s" % (targetShare, self.project)

os.makedirs(targetBin)
os.makedirs(targetPlugin)
os.makedirs(targetApplications)
os.makedirs(targetIcons)
os.makedirs(targetDocs)
Expand All @@ -1176,17 +1164,6 @@ def distDeb(self):
if err != 0:
raise Exception('strip failed: ' + str(err))

pluginDir = "%s/plugins" % binDir

pluginFiles = [ 'libns.so']
for f in pluginFiles:
shutil.copy("%s/%s" % (pluginDir, f), targetPlugin)
target = "%s/%s" % (targetPlugin, f)
os.chmod(target, 0o0644)
err = os.system("strip " + target)
if err != 0:
raise Exception('strip failed: ' + str(err))

shutil.copy("%s/synergy.desktop" % resDir, targetApplications)
shutil.copy("%s/synergy.ico" % resDir, targetIcons)

Expand Down Expand Up @@ -1402,13 +1379,6 @@ def distftp(self, type, ftp):
packageTarget = filename
ftp.upload(packageSource, packageTarget)

if type != 'src':
pluginsDir = binDir + '/plugins'
nsPluginSource = self.findLibraryFile(type, pluginsDir, 'ns')
if nsPluginSource:
nsPluginTarget = self.getLibraryDistFilename(type, pluginsDir, 'ns')
ftp.upload(nsPluginSource, nsPluginTarget, "plugins")

def getLibraryDistFilename(self, type, dir, name):
(platform, packageExt, libraryExt) = self.getDistributePlatformInfo(type)
firstPart = '%s-%s-%s' % (name, self.getVersionForFilename(), platform)
Expand Down

0 comments on commit 2d9eede

Please sign in to comment.