Skip to content

Commit a4b51b4

Browse files
committed
[MERGE #2443 @obastemur] xplat: update default output path to 'out/'
Merge pull request #2443 from obastemur:output_path
2 parents da60fb6 + 23b38fa commit a4b51b4

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Build/VCBuild.SWB/
4444
Build/VCBuild/
4545
buildchk.*
4646
buildfre.*
47-
BuildLinux/
47+
out/
4848
_DROP/
4949

5050
# Generated Files

bin/ChakraCore/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ if (NOT STATIC_LIBRARY)
123123

124124
if(NOT CC_XCODE_PROJECT)
125125
# Post build step to copy the built shared library
126-
# to BuildLinux (or whatever the CMakeBuildDir is)
126+
# to out/{BUILD_TYPE}/ (or whatever the CMakeBuildDir is)
127127
add_custom_command(TARGET ChakraCore POST_BUILD
128128
COMMAND ${CMAKE_COMMAND} -E copy_if_different
129129
"${CHAKRACORE_BINARY_DIR}/bin/ChakraCore/libChakraCore.${DYN_LIB_EXT}"

bin/ch/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ target_link_libraries (ch
115115
if(NOT CC_XCODE_PROJECT)
116116
# Add a post build event to the ch target
117117
# which executes a command to copy ch to
118-
# BuildLinux for convenience
118+
# out/{BUILD_TYPE}/ for convenience
119119
add_custom_command(TARGET ch POST_BUILD
120120
COMMAND ${CMAKE_COMMAND} -E copy_if_different
121121
"${CHAKRACORE_BINARY_DIR}/bin/ch/ch"

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ PRINT_USAGE() {
4747
echo " e.g. undefined,signed-integer-overflow."
4848
echo " -t, --test-build Test build. Enables test flags on a release build."
4949
echo " --target-os[=S] Target OS"
50-
echo " --target-path[=S] Output path for compiled binaries. Default: BuildLinux/"
50+
echo " --target-path[=S] Output path for compiled binaries. Default: out/"
5151
echo " --trace Enables experimental built-in trace."
5252
echo " --xcode Generate XCode project."
5353
echo " --without=FEATURE,FEATURE,..."
@@ -394,7 +394,7 @@ if [[ ${#_CXX} > 0 ]]; then
394394
fi
395395

396396
if [[ $TARGET_PATH == 0 ]]; then
397-
TARGET_PATH="$CHAKRACORE_DIR/BuildLinux"
397+
TARGET_PATH="$CHAKRACORE_DIR/out"
398398
else
399399
if [[ $TARGET_PATH =~ "~/" ]]; then
400400
echo "Do not use '~/' for '--target-path'"

netci.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def CreateXPlatBuildTask = { isPR, buildType, staticBuild, machine, platform, co
135135
}
136136
}
137137

138-
def archivalString = "BuildLinux/build.log"
138+
def archivalString = "out/build.log"
139139
Utilities.addArchival(newJob, archivalString,
140140
'', // no exclusions from archival
141141
true, // doNotFailIfNothingArchived=false ~= failIfNothingArchived (true ~= doNotFail)

test/native-tests/test-python/helloWorld.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
platform = "so"
1414

1515
build_type = sys.argv[1]
16-
so_path = "../../../BuildLinux/" + build_type + "/libChakraCore." + platform
16+
so_path = "../../../out/" + build_type + "/libChakraCore." + platform
1717

1818
if os.path.isfile(so_path):
1919
chakraCore = CDLL(so_path)

test/runtests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
build = "VcBuild.SWB" if args.swb else "VcBuild"
9999
binary = 'Build\\' + build + '\\bin\\{}_{}\\ch.exe'.format(arch, flavor)
100100
else:
101-
binary = 'BuildLinux/{0}/ch'.format(flavor)
101+
binary = 'out/{0}/ch'.format(flavor)
102102
binary = os.path.join(repo_root, binary)
103103
if not os.path.isfile(binary):
104104
print('{} not found. Did you run ./build.sh already?'.format(binary))

test/runtests.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ binary_path=
1515
release_build=0
1616
test_variant=$1
1717

18-
if [[ -f "$test_path/../BuildLinux/Debug/ch" ]]; then
18+
if [[ -f "$test_path/../out/Debug/ch" ]]; then
1919
echo "Warning: Debug build was found"
2020
binary_path="Debug";
2121
build_type="-d"
22-
elif [[ -f "$test_path/../BuildLinux/Test/ch" ]]; then
22+
elif [[ -f "$test_path/../out/Test/ch" ]]; then
2323
echo "Warning: Test build was found"
2424
binary_path="Test";
2525
build_type="-t"
26-
elif [[ -f "$test_path/../BuildLinux/Release/ch" ]]; then
26+
elif [[ -f "$test_path/../out/Release/ch" ]]; then
2727
binary_path="Release";
2828
echo "Warning: Release build was found"
2929
release_build=1
@@ -41,7 +41,7 @@ else
4141
# TEST flags are not enabled for release build
4242
# however we would like to test if the compiled binary
4343
# works or not
44-
RES=$($test_path/../BuildLinux/${binary_path}/ch $test_path/basics/hello.js)
44+
RES=$($test_path/../out/${binary_path}/ch $test_path/basics/hello.js)
4545
if [[ $RES =~ "Error :" ]]; then
4646
echo "FAILED"
4747
exit 1
@@ -51,7 +51,7 @@ else
5151
fi
5252

5353
RES=$(pwd)
54-
CH_ABSOLUTE_PATH="$RES/${test_path}/../BuildLinux/${binary_path}/ch"
54+
CH_ABSOLUTE_PATH="$RES/${test_path}/../out/${binary_path}/ch"
5555
RES=$(cd $RES/$test_path/native-tests; ./test_native.sh ${CH_ABSOLUTE_PATH} ${binary_path} 2>&1)
5656
if [[ $? != 0 ]]; then
5757
echo "Error: Native tests failed"

0 commit comments

Comments
 (0)