1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
--- mixxx-1.11.0/src/SConscript
+++ mixxx-1.11.0/src/SConscript
@@ -12,8 +12,8 @@
from build import util, depends
mixxx_version = util.get_mixxx_version()
-branch_name = util.get_bzr_branch_name()
-bazaar_revision = util.get_bzr_revision()
+#branch_name = util.get_bzr_branch_name()
+#bazaar_revision = util.get_bzr_revision()
print "WE ARE IN:", os.getcwd()
plugins = []
--- mixxx-1.11.0/src/SConscript.env
+++ mixxx-1.11.0/src/SConscript.env
@@ -20,19 +20,6 @@
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']):
|
GitWeb
