Remove use of svnversion_regenerate.sh
dbus/jackdbus.c: Rely on the `JACK_VERSION` define instead of `SVN_VERSION` (included from svnversion.h). dbus/wscript: Add the `JACK_VERSION` define based on `JACK_VERSION` configuration. wscript: Remove all code related to the use of `svnversion.h` and `svnversion_regenerate.sh`.
This commit is contained in:
parent
8566d4a630
commit
3d6fd78701
|
@ -42,7 +42,6 @@
|
|||
#include "jack/jslist.h"
|
||||
#include "jack/control.h"
|
||||
#include "sigsegv.h"
|
||||
#include "svnversion.h"
|
||||
|
||||
static char * g_log_filename;
|
||||
static ino_t g_log_file_ino;
|
||||
|
@ -900,7 +899,7 @@ main (int argc, char **argv)
|
|||
setup_sigsegv();
|
||||
|
||||
jack_info("------------------");
|
||||
jack_info("Controller activated. Version %s (%s) built on %s", jack_get_version_string(), SVN_VERSION, timestamp_str);
|
||||
jack_info("Controller activated. Version %s (%s) built on %s", jack_get_version_string(), JACK_VERSION, timestamp_str);
|
||||
|
||||
if (!dbus_threads_init_default())
|
||||
{
|
||||
|
|
|
@ -11,6 +11,7 @@ def options(opt):
|
|||
|
||||
def configure(conf):
|
||||
conf.env['BUILD_JACKDBUS'] = False
|
||||
conf.define('JACK_VERSION', conf.env['JACK_VERSION'])
|
||||
|
||||
if not conf.check_cfg(package='dbus-1 >= 1.0.0', args='--cflags --libs', mandatory=False):
|
||||
print(Logs.colors.RED + 'ERROR !! jackdbus will not be built because libdbus-dev is missing' + Logs.colors.NORMAL)
|
||||
|
|
45
wscript
45
wscript
|
@ -3,9 +3,7 @@
|
|||
from __future__ import print_function
|
||||
|
||||
import os
|
||||
import subprocess
|
||||
import shutil
|
||||
import re
|
||||
import sys
|
||||
|
||||
from waflib import Logs, Options, Task, Utils
|
||||
|
@ -419,17 +417,6 @@ def configure(conf):
|
|||
conf.define('JACK_MONITOR', 1)
|
||||
conf.write_config_header('config.h', remove=False)
|
||||
|
||||
svnrev = None
|
||||
try:
|
||||
f = open('svnversion.h')
|
||||
data = f.read()
|
||||
m = re.match(r'^#define SVN_VERSION "([^"]*)"$', data)
|
||||
if m != None:
|
||||
svnrev = m.group(1)
|
||||
f.close()
|
||||
except IOError:
|
||||
pass
|
||||
|
||||
if Options.options.mixed:
|
||||
conf.setenv(lib32, env=conf.env.derive())
|
||||
conf.env.append_unique('CFLAGS', '-m32')
|
||||
|
@ -458,13 +445,7 @@ def configure(conf):
|
|||
conf.write_config_header('config.h')
|
||||
|
||||
print()
|
||||
print('==================')
|
||||
version_msg = 'JACK ' + VERSION
|
||||
if svnrev:
|
||||
version_msg += ' exported from r' + svnrev
|
||||
else:
|
||||
version_msg += ' svn revision will checked and eventually updated during build'
|
||||
print(version_msg)
|
||||
print('JACK ' + VERSION)
|
||||
|
||||
conf.msg('Maximum JACK clients', Options.options.clients, color='NORMAL')
|
||||
conf.msg('Maximum ports per application', Options.options.application_ports, color='NORMAL')
|
||||
|
@ -820,26 +801,6 @@ def build(bld):
|
|||
|
||||
bld.recurse('compat')
|
||||
|
||||
if not os.access('svnversion.h', os.R_OK):
|
||||
def post_run(self):
|
||||
sg = Utils.h_file(self.outputs[0].abspath(self.env))
|
||||
#print sg.encode('hex')
|
||||
Build.bld.node_sigs[self.env.variant()][self.outputs[0].id] = sg
|
||||
|
||||
script = bld.path.find_resource('svnversion_regenerate.sh')
|
||||
script = script.abspath()
|
||||
|
||||
bld(
|
||||
rule = '%s ${TGT}' % script,
|
||||
name = 'svnversion',
|
||||
runnable_status = Task.RUN_ME,
|
||||
before = 'c cxx',
|
||||
color = 'BLUE',
|
||||
post_run = post_run,
|
||||
source = ['svnversion_regenerate.sh'],
|
||||
target = [bld.path.find_or_declare('svnversion.h')]
|
||||
)
|
||||
|
||||
if bld.env['BUILD_JACKD']:
|
||||
build_jackd(bld)
|
||||
|
||||
|
@ -917,10 +878,6 @@ def build(bld):
|
|||
shutil.rmtree(html_build_dir)
|
||||
Logs.pprint('CYAN', 'Removing doxygen generated documentation done.')
|
||||
|
||||
def dist(ctx):
|
||||
# This code blindly assumes it is working in the toplevel source directory.
|
||||
if not os.path.exists('svnversion.h'):
|
||||
os.system('./svnversion_regenerate.sh svnversion.h')
|
||||
|
||||
from waflib import TaskGen
|
||||
@TaskGen.extension('.mm')
|
||||
|
|
Loading…
Reference in New Issue