Attachment #348028 for bug #469506

Lines 12-19 Link Here

(-)mixxx/src/SConscript (-2 / +2 lines)
12	from build import util, depends	12	from build import util, depends
13		13
14	mixxx_version = util.get_mixxx_version()	14	mixxx_version = util.get_mixxx_version()
15	branch_name = util.get_bzr_branch_name()	15	#branch_name = util.get_bzr_branch_name()
16	bazaar_revision = util.get_bzr_revision()	16	#bazaar_revision = util.get_bzr_revision()
17	print "WE ARE IN:", os.getcwd()	17	print "WE ARE IN:", os.getcwd()
18		18
19	plugins = []	19	plugins = []




    print "Deleting deprecated build file: %s" % defs
    os.remove(defs)

#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun
## instead, embed BZR version into build
## Put version info into a file, so it doesn't force a rebuild of everything :)

if os.path.exists(os.path.join('..', 'build.h')):
    # If a build.h exists in the project root mixxx/ directory then use that
    # instead of writing our own. This is mostly since when we build Debian
    # packages we don't have any of the Bazaar metadata so we can't write one
    # ourselves.
    shutil.copy(os.path.join('..', 'build.h'), 'build.h')
else:
    util.write_build_header('build.h')


#Check for dependencies if we're not doing a clean...
#if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']):

Return to bug 469506

Lines 20-38 Link Here

(-)mixxx/src/SConscript.env (-13 lines)
20	print "Deleting deprecated build file: %s" % defs	20	print "Deleting deprecated build file: %s" % defs
21	os.remove(defs)	21	os.remove(defs)
22		22
23	#env.Append(CPPDEFINES=[('BUILD_REV', '"%s"' % getBZRRevision())]) #doing this forces a rebuild of everything whenever a commit happens -- not much fun
24	## instead, embed BZR version into build
25	## Put version info into a file, so it doesn't force a rebuild of everything :)
26
27	if os.path.exists(os.path.join('..', 'build.h')):
28	# If a build.h exists in the project root mixxx/ directory then use that
29	# instead of writing our own. This is mostly since when we build Debian
30	# packages we don't have any of the Bazaar metadata so we can't write one
31	# ourselves.
32	shutil.copy(os.path.join('..', 'build.h'), 'build.h')
33	else:
34	util.write_build_header('build.h')
35
36		23
37	#Check for dependencies if we're not doing a clean...	24	#Check for dependencies if we're not doing a clean...
38	#if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']):	25	#if not env.GetOption('clean') and not SCons.Util.containsAny(os.sys.argv, ['-h', '--help']):