Revert "Attempt to fix wscript for waf-2.0.20"
This reverts commit 55ed1b5e6f
.
ladish-python3.patch from openSUSE is to be applied
This commit is contained in:
parent
e715e1449a
commit
297d1df722
20
wscript
20
wscript
|
@ -2,8 +2,8 @@
|
||||||
# encoding: utf-8
|
# encoding: utf-8
|
||||||
|
|
||||||
import os
|
import os
|
||||||
from waflib import Options
|
import Options
|
||||||
from waflib import Utils
|
import Utils
|
||||||
import shutil
|
import shutil
|
||||||
import re
|
import re
|
||||||
import waflib
|
import waflib
|
||||||
|
@ -20,7 +20,7 @@ RELEASE = False
|
||||||
top = '.'
|
top = '.'
|
||||||
out = 'build'
|
out = 'build'
|
||||||
|
|
||||||
from waflib.Logs import pprint
|
from Logs import pprint
|
||||||
|
|
||||||
def display_msg(conf, msg="", status = None, color = None):
|
def display_msg(conf, msg="", status = None, color = None):
|
||||||
if status:
|
if status:
|
||||||
|
@ -43,7 +43,7 @@ def yesno(bool):
|
||||||
def options(opt):
|
def options(opt):
|
||||||
opt.load('compiler_c')
|
opt.load('compiler_c')
|
||||||
opt.load('compiler_cxx')
|
opt.load('compiler_cxx')
|
||||||
#opt.load('boost')
|
opt.load('boost')
|
||||||
opt.load('python')
|
opt.load('python')
|
||||||
opt.add_option('--enable-pkg-config-dbus-service-dir', action='store_true', default=False, help='force D-Bus service install dir to be one returned by pkg-config')
|
opt.add_option('--enable-pkg-config-dbus-service-dir', action='store_true', default=False, help='force D-Bus service install dir to be one returned by pkg-config')
|
||||||
opt.add_option('--enable-liblash', action='store_true', default=False, help='Build LASH compatibility library')
|
opt.add_option('--enable-liblash', action='store_true', default=False, help='Build LASH compatibility library')
|
||||||
|
@ -89,7 +89,7 @@ def create_service_taskgen(bld, target, opath, binary):
|
||||||
def configure(conf):
|
def configure(conf):
|
||||||
conf.load('compiler_c')
|
conf.load('compiler_c')
|
||||||
conf.load('compiler_cxx')
|
conf.load('compiler_cxx')
|
||||||
#conf.load('boost')
|
conf.load('boost')
|
||||||
conf.load('python')
|
conf.load('python')
|
||||||
conf.load('intltool')
|
conf.load('intltool')
|
||||||
if parallel_debug:
|
if parallel_debug:
|
||||||
|
@ -240,10 +240,10 @@ def configure(conf):
|
||||||
#print "optimize force enable is required"
|
#print "optimize force enable is required"
|
||||||
if not check_gcc_optimizations_enabled(conf.env['CFLAGS']):
|
if not check_gcc_optimizations_enabled(conf.env['CFLAGS']):
|
||||||
if Options.options.debug:
|
if Options.options.debug:
|
||||||
print("C optimization must be forced in order to enable -Wuninitialized")
|
print "C optimization must be forced in order to enable -Wuninitialized"
|
||||||
print("However this will not be made because debug compilation is enabled")
|
print "However this will not be made because debug compilation is enabled"
|
||||||
else:
|
else:
|
||||||
print("C optimization forced in order to enable -Wuninitialized")
|
print "C optimization forced in order to enable -Wuninitialized"
|
||||||
conf.env.append_unique('CFLAGS', "-O")
|
conf.env.append_unique('CFLAGS', "-O")
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
@ -637,10 +637,10 @@ def build(bld):
|
||||||
# GtkBuilder UI definitions (XML)
|
# GtkBuilder UI definitions (XML)
|
||||||
bld.install_files('${DATA_DIR}', 'gui/gladish.ui')
|
bld.install_files('${DATA_DIR}', 'gui/gladish.ui')
|
||||||
|
|
||||||
bld.install_files('${PREFIX}/bin', 'ladish_control', chmod=0o755)
|
bld.install_files('${PREFIX}/bin', 'ladish_control', chmod=0755)
|
||||||
|
|
||||||
# 'Desktop' file (menu entry, icon, etc)
|
# 'Desktop' file (menu entry, icon, etc)
|
||||||
bld.install_files('${PREFIX}/share/applications/', 'gui/gladish.desktop', chmod=0o644)
|
bld.install_files('${PREFIX}/share/applications/', 'gui/gladish.desktop', chmod=0644)
|
||||||
|
|
||||||
# Icons
|
# Icons
|
||||||
icon_sizes = ['16x16', '22x22', '24x24', '32x32', '48x48', '256x256']
|
icon_sizes = ['16x16', '22x22', '24x24', '32x32', '48x48', '256x256']
|
||||||
|
|
Loading…
Reference in New Issue