Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit e652adc

Browse files
franksinankayafranksinankaya
committed
Correct current script dir detection
1 parent 00fbc8c commit e652adc

File tree

5 files changed

+22
-17
lines changed

5 files changed

+22
-17
lines changed

‎build-test.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,8 @@ build_native_projects()
436436
pushd "$intermediatesForBuild"
437437
# Regenerate the CMake solution
438438
# Force cross dir to point to project root cross dir, in case there is a cross build.
439-
nextCommand="CONFIG_DIR=\"$__ProjectRoot/cross\" \"$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh\" \"$__TestDir\" $__ClangMajorVersion $__ClangMinorVersion $platformArch $__BuildType $__CodeCoverage $generator $extraCmakeArguments $__cmakeargs"
439+
scriptDir="$__ProjectRoot/src/pal/tools"
440+
nextCommand="CONFIG_DIR=\"$__ProjectRoot/cross\" \"$scriptDir/gen-buildsys-clang.sh\" \"$__TestDir\" $__ClangMajorVersion $__ClangMinorVersion $platformArch $scriptDir $__BuildType $__CodeCoverage $generator $extraCmakeArguments $__cmakeargs"
440441
echo "Invoking $nextCommand"
441442
eval $nextCommand
442443
popd

‎build.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,16 +276,17 @@ build_native()
276276
pushd "$intermediatesForBuild"
277277
# Regenerate the CMake solution
278278

279+
scriptDir="$__ProjectRoot/src/pal/tools"
279280
if [[ $__GccBuild == 0 ]]; then
280281
scan_build=
281282
if [[ $__StaticAnalyzer == 1 ]]; then
282283
scan_build=scan-build
283284
fi
284-
echo "Invoking \"$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh\" \"$__ProjectRoot\" $__ClangMajorVersion \"$__ClangMinorVersion\" $platformArch $__BuildType $__CodeCoverage $scan_build $generator $extraCmakeArguments $__cmakeargs"
285-
source "$__ProjectRoot/src/pal/tools/gen-buildsys-clang.sh" "$__ProjectRoot" $__ClangMajorVersion "$__ClangMinorVersion" $platformArch $__BuildType $__CodeCoverage $scan_build $generator "$extraCmakeArguments" "$__cmakeargs"
285+
echo "Invoking \"$scriptDir/gen-buildsys-clang.sh\" \"$__ProjectRoot\" $__ClangMajorVersion \"$__ClangMinorVersion\" $platformArch "$scriptDir" $__BuildType $__CodeCoverage $scan_build $generator $extraCmakeArguments $__cmakeargs"
286+
source "$scriptDir/gen-buildsys-clang.sh" "$__ProjectRoot" $__ClangMajorVersion "$__ClangMinorVersion" $platformArch "$scriptDir" $__BuildType $__CodeCoverage $scan_build $generator "$extraCmakeArguments" "$__cmakeargs"
286287
else
287-
echo "Invoking \"$__ProjectRoot/src/pal/tools/gen-buildsys-gcc.sh\" \"$__ProjectRoot\" $__GccMajorVersion \"$__GccMinorVersion\" $platformArch $__BuildType $__CodeCoverage $generator $extraCmakeArguments $__cmakeargs"
288-
source "$__ProjectRoot/src/pal/tools/gen-buildsys-gcc.sh" "$__ProjectRoot" "$__GccMajorVersion" "$__CGccMinorVersion" $platformArch $__BuildType $__CodeCoverage $generator "$extraCmakeArguments" "$__cmakeargs"
288+
echo "Invoking \"$scriptDir/gen-buildsys-gcc.sh\" \"$__ProjectRoot\" $__GccMajorVersion \"$__GccMinorVersion\" $platformArch "$scriptDir" $__BuildType $__CodeCoverage $generator $extraCmakeArguments $__cmakeargs"
289+
source "$scriptDir/gen-buildsys-gcc.sh" "$__ProjectRoot" "$__GccMajorVersion" "$__CGccMinorVersion" $platformArch "$scriptDir" $__BuildType $__CodeCoverage $generator "$extraCmakeArguments" "$__cmakeargs"
289290
fi
290291
popd
291292
fi

‎src/pal/automation/compile.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ def RunCMake(workspace, target, platform):
1919
print "Running: " + workspace + "/ProjectK/NDP/clr/src/pal/tools/gen-buildsys-clang.sh " + workspace + "/ProjectK/NDP/clr DEBUG"
2020
print "\n==================================================\n"
2121
sys.stdout.flush()
22-
returncode = subprocess.call(workspace + "/ProjectK/NDP/clr/src/pal/tools/gen-buildsys-clang.sh " + workspace + "/ProjectK/NDP/clr " + target, shell=True)
22+
scriptDir = "/ProjectK/NDP/clr/src/pal/tools"
23+
returncode = subprocess.call(workspace + "/ProjectK/NDP/clr/src/pal/tools/gen-buildsys-clang.sh " + workspace + "/ProjectK/NDP/clr " + target + " " + scriptDir, shell=True)
2324

2425
if returncode != 0:
2526
print "ERROR: cmake failed with exit code " + str(returncode)

‎src/pal/tools/gen-buildsys-clang.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
# This file invokes cmake and generates the build system for Clang.
44
#
55

6-
if [ $# -lt 4 ]
6+
if [ $# -lt 5 ]
77
then
88
echo "Usage..."
9-
echo "gen-buildsys-clang.sh <path to top level CMakeLists.txt> <ClangMajorVersion> <ClangMinorVersion> <Architecture> [build flavor] [coverage] [ninja] [scan-build] [cmakeargs]"
9+
echo "gen-buildsys-clang.sh <path to top level CMakeLists.txt> <ClangMajorVersion> <ClangMinorVersion> <Architecture> <ScriptDirectory> [build flavor] [coverage] [ninja] [scan-build] [cmakeargs]"
1010
echo "Specify the path to the top level CMake file - <ProjectK>/src/NDP"
1111
echo "Specify the clang version to use, split into major and minor version"
12-
echo "Specify the target architecture."
12+
echo "Specify the target architecture."
13+
echo "Specify the script directory."
1314
echo "Optionally specify the build configuration (flavor.) Defaults to DEBUG."
1415
echo "Optionally specify 'coverage' to enable code coverage build."
1516
echo "Optionally specify 'scan-build' to enable build with clang static analyzer."
@@ -40,14 +41,15 @@ export CC="$(command -v clang$desired_llvm_version)"
4041
export CXX="$(command -v clang++$desired_llvm_version)"
4142

4243
build_arch="$4"
44+
script_dir="$5"
4345
buildtype=DEBUG
4446
code_coverage=OFF
4547
build_tests=OFF
4648
scan_build=OFF
4749
generator="Unix Makefiles"
4850
__UnprocessedCMakeArgs=""
4951

50-
for i in "${@:5}"; do
52+
for i in "${@:6}"; do
5153
upperI="$(echo $i | awk '{print toupper($0)}')"
5254
case $upperI in
5355
# Possible build types are DEBUG, CHECKED, RELEASE, RELWITHDEBINFO, MINSIZEREL.
@@ -155,8 +157,7 @@ else
155157
overridefile=clang-compiler-override.txt
156158
fi
157159

158-
# Determine the current script directory
159-
__currentScriptDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
160+
__currentScriptDir="$script_dir"
160161

161162
cmake_command=cmake
162163

‎src/pal/tools/gen-buildsys-gcc.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
# This file invokes cmake and generates the build system for Gcc.
44
#
55

6-
if [ $# -lt 4 ]
6+
if [ $# -lt 5 ]
77
then
88
echo "Usage..."
9-
echo "gen-buildsys-gcc.sh <path to top level CMakeLists.txt> <GccMajorVersion> <GccMinorVersion> <Architecture> [build flavor] [coverage] [ninja] [cmakeargs]"
9+
echo "gen-buildsys-gcc.sh <path to top level CMakeLists.txt> <GccMajorVersion> <GccMinorVersion> <Architecture> <ScriptDirectory> [build flavor] [coverage] [ninja] [cmakeargs]"
1010
echo "Specify the path to the top level CMake file - <ProjectK>/src/NDP"
1111
echo "Specify the Gcc version to use, split into major and minor version"
1212
echo "Specify the target architecture."
13+
echo "Specify the script directory."
1314
echo "Optionally specify the build configuration (flavor.) Defaults to DEBUG."
1415
echo "Optionally specify 'coverage' to enable code coverage build."
1516
echo "Target ninja instead of make. ninja must be on the PATH."
@@ -60,6 +61,7 @@ fi
6061
export CC CXX
6162

6263
build_arch="$4"
64+
script_dir="$5"
6365
buildtype=DEBUG
6466
code_coverage=OFF
6567
generator="Unix Makefiles"
@@ -68,7 +70,7 @@ __UnprocessedCMakeArgs=""
6870
ITER=-1
6971
for i in "$@"; do
7072
ITER=$((ITER + 1))
71-
if [ $ITER -lt 5 ]; then continue; fi
73+
if [ $ITER -lt 6 ]; then continue; fi
7274
upperI="$(echo "$i" | awk '{print toupper($0)}')"
7375
case $upperI in
7476
# Possible build types are DEBUG, CHECKED, RELEASE, RELWITHDEBINFO, MINSIZEREL.
@@ -158,8 +160,7 @@ fi
158160

159161
overridefile=gcc-compiler-override.txt
160162

161-
# Determine the current script directory
162-
__currentScriptDir="$(cd -- "$(dirname -- "$0")" && pwd -P)"
163+
__currentScriptDir="$script_dir"
163164

164165
cmake \
165166
-G "$generator" \

0 commit comments

Comments
 (0)