Disabled boost download when boost is already downloaded.

This effectively disables the build server from downloading boost
when it already has it. (Before it was making its decision on
whether or not to download it based solely on whether or not the
*.zip file already existed.)

Change-Id: I155fec0428b7caa0b517bbbe6458ee85e692ec8b
Signed-off-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1768
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>

diff --git a/extlibs/boost/SConscript b/extlibs/boost/SConscript
index 734721f..26f0c1e 100644 (file)
--- a/extlibs/boost/SConscript
+++ b/extlibs/boost/SConscript
@@ -23,18 +23,18 @@ if 'android' == target_os :
     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' :
         boost_bootstrap = boost_base_name+os.sep+'bootstrap.sh'
-        boost_b2_name    = boost_base_name+os.sep+'b2'
     else :
         msg="Host platform (%s) is currently not supported for boost builds" % host_os
         raise SCons.Errors.EnvironmentError(msg)
 
-    if not os.path.exists(boost_arch_name):
+    if not os.path.exists(boost_arch_name) and not os.path.exists(boost_base_name):
         boost_arch_name = env.URLDownload(boost_arch_name, boost_url)
 
     if not os.path.exists(boost_base_name):