rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#5617 Remove plugins support from toolchain

This commit is contained in:
Andrew Nelless 2016-09-27 16:20:29 +01:00
parent 964e6d2f12
commit e18f8c62e7
1 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ext/toolchain/commands1.py
View File

@ -741,16 +741,6 @@ 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"
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:
raise Exception("run config with --mac-identity") raise Exception("run config with --mac-identity")
@ -1151,14 +1141,12 @@ class InternalCommands:
controlFile.close() controlFile.close()
targetBin = '%s/%s/usr/bin' % (debDir, package) targetBin = '%s/%s/usr/bin' % (debDir, package)
targetPlugin = '%s/%s/usr/lib/synergy/plugins' % (debDir, package)
targetShare = '%s/%s/usr/share' % (debDir, package) targetShare = '%s/%s/usr/share' % (debDir, package)
targetApplications = "%s/applications" % targetShare targetApplications = "%s/applications" % targetShare
targetIcons = "%s/icons" % targetShare targetIcons = "%s/icons" % targetShare
targetDocs = "%s/doc/%s" % (targetShare, self.project) targetDocs = "%s/doc/%s" % (targetShare, self.project)
os.makedirs(targetBin) os.makedirs(targetBin)
os.makedirs(targetPlugin)
os.makedirs(targetApplications) os.makedirs(targetApplications)
os.makedirs(targetIcons) os.makedirs(targetIcons)
os.makedirs(targetDocs) os.makedirs(targetDocs)
@ -1176,17 +1164,6 @@ class InternalCommands:
if err != 0: if err != 0:
raise Exception('strip failed: ' + str(err)) 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.desktop" % resDir, targetApplications)
shutil.copy("%s/synergy.ico" % resDir, targetIcons) shutil.copy("%s/synergy.ico" % resDir, targetIcons)
@ -1402,13 +1379,6 @@ class InternalCommands:
packageTarget = filename packageTarget = filename
ftp.upload(packageSource, packageTarget) 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): def getLibraryDistFilename(self, type, dir, name):
(platform, packageExt, libraryExt) = self.getDistributePlatformInfo(type) (platform, packageExt, libraryExt) = self.getDistributePlatformInfo(type)
firstPart = '%s-%s-%s' % (name, self.getVersionForFilename(), platform) firstPart = '%s-%s-%s' % (name, self.getVersionForFilename(), platform)