import subprocess
import sys
-# Variables for 'waf dist'
-VERSION = '3.0rc1'
+if sys.platform == 'darwin':
+ VERSION = '3.0beta6'
+else:
+ VERSION = '3.0rc3'
+
APPNAME = 'Ardour3'
# Mandatory variables
'export',
'midi_maps',
'mcp',
- 'manual'
+ 'manual',
+ 'patchfiles'
]
i18n_children = [
# Version stuff
def fetch_svn_revision (path):
- # the fifth line has the revision number. we can't grep because of i18n issues changing the string
- cmd = "svn info " + path + " | sed -n '5s/^[^:]*:[ \t][ \t]*//p'"
- return subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
+ 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
return version
def fetch_git_revision (path):
- cmd = "LANG= git log --abbrev HEAD^..HEAD " + 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'"
+ 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:
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')
+ print('Writing svn revision info to libs/ardour/svn_revision.cc using ' + rev)
o = open('libs/ardour/svn_revision.cc', 'w')
o.write(text)
o.close()
help='Compile without support for AU Plugins with only CARBON UI (needed for 64bit)')
opt.add_option('--boost-sp-debug', action='store_true', default=False, dest='boost_sp_debug',
help='Compile with Boost shared pointer debugging')
+ opt.add_option('--depstack-root', type='string', default='~', dest='depstack_root',
+ help='Directory/folder where dependency stack trees (gtk, a3) can be found (defaults to ~)')
opt.add_option('--dist-target', type='string', default='auto', dest='dist_target',
help='Specify the target for cross-compiling [auto,none,x86,i386,i686,x86_64,powerpc,tiger,leopard]')
opt.add_option('--fpu-optimization', action='store_true', default=True, dest='fpu_optimization',
print('Please use a different version or re-configure with --debug')
exit (1)
- # libintl may or may not be trivially locatable. On OS X this is always
- # true. On Linux it will depend on whether we're on a normal Linux distro,
- # in which case libintl.h is going to be available in /usr/include and
- # the library itself is part of glibc, or on a bare-bones build system
- # where we need to pick it up from the GTK dependency stack.
+ # systems with glibc have libintl builtin. systems without require explicit
+ # linkage against libintl.
#
- user_gtk_root = os.path.expanduser ('~/gtk/inst')
+
pkg_config_path = os.getenv('PKG_CONFIG_PATH')
- if not os.path.isfile ('/usr/include/libintl.h') or (pkg_config_path is not None and pkg_config_path.find (user_gtk_root) >= 0):
- # XXXX hack hack hack
+ user_gtk_root = os.path.expanduser (Options.options.depstack_root + '/gtk/inst')
+
+ if pkg_config_path is not None and pkg_config_path.find (user_gtk_root) >= 0:
+ # told to search user_gtk_root
prefinclude = ''.join ([ '-I', user_gtk_root + '/include'])
preflib = ''.join ([ '-L', user_gtk_root + '/lib'])
conf.env.append_value('CFLAGS', [ prefinclude ])
conf.env.append_value('CXXFLAGS', [prefinclude ])
conf.env.append_value('LINKFLAGS', [ preflib ])
+ autowaf.display_msg(conf, 'Will build against private GTK dependency stack in ' + user_gtk_root, 'yes')
+ else:
+ autowaf.display_msg(conf, 'Will build against private GTK dependency stack', 'no')
+
+ if sys.platform == 'darwin':
conf.define ('NEED_INTL', 1)
autowaf.display_msg(conf, 'Will use explicit linkage against libintl in ' + user_gtk_root, 'yes')
else:
- autowaf.display_msg(conf, 'Will use explicit linkage against libintl in ', 'no')
-
- user_ardour_root = os.path.expanduser ('~/a3/inst')
- if pkg_config_path is not None and os.getenv('PKG_CONFIG_PATH').find (user_ardour_root) >= 0:
- # XXXX hack hack hack
+ # libintl is part of the system, so use it
+ autowaf.display_msg(conf, 'Will rely on libintl built into libc', 'yes')
+
+ user_ardour_root = os.path.expanduser (Options.options.depstack_root + '/a3/inst')
+ if pkg_config_path is not None and pkg_config_path.find (user_ardour_root) >= 0:
+ # told to search user_ardour_root
prefinclude = ''.join ([ '-I', user_ardour_root + '/include'])
preflib = ''.join ([ '-L', user_ardour_root + '/lib'])
conf.env.append_value('CFLAGS', [ prefinclude ])
autowaf.display_msg(conf, 'Will build against private Ardour dependency stack in ' + user_ardour_root, 'yes')
else:
autowaf.display_msg(conf, 'Will build against private Ardour dependency stack', 'no')
-
+
if sys.platform == 'darwin':
# this is required, potentially, for anything we link and then relocate into a bundle
projects / ardour.git / blobdiff