From 7a6a1a6c218a633d4e3934f1ac89db593ffd5838 Mon Sep 17 00:00:00 2001
From: an7s <an7s@git.zephyr-software.com>
Date: Fri, 3 Jul 2015 17:44:25 +0000
Subject: [PATCH] Cleaner build_appfw option
Former-commit-id: 39eb18e260104436d2f9a5b09ae3f02e0daad410
---
SConscript | 5 ++++-
SConstruct | 6 +++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/SConscript b/SConscript
index 8513e235a..923f14cec 100644
--- a/SConscript
+++ b/SConscript
@@ -33,5 +33,8 @@ libxform=SConscript("xform/SConscript", variant_dir='scons_build/libxform')
libtransform=SConscript("libtransform/SConscript", variant_dir='scons_build/libtransform')
libIRDB=SConscript("libIRDB/SConscript", variant_dir='scons_build/libIRDB')
SConscript("tools/SConscript", variant_dir='scons_build/tools')
-if int(env['build_appfw'])==1:
+
+build_appfw=ARGUMENTS.get("build_appfw", None)
+if build_appfw is None or int(build_appfw)==1:
SConscript("appfw/SConscript", variant_dir='scons_build/appfw')
+#if ARGUMENTS.get("build_appfw", None) is None or int(env['build_appfw'])==1:
diff --git a/SConstruct b/SConstruct
index 0b223f575..80bdf75fb 100644
--- a/SConstruct
+++ b/SConstruct
@@ -13,11 +13,11 @@ env.Replace(LINKFLAGS="-fPIC -w ")
env.Replace(SECURITY_TRANSFORMS_HOME=os.environ['SECURITY_TRANSFORMS_HOME'])
env.Replace(do_64bit_build=ARGUMENTS.get("do_64bit_build",None))
env.Replace(debug=ARGUMENTS.get("debug",0))
-env.Replace(build_appfw=ARGUMENTS.get("build_appfw", None))
+#env.Replace(build_appfw=ARGUMENTS.get("build_appfw", None))
# by default, turn on build of appfw
-if env['build_appfw'] is None:
- env['build_appfw'] = 1
+#if env['build_appfw'] is None:
+# env['build_appfw'] = 1
if int(env['debug']) == 1:
print "Setting debug mode"
--
GitLab