mirror of
https://github.com/debauchee/barrier.git
synced 2024-12-25 03:53:18 +03:00
merged 1.3 r1011:1012 into 1.4 and trunk
This commit is contained in:
parent
b4918163a7
commit
fce1e60ab2
@ -47,8 +47,8 @@ class InternalCommands:
|
||||
doxygen_filename = 'doxygen.cfg'
|
||||
|
||||
macZipFiles = [
|
||||
'../../bin/release/synergyc',
|
||||
'../../bin/release/synergys',
|
||||
'../../bin/synergyc',
|
||||
'../../bin/synergys',
|
||||
'../../bin/QSynergy.app',
|
||||
'../../doc/synergy.conf.example',
|
||||
'../../doc/MacReadme.txt']
|
||||
@ -450,6 +450,9 @@ class InternalCommands:
|
||||
package_unsupported = False
|
||||
unixTarget = self.defaultTarget
|
||||
|
||||
if type == '' or type == None:
|
||||
raise Exception('No type specified.')
|
||||
|
||||
if type != 'win' and type != 'mac':
|
||||
self.configure(unixTarget, '-DCONF_CPACK:BOOL=TRUE')
|
||||
|
||||
@ -547,10 +550,12 @@ class InternalCommands:
|
||||
version = self.getVersionFromCmake()
|
||||
zipFile = (self.project + '-' + version + '-' +
|
||||
self.getMacPackageName())
|
||||
|
||||
binDir = self.getBinDir(unixTarget)
|
||||
buildDir = self.getBuildDir(unixTarget)
|
||||
|
||||
# nb: temporary fix (just distribute a zip)
|
||||
bin = self.getBuildDir(unixTarget)
|
||||
self.try_chdir(bin)
|
||||
self.try_chdir(buildDir)
|
||||
|
||||
try:
|
||||
import shutil
|
||||
@ -569,7 +574,7 @@ class InternalCommands:
|
||||
else:
|
||||
shutil.copy2(f, zipFile + '/')
|
||||
|
||||
zipCmd = ('zip -r ../../' + self.getGenerator().binDir + '/' + zipFile + '.zip ' + zipFile);
|
||||
zipCmd = ('zip -r ../../' + binDir + '/' + zipFile + '.zip ' + zipFile);
|
||||
|
||||
print 'Creating package: ' + zipCmd
|
||||
err = os.system(zipCmd)
|
||||
|
Loading…
Reference in New Issue
Block a user