Remove Apply button from Audio Setup dialog now that there is a start/stop button

[ardour.git] / wscript

diff --git a/wscript b/wscript
index 25d4ebe00eb995851fea0aaaf2410d0e2e0a7322..3e39d76b3c4eef2c48ba18d982fbad779d2d2eea 100644 (file)
--- a/wscript
+++ b/wscript
@@ -183,17 +183,12 @@ V = MAJOR + '.' + MINOR + '.' + MICRO
 # can cause odd problems elsewhere. Note that
 # in python3, encode and decode do not return
 # strings, so we have to force the type.
-VERSION = str (V.encode ('ascii', 'ignore'))
-PROGRAM_VERSION = str (MAJOR.encode ('ascii', 'ignore'))
-
-# 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('\'', '')
+VERSION = V.encode ('ascii', 'ignore').decode ("utf-8")
+PROGRAM_VERSION = MAJOR.encode ('ascii', 'ignore').decode ("utf-8")
 
 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"
+                print ("You must define APPNAME in the environment when running ./waf dist")
                 sys.exit (1)
         APPNAME = os.environ['APPNAME'];