From 9fdf7c4ffb7b313a47d6622e51db75a0599d65e3 Mon Sep 17 00:00:00 2001
From: an7s <an7s@git.zephyr-software.com>
Date: Fri, 3 Jul 2015 19:12:15 +0000
Subject: [PATCH] fixed dependency on sqlite3.h
Former-commit-id: 9ef4d7aa18ec40d4136d56258d26c2db58edfeed
---
appfw/src/SConscript | 33 +++++++++++++++------------------
1 file changed, 15 insertions(+), 18 deletions(-)
diff --git a/appfw/src/SConscript b/appfw/src/SConscript
index 373454bf5..f8d40f699 100644
--- a/appfw/src/SConscript
+++ b/appfw/src/SConscript
@@ -23,6 +23,7 @@ SQLITE3_DIR=os.path.join(os.environ['SECURITY_TRANSFORMS_HOME'], 'third_party/SQ
print 'i am in cwd: ', os.getcwd()
if env.GetOption('clean'):
+ print 'option clean is turned on'
if os.path.exists(SQLITE3_DIR):
shutil.rmtree(SQLITE3_DIR)
if os.path.exists('appfw_sqlite3.c'):
@@ -40,29 +41,25 @@ else:
tgz.extract('sqlite-autoconf-3071300/sqlite3.h', SQLITE3_DIR)
tgz.extract('sqlite-autoconf-3071300/sqlite3.c', SQLITE3_DIR)
- source_dir = os.path.join(SQLITE3_DIR, 'sqlite-autoconf-3071300')
- target_dir = os.getcwd()
- shutil.copy(os.path.join(source_dir, 'sqlite3.c'), os.path.join(target_dir, 'appfw_sqlite3.c'))
- shutil.copy(os.path.join(source_dir, 'sqlite3.h'), os.path.join(target_dir, 'appfw_sqlite3.h'))
- shutil.copy(os.path.join(source_dir, 'sqlite3.h'), os.path.join(target_dir, 'sqlite3.h'))
+ assert os.path.isdir(SQLITE3_DIR)
- # need to do the sed replacement: sqlite3.[ch] --> appfw_sqlite3.[ch]
- substitute_in_file(os.path.join(target_dir,'appfw_sqlite3.c'), 'sqlite3', 'appfw_sqlite3')
- substitute_in_file(os.path.join(target_dir,'appfw_sqlite3.h'), 'sqlite3', 'appfw_sqlite3')
+ source_dir = os.path.join(SQLITE3_DIR, 'sqlite-autoconf-3071300')
+ target_dir = os.getcwd()
+ shutil.copy(os.path.join(source_dir, 'sqlite3.c'), os.path.join(target_dir, 'appfw_sqlite3.c'))
+ shutil.copy(os.path.join(source_dir, 'sqlite3.h'), os.path.join(target_dir, 'appfw_sqlite3.h'))
- sqlfw_c = os.path.join(os.environ['SECURITY_TRANSFORMS_HOME'], 'appfw', 'src', 'sqlfw.c')
- combined_sqlite3_c = os.path.join(os.environ['SECURITY_TRANSFORMS_HOME'], 'appfw', 'src', 'combined_sqlite3.c')
+ shutil.copy(os.path.join(source_dir, 'sqlite3.h'), os.path.join(target_dir, '..', 'sqlite3.h'))
- with open(combined_sqlite3_c, 'w') as fout:
- for line in fileinput.input(files=('appfw_sqlite3.c', sqlfw_c)):
- fout.write(line)
+ # need to do the sed replacement: sqlite3.[ch] --> appfw_sqlite3.[ch]
+ substitute_in_file(os.path.join(target_dir,'appfw_sqlite3.c'), 'sqlite3', 'appfw_sqlite3')
+ substitute_in_file(os.path.join(target_dir,'appfw_sqlite3.h'), 'sqlite3', 'appfw_sqlite3')
- else:
- assert os.path.isdir(SQLITE3_DIR)
+ sqlfw_c = os.path.join(os.environ['SECURITY_TRANSFORMS_HOME'], 'appfw', 'src', 'sqlfw.c')
+ combined_sqlite3_c = os.path.join(os.environ['SECURITY_TRANSFORMS_HOME'], 'appfw', 'src', 'combined_sqlite3.c')
-# sqlite-autoconf-3071300.tar.gz"
-# ${PS_TAR} -zxvf ../../third_party/sqlite-autoconf-3071300.tar.gz --no-anchored --wildcards 'sqlite3.[ch]'
-# cp ./sqlite-autoconf-3071300/sqlite3.h .
+ with open(combined_sqlite3_c, 'w') as fout:
+ for line in fileinput.input(files=('appfw_sqlite3.c', sqlfw_c)):
+ fout.write(line)
libname="appfw"
--
GitLab