Skip to content

Commit d7489da

Browse files
committed
- Try to fix paths for macOS and asset compression
1 parent 35888ee commit d7489da

File tree

3 files changed

+26
-113
lines changed

3 files changed

+26
-113
lines changed

.build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ platforms:
6060
script_location: toolchain/ci
6161
template_location: toolchain/cmake/Templates
6262
version:
63-
hotfix: 18
63+
hotfix: 19
6464
major: 0
6565
minor: 3
6666
patch: 0

.travis.yml

Lines changed: 0 additions & 108 deletions
This file was deleted.

cb

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,19 @@ case $1 in
3535
fi
3636
;;
3737
"ci-build")
38-
pushd /build/build
38+
INSTALL_DIR=/build/install
39+
BUILD_DIR=/build/build
40+
41+
if [ "$(uname)" = "Darwin" ]; then
42+
INSTALL_DIR="${BASE_DIR}/../install"
43+
BUILD_DIR="${BASE_DIR}/../build"
44+
fi
45+
46+
pushd ${BUILD_DIR}
3947
export GENERATE_PROGRAMS=${GENERATE_PROGRAMS:-ON}
4048
export CONFIGURATION=${CONFIGURATION:-Debug}
4149
export CMAKE_SOURCE_DIR=${BASE_DIR}
42-
export CMAKE_INSTALL_DIR=/build/install
50+
export CMAKE_INSTALL_DIR=${INSTALL_DIR}
4351
cmake -C${BASE_DIR}/.github/cmake/${BUILDVARIANT}.preload.cmake ${BASE_DIR} ${@:2}
4452
cmake --build . --target ${BUILD_TARGET:-all}
4553
cmake --build . --target install
@@ -64,10 +72,23 @@ case $1 in
6472
OUTPUT=$(realpath .)/${2}_${BUILDVARIANT}.tar.bz2
6573
INSTALL_DIR=$(realpath .)/install
6674

67-
echo "Creating $OUTPUT from $INSTALL_DIR"
75+
echo "-- Creating $OUTPUT from $INSTALL_DIR"
76+
77+
echo "-- Current directory: $(pwd)"
78+
79+
echo "-- Source dir: ${BASE_DIR}"
80+
ls ${BASE_DIR}
81+
echo "-- Build dir: $(realpath .)/build"
82+
ls $(realpath .)/build
83+
echo "-- Install dir: $(realpath .)/install"
84+
ls ${INSTALL_DIR}
6885

69-
pwd
86+
echo "-- Install dir contents:"
87+
ls -R ${INSTALL_DIR}
88+
echo "-- Build dir contents:"
7089
ls ${INSTALL_DIR}
90+
echo "-- Root dir contents:"
91+
ls -R $(realpath .)
7192

7293
pushd ${INSTALL_DIR}
7394
case $2 in

0 commit comments

Comments
 (0)