Apparently, the filename of the hippomocks library zip file that is
downloaded from the github changed from 'master.zip'
to 'hippomocks-master.zip' since the hippomocks.scons script was created.
This modification uses a SHA hash to download a specific version of
the hippomocks library.
Change-Id: Iaa3b523b11c35a918a0a3de22876f2d62f339372
Signed-off-by: Doug Hudson <douglas.hudson@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/454
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Joseph Morrow <joseph.l.morrow@intel.com>
Reviewed-by: Sachin Agrawal <sachin.agrawal@intel.com>
Reviewed-by: Sudarshan Prasad <sudarshan.prasad@intel.com>
if target_os == 'linux':
print '*** Checking for installation of hippomocks ***'
if target_os == 'linux':
print '*** Checking for installation of hippomocks ***'
- hippomocks_dir = src_dir + '/extlibs/hippomocks-master'
- hippomocks_zip_file = src_dir + '/extlibs/master.zip'
- hippomocks_url = 'https://github.com/dascandy/hippomocks/archive/master.zip'
+ hippomocks_sha = '2f40aa11e31499432283b67f9d3449a3cd7b9c4d'
+ hippomocks_dir_src = src_dir + '/extlibs/hippomocks-' + hippomocks_sha
+ hippomocks_dir_dest = src_dir + '/extlibs/hippomocks-master'
+ hippomocks_zip_file = src_dir + '/extlibs/hippomocks-' + hippomocks_sha + '.zip'
+ hippomocks_url = 'https://github.com/dascandy/hippomocks/archive/' + hippomocks_sha + '.zip'
- if not os.path.exists(hippomocks_dir):
+ if not os.path.exists(hippomocks_dir_dest):
# If the hippomocks zip file is not already present, download it
if not os.path.exists(hippomocks_zip_file):
hippomocks_zip = env.Download(hippomocks_zip_file, hippomocks_url)
# If the hippomocks zip file is not already present, download it
if not os.path.exists(hippomocks_zip_file):
hippomocks_zip = env.Download(hippomocks_zip_file, hippomocks_url)
# Unzip hippomocks
print 'Unzipping hippomocks'
# Unzip hippomocks
print 'Unzipping hippomocks'
- env.UnpackAll(hippomocks_dir, hippomocks_zip)
+ env.UnpackAll(hippomocks_dir_src, hippomocks_zip)
+ print 'Renaming hippomocks directory'
+ os.rename(hippomocks_dir_src, hippomocks_dir_dest)