projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a26e27d
)
Remove duplicate code in wscript after merge
author
Tim Mayberry
<mojofunk@gmail.com>
Mon, 17 Aug 2015 12:01:20 +0000
(22:01 +1000)
committer
Tim Mayberry
<mojofunk@gmail.com>
Mon, 17 Aug 2015 12:01:20 +0000
(22:01 +1000)
wscript
patch
|
blob
|
history
diff --git
a/wscript
b/wscript
index 7fb80461e98a8896802e77d6d0a338db37bc2628..25d4ebe00eb995851fea0aaaf2410d0e2e0a7322 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-191,18
+191,12
@@
PROGRAM_VERSION = str (MAJOR.encode ('ascii', 'ignore'))
VERSION = VERSION.replace('\'', '')
PROGRAM_VERSION = PROGRAM_VERSION.replace('\'', '')
VERSION = VERSION.replace('\'', '')
PROGRAM_VERSION = PROGRAM_VERSION.replace('\'', '')
-
if len (sys.argv) > 1 and sys.argv[1] == 'dist':
if not 'APPNAME' in os.environ:
print "You must define APPNAME in the environment when running ./waf dist"
sys.exit (1)
APPNAME = os.environ['APPNAME'];
if len (sys.argv) > 1 and sys.argv[1] == 'dist':
if not 'APPNAME' in os.environ:
print "You must define APPNAME in the environment when running ./waf dist"
sys.exit (1)
APPNAME = os.environ['APPNAME'];
-# It seems, that on msys2, with python3, it puts quotes around
-# the version number, which breaks the build.
-VERSION = VERSION.replace('\'', '')
-PROGRAM_VERSION = PROGRAM_VERSION.replace('\'', '')
-
# Mandatory variables
top = '.'
out = 'build'
# Mandatory variables
top = '.'
out = 'build'