projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
27e2b09
)
fix up versioning stuff for libardour, which should track regular ardour release...
author
Paul Davis
<paul@linuxaudiosystems.com>
Thu, 13 Jun 2013 14:53:36 +0000
(10:53 -0400)
committer
Paul Davis
<paul@linuxaudiosystems.com>
Thu, 13 Jun 2013 14:53:36 +0000
(10:53 -0400)
libs/ardour/wscript
patch
|
blob
|
history
diff --git
a/libs/ardour/wscript
b/libs/ardour/wscript
index 782cb7be1c90905371d792cbdbbeb9c921c946df..9fe47de5ee58d17b463c38a8a229a34bd002b345 100644
(file)
--- a/
libs/ardour/wscript
+++ b/
libs/ardour/wscript
@@
-5,24
+5,11
@@
import os
import re
import subprocess
import re
import subprocess
-# Version of this package (even if built as a child)
-MAJOR = '3'
-MINOR = '0'
-MICRO = '0'
-LIBARDOUR_VERSION = "%s.%s.%s" % (MAJOR, MINOR, MICRO)
-
-# Library version (UNIX style major, minor, micro)
-# major increment <=> incompatible changes
-# minor increment <=> compatible changes (additions)
-# micro increment <=> no interface changes
-LIBARDOUR_LIB_VERSION = '3.0.0'
-
# default state file version for this build
CURRENT_SESSION_FILE_VERSION = 3001
# Variables for 'waf dist'
APPNAME = 'libardour3'
# default state file version for this build
CURRENT_SESSION_FILE_VERSION = 3001
# Variables for 'waf dist'
APPNAME = 'libardour3'
-VERSION = LIBARDOUR_VERSION
I18N_PACKAGE = 'ardour3'
# Mandatory variables
I18N_PACKAGE = 'ardour3'
# Mandatory variables
@@
-240,10
+227,11
@@
def options(opt):
def configure(conf):
conf.load('compiler_cxx')
conf.load('gas')
def configure(conf):
conf.load('compiler_cxx')
conf.load('gas')
+ # we don't use hard-coded micro versions with ardour, so hard code it to zero
autowaf.build_version_files(
path_prefix + 'ardour/version.h',
path_prefix + 'version.cc',
autowaf.build_version_files(
path_prefix + 'ardour/version.h',
path_prefix + 'version.cc',
- 'libardour3',
MAJOR, MINOR, MICRO
)
+ 'libardour3',
conf.env['MAJOR'], conf.env['MINOR'], 0
)
autowaf.configure(conf)
autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO',
atleast_version='0.3.2')
autowaf.configure(conf)
autowaf.check_pkg(conf, 'aubio', uselib_store='AUBIO',
atleast_version='0.3.2')
@@
-369,6
+357,12
@@
int main(int argc, char** argv) {
def build(bld):
def build(bld):
+ # Library version (UNIX style major, minor, micro)
+ # major increment <=> incompatible changes
+ # minor increment <=> compatible changes (additions)
+ # micro increment <=> no interface changes
+ LIBARDOUR_LIB_VERSION = "3.0.0."
+
# Library
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
obj = bld.shlib(features = 'c cxx cshlib cxxshlib', source=libardour_sources)
# Library
if bld.is_defined ('INTERNAL_SHARED_LIBS'):
obj = bld.shlib(features = 'c cxx cshlib cxxshlib', source=libardour_sources)