X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=extlibs%2Fsqlite3%2FSConscript;h=e718fa58c8827642bf1b1a1765210e999c4e50c2;hb=7f00f942c39b7bc27c7eeecf213a239c3fe4173c;hp=348ede32edcae921b774d35f3dfa4e2668c8b7d9;hpb=651887dd94864cf0f8eda52f5a8d7ec93dc27d0e;p=platform%2Fupstream%2Fiotivity.git

diff --git a/extlibs/sqlite3/SConscript b/extlibs/sqlite3/SConscript
index 348ede3..e718fa5 100755
--- a/extlibs/sqlite3/SConscript
+++ b/extlibs/sqlite3/SConscript
@@ -1,5 +1,5 @@
 ##
-# Script to install (if they do not exist) the SQLite library
+# Scons script to install SQLite sources if not present
 ##
 
 import os
@@ -11,33 +11,30 @@ sqlite_env = env.Clone()
 target_os = sqlite_env.get('TARGET_OS')
 src_dir = sqlite_env.get('SRC_DIR')
 
-targets_need_sqlite = ['linux', 'android', 'tizen', 'msys_nt', 'windows']
+targets_need_sqlite = ['linux', 'android', 'msys_nt', 'windows', 'ios']
 sqlite_dir      = src_dir + '/extlibs/sqlite3/'
 sqlite_build_dir      = src_dir + '/extlibs/sqlite3/sqlite-amalgamation-3081101/'
 sqlite_zip_file = src_dir + '/extlibs/sqlite3/sqlite-amalgamation-3081101.zip'
-sqlite_url      = 'https://www.sqlite.org/2015/sqlite-amalgamation-3081101.zip'
+sqlite_url = 'https://www.sqlite.org/2015/sqlite-amalgamation-3081101.zip'
+sqlite_package= 'sqlite-amalgamation-3081101'
+sqlite_url = 'https://www.sqlite.org/2015/' + sqlite_package + '.zip'
+
+sqlite_dir = os.path.join(src_dir, 'extlibs', 'sqlite3')
+sqlite_c = os.path.join(sqlite_dir, 'sqlite3.c')
+sqlite_h = os.path.join(sqlite_dir, 'sqlite3.h')
+sqlite_tmp_dir = os.path.join(sqlite_dir, sqlite_package)
+sqlite_zip_file = sqlite_tmp_dir + '.zip'
+sqlite_c_tmp = os.path.join(sqlite_tmp_dir, 'sqlite3.c')
+sqlite_h_tmp = os.path.join(sqlite_tmp_dir, 'sqlite3.h')
 
-# Download
 if target_os in targets_need_sqlite:
-	if sqlite_env.get('SECURED') == '1':
-		print '*** Checking for installation of SQLite 3.8.11.1 (extlib/sqlite3) ***'
-		if not os.path.exists(sqlite_dir + 'sqlite3.c') or not os.path.exists(sqlite_dir + 'sqlite3.h'):
-
-		    # If the zip file is not already present, download it
-			if not os.path.exists(sqlite_zip_file):
-				sqlite_zip = sqlite_env.Download(sqlite_zip_file, sqlite_url)
-			else:
-				sqlite_zip = sqlite_zip_file
-
-			# Unzip the lib
-			print 'Unzipping SQLite amalgamation src...'
-			sqlite_env.UnpackAll(sqlite_build_dir, sqlite_zip)
-			print 'Unzipping SQLite amalgamation src complete'
-
-			# Move requried src and header
-			os.rename(sqlite_build_dir + 'sqlite3.c', sqlite_dir + 'sqlite3.c')
-			os.rename(sqlite_build_dir + 'sqlite3.h', sqlite_dir + 'sqlite3.h')
-			os.remove(sqlite_zip_file)
-			shutil.rmtree(sqlite_build_dir)
-
-# Build will be done with provisioning manager module.
+    print '*** Checking for presence of %s ***' % sqlite_package
+    os.listdir(sqlite_dir)
+    if not os.path.exists(sqlite_c) or not os.path.exists(sqlite_h):
+        if not os.path.exists(sqlite_zip_file):
+            sqlite_zip_file = sqlite_env.Download(sqlite_zip_file, sqlite_url)
+        sqlite_env.UnpackAll(sqlite_tmp_dir, sqlite_zip_file)
+        os.rename(sqlite_c_tmp, sqlite_c)
+        os.rename(sqlite_h_tmp, sqlite_h)
+#        os.remove(sqlite_zip_file)
+        shutil.rmtree(sqlite_tmp_dir)