Move -Wl flags to linker flags

[platform/upstream/iotivity.git] / extlibs / hippomocks.scons

diff --git a/extlibs/hippomocks.scons b/extlibs/hippomocks.scons
index 361225d..5832177 100644 (file)
--- a/extlibs/hippomocks.scons
+++ b/extlibs/hippomocks.scons
@@ -1,3 +1,23 @@
+#******************************************************************
+#
+# Copyright 2014 Intel Mobile Communications GmbH All Rights Reserved.
+#
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
 ##
 # 'hippomocks' script to check if Hippo Mocks Unit Test library is installed.
 # If not, get it and install it
@@ -12,14 +32,16 @@ target_os = env.get('TARGET_OS')
 src_dir = env.get('SRC_DIR')
 
 # Only verify/install on linux
-if target_os == 'linux':
+if target_os in ['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      = '8e210c5808d490b26fff69151c801fa28d291fcb'
+       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)
@@ -28,6 +50,9 @@ if target_os == 'linux':
 
                # 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)
+