X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=extlibs%2Fboost%2FSConscript;h=cae1be1a0f549c68b4ee5eb089ba3535d54ad31a;hb=refs%2Ftags%2Ftizen_4.0.m2_release;hp=c9fa5cf301e3784eef415881766f5a76db7e3813;hpb=7033427e9b2787649d5b3a7769a32520e19b47d2;p=platform%2Fupstream%2Fiotivity.git

diff --git a/extlibs/boost/SConscript b/extlibs/boost/SConscript
index c9fa5cf..cae1be1 100644
--- a/extlibs/boost/SConscript
+++ b/extlibs/boost/SConscript
@@ -8,24 +8,72 @@ modules = ['thread','program_options', 'system', 'date_time']
 
 target_os = env.get('TARGET_OS')
 target_arch = env.get('TARGET_ARCH')
+src_dir = env.get('SRC_DIR')
+
+boost_version   = '1.60.0'
+
+# TODO: Remove coupling between build scripts and 1_58_0 version for Android
+if target_os in ['android']:
+    boost_version   = '1.58.0'
+
+boost_base_name  = 'boost_'+string.replace(boost_version,'.','_')
+boost_arch_name  = boost_base_name+'.tar.bz2'
+boost_b2_name    = boost_base_name+os.sep+'b2'
+boost_url       = 'http://downloads.sourceforge.net/project/boost/boost/'+boost_version+'/'+boost_arch_name+'?r=&ts=1421801329&use_mirror=iweb'
+
+boost_dir = os.path.join(src_dir,'extlibs','boost','boost')
+boost_bootstrap = os.path.join(boost_dir,'bootstrap.bat')
 
 if 'linux' == target_os :
     # Check for Boost libraries in /usr/boost
     print 'TODO: Perform platform check for linux'
     raise SCons.Errors.EnvironmentError('Unsupported platform')
 
-if 'android' == target_os :
+elif target_os in ['windows']:
+    boost_zip_file   = os.path.join(src_dir,'extlibs','boost',boost_arch_name)
+
+    if not os.path.exists(boost_bootstrap):
+
+        # Download if necessary
+        if os.path.exists(boost_zip_file):
+            boost_zip = boost_zip_file
+        else:
+            print '*** Downloading Boost zip file (> 100MB). Please wait... ***'
+            boost_zip = env.Download(boost_zip_file, boost_url)
+
+        # Unzip boost
+        print '*** Unpacking boost %s zip file ... ***' % boost_version
+        env.UnpackAll(boost_dir, boost_zip)
+
+        # Rename from boost_1_60_0 -> boost
+        os.rename(boost_base_name, 'boost')
+
+    # Sanity check, in case the above method didn't work
+    if not os.path.exists(boost_bootstrap):
+        print '''
+*********************************** Error: ****************************************
+* Please download boost from the following website:
+*
+*   ''' + boost_url + '''
+*
+* and extract the contents directly into
+*
+*    ''' + boost_dir + '''
+*
+* such that this build system can find:
+*
+* ''' + boost_bootstrap + '''
+*
+***********************************************************************************
+'''
+        Exit(1)
+
+elif target_os in ['android']:
     env.Tool('URLDownload',    toolpath=['../../tools/scons'])
     env.Tool('UnpackAll',      toolpath=['../../tools/scons'])
     env.Tool('BoostBootstrap', toolpath=['../../tools/scons'])
     env.Tool('BoostBuild',     toolpath=['../../tools/scons'])
 
-    boost_version   = '1.58.0'
-    boost_base_name  = 'boost_'+string.replace(boost_version,'.','_')
-    boost_arch_name  = boost_base_name+'.zip'
-    boost_b2_name    = boost_base_name+os.sep+'b2'
-    boost_url       = 'http://downloads.sourceforge.net/project/boost/boost/'+boost_version+'/'+boost_arch_name+'?r=&ts=1421801329&use_mirror=iweb'
-
     host_os = sys.platform
 
     if host_os == 'linux2' :