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

merged 1.3 r1011:1012 into 1.4 and trunk

This commit is contained in:
Nick Bolton 2011-05-21 11:09:40 +00:00
parent b4918163a7
commit fce1e60ab2
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/build/toolchain.py
View File

@ -47,8 +47,8 @@ class InternalCommands:
doxygen_filename = 'doxygen.cfg' doxygen_filename = 'doxygen.cfg'
macZipFiles = [ macZipFiles = [
'../../bin/release/synergyc', '../../bin/synergyc',
'../../bin/release/synergys', '../../bin/synergys',
'../../bin/QSynergy.app', '../../bin/QSynergy.app',
'../../doc/synergy.conf.example', '../../doc/synergy.conf.example',
'../../doc/MacReadme.txt'] '../../doc/MacReadme.txt']
@ -450,6 +450,9 @@ class InternalCommands:
package_unsupported = False package_unsupported = False
unixTarget = self.defaultTarget unixTarget = self.defaultTarget
if type == '' or type == None:
raise Exception('No type specified.')
if type != 'win' and type != 'mac': if type != 'win' and type != 'mac':
self.configure(unixTarget, '-DCONF_CPACK:BOOL=TRUE') self.configure(unixTarget, '-DCONF_CPACK:BOOL=TRUE')
@ -548,9 +551,11 @@ class InternalCommands:
zipFile = (self.project + '-' + version + '-' + zipFile = (self.project + '-' + version + '-' +
self.getMacPackageName()) self.getMacPackageName())
binDir = self.getBinDir(unixTarget)
buildDir = self.getBuildDir(unixTarget)
# nb: temporary fix (just distribute a zip) # nb: temporary fix (just distribute a zip)
bin = self.getBuildDir(unixTarget) self.try_chdir(buildDir)
self.try_chdir(bin)
try: try:
import shutil import shutil
@ -569,7 +574,7 @@ class InternalCommands:
else: else:
shutil.copy2(f, zipFile + '/') shutil.copy2(f, zipFile + '/')
zipCmd = ('zip -r ../../' + self.getGenerator().binDir + '/' + zipFile + '.zip ' + zipFile); zipCmd = ('zip -r ../../' + binDir + '/' + zipFile + '.zip ' + zipFile);
print 'Creating package: ' + zipCmd print 'Creating package: ' + zipCmd
err = os.system(zipCmd) err = os.system(zipCmd)