build: let UnpackAll.py find 7z.exe on Windows
authorDan Mihai <Daniel.Mihai@microsoft.com>
Tue, 27 Jun 2017 22:33:54 +0000 (15:33 -0700)
committerDan Mihai <Daniel.Mihai@microsoft.com>
Wed, 12 Jul 2017 16:51:27 +0000 (16:51 +0000)
commita1ef38c359b9be63b2912e69c4d490aa8dc8d7da
treea9f186d465ced2e0680df359604ad744a9d744d9
parent67c362ec4ecb1ac7559afa901e2b66fdf87ebde6
build: let UnpackAll.py find 7z.exe on Windows

Remove incomplete workaround - executing external_builders.scons
twice instead of just one time, from build_common\SConscript.
UnpackAll.py was not able to find the path to 7z.exe when using that
workaround, and SCons was not able to unpack Gradle.

Replace that workaround by fixing SCons's PATH earlier, before
UnpackAll.py starts - similarly to the way build_common\SConscript
handles the PATH on non-Windows platforms.

[Philippe Coval]

Conflicts:
build_common/SConscript

Bug: https://jira.iotivity.org/browse/IOT-1745
Change-Id: Ic90337c6c34556043017f2c55afbc1edcac402ef
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21063
Tested-by: jenkins-iotivity <jenkins@iotivity.org>
Reviewed-by: Mats Wichmann <mats@linux.com>
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Signed-off-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/21343
build_common/SConscript
build_common/windows/SConscript