OSX_VERSION = '3.0beta6'
VERSION = '3.0beta6'
else:
- LINUX_VERSION = '3.0rc3'
- VERSION = '3.0rc3'
+ LINUX_VERSION = '3.0'
+ VERSION = '3.0'
APPNAME = 'Ardour3'
'export',
'midi_maps',
'mcp',
- 'manual',
'patchfiles'
]
# Version stuff
-def fetch_svn_revision (path):
- cmd = "svnversion | cut -d: -f1"
- output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].decode (sys.getdefaultencoding())
- return output.rstrip(os.linesep)
-
def fetch_gcc_version (CC):
cmd = "LANG= %s --version" % CC
output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
version = o.split(' ')[2].split('.')
return version
-def fetch_git_revision (path):
- cmd = "LANG= git log --abbrev HEAD^..HEAD"
- output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
- o = output[0].decode('utf-8')
- rev = o.replace ("commit", "git")[0:10]
- cmd = "LANG= git log --abbrev -n1 --grep 'git-svn-id'"
+def fetch_git_revision ():
+ cmd = "LANG= git describe --tags HEAD"
output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
- for line in output:
- try:
- if "git-svn-id" in line:
- line = line.split('@')[1].split(' ')
- rev = line[0]
- break
- except:
- pass
+ rev = output[0].decode('utf-8')
return rev
-def fetch_bzr_revision (path):
- cmd = subprocess.Popen("LANG= bzr log -l 1 " + path, stdout=subprocess.PIPE, shell=True)
- out = cmd.communicate()[0]
- svn = re.search('^svn revno: [0-9]*', out, re.MULTILINE)
- str = svn.group(0)
- chars = 'svnreio: '
- return string.lstrip(str, chars)
-
def create_stored_revision():
rev = ""
- if os.path.exists('.svn'):
- rev = fetch_svn_revision('.');
- elif os.path.exists('.git'):
- rev = fetch_git_revision('.');
- elif os.path.exists('.bzr'):
- rev = fetch_bzr_revision('.');
- print("Revision: %s", rev)
+ if os.path.exists('.git'):
+ rev = fetch_git_revision();
+ print("ardour.git version: " + rev + "\n")
elif os.path.exists('libs/ardour/svn_revision.cc'):
print("Using packaged svn revision")
return
try:
text = '#include "ardour/svn_revision.h"\n'
text += 'namespace ARDOUR { const char* svn_revision = \"%s\"; }\n' % rev
- print('Writing svn revision info to libs/ardour/svn_revision.cc using ' + rev)
+ print('Writing revision info to libs/ardour/svn_revision.cc using ' + rev)
o = open('libs/ardour/svn_revision.cc', 'w')
o.write(text)
o.close()
conf.env['build_target'] = 'leopard'
elif re.search ("^10[.]", version) != None:
conf.env['build_target'] = 'snowleopard'
- else:
+ elif re.search ("^11[.]", version) != None:
conf.env['build_target'] = 'lion'
+ else:
+ conf.env['build_target'] = 'mountainlion'
else:
if re.search ("x86_64", cpu) != None:
conf.env['build_target'] = 'x86_64'
# a single way to test if we're on OS X
#
- if conf.env['build_target'] in ['panther', 'tiger', 'leopard', 'snowleopard', 'lion', 'mountainlion' ]:
+ if conf.env['build_target'] in ['panther', 'tiger', 'leopard', 'snowleopard' ]:
conf.define ('IS_OSX', 1)
# force tiger or later, to avoid issues on PPC which defaults
# back to 10.1 if we don't tell it otherwise.
+
conf.env.append_value('CFLAGS', "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040")
+ conf.env.append_value('CXXFLAGS', "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040")
+ conf.env.append_value('CXXFLAGS', '-mmacosx-version-min=10.4')
+ conf.env.append_value('CFLAGS', '-mmacosx-version-min=10.4')
+
+ elif conf.env['build_target'] in [ 'lion', 'mountainlion' ]:
+ conf.env.append_value('CFLAGS', "-DMAC_OS_X_VERSION_MIN_REQUIRED=1070")
+ conf.env.append_value('CXXFLAGS', "-DMAC_OS_X_VERSION_MIN_REQUIRED=1070")
+ conf.env.append_value('CXXFLAGS', '-mmacosx-version-min=10.7')
+ conf.env.append_value('CFLAGS', '-mmacosx-version-min=10.7')
else:
conf.define ('IS_OSX', 0)
help='Do not build with Freesound database support')
opt.add_option('--gprofile', action='store_true', default=False, dest='gprofile',
help='Compile for use with gprofile')
+ opt.add_option('--videotimeline', action='store_true', default=False, dest='videotimeline',
+ help='Compile with support for video-timeline')
opt.add_option('--lv2', action='store_true', default=True, dest='lv2',
help='Compile with support for LV2 (if Lilv+Suil is available)')
opt.add_option('--no-lv2', action='store_false', dest='lv2',
opt.add_option('--nls', action='store_true', default=True, dest='nls',
help='Enable i18n (native language support) (default)')
opt.add_option('--no-nls', action='store_false', dest='nls')
- opt.add_option('--phone-home', action='store_false', default=False, dest='phone_home')
+ opt.add_option('--phone-home', action='store_true', default=True, dest='phone_home',
+ help='Contact ardour.org at startup for new announcements')
+ opt.add_option('--no-phone-home', action='store_false', dest='phone_home',
+ help='Do not contact ardour.org at startup for new announcements')
opt.add_option('--stl-debug', action='store_true', default=False, dest='stl_debug',
help='Build with debugging for the STL')
opt.add_option('--rt-alloc-debug', action='store_true', default=False, dest='rt_alloc_debug',
conf.define ('TOP_MENUBAR',1)
conf.define ('GTKOSX',1)
- # Define OSX as a uselib to use when compiling
- # on Darwin to add all applicable flags at once
- #
- conf.env.append_value('CXXFLAGS_OSX', '-DMAC_OS_X_VERSION_MIN_REQUIRED=1040')
- conf.env.append_value('CFLAGS_OSX', '-DMAC_OS_X_VERSION_MIN_REQUIRED=1040')
- conf.env.append_value('CXXFLAGS_OSX', '-mmacosx-version-min=10.4')
- conf.env.append_value('CFLAGS_OSX', '-mmacosx-version-min=10.4')
-
# It would be nice to be able to use this to force back-compatibility with 10.4
# but even by the time of 11, the 10.4 SDK is no longer available in any normal
# way.
# Set up waf environment and C defines
opts = Options.options
- if opts.debug:
- opts.phone_home = False; # debug builds should not call home
if opts.phone_home:
- conf.env['PHONE_HOME'] = opts.phone_home
+ conf.define('PHONE_HOME', 1)
+ conf.env['PHONE_HOME'] = True
if opts.fpu_optimization:
conf.env['FPU_OPTIMIZATION'] = True
if opts.freesound:
conf.env['BUILD_TESTS'] = opts.build_tests
#if opts.tranzport:
# conf.env['TRANZPORT'] = 1
+ if opts.videotimeline:
+ conf.define('WITH_VIDEOTIMELINE',1)
+ conf.env['VIDEOTIMELINE'] = 1
if opts.windows_vst:
conf.define('WINDOWS_VST_SUPPORT', 1)
conf.env['WINDOWS_VST_SUPPORT'] = True
# write_config_text('Tranzport', opts.tranzport)
write_config_text('Unit tests', conf.env['BUILD_TESTS'])
write_config_text('Universal binary', opts.universal)
+ write_config_text('Videotimeline', opts.videotimeline)
write_config_text('Generic x86 CPU', opts.generic)
write_config_text('Windows VST support', opts.windows_vst)
write_config_text('Wiimote support', conf.is_defined('BUILD_WIIMOTE'))
def i18n_mo(bld):
bld.recurse (i18n_children)
+def tarball(bld):
+ create_stored_revision()