Skip to content

Commit

Permalink
Don't build stk-editor in linux builder as its data files are already…
Browse files Browse the repository at this point in the history
… removed from stk assets.
  • Loading branch information
deveee committed Jul 3, 2024
1 parent afbb58e commit ffa49dd
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions tools/linux_builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -584,15 +584,15 @@ build_stk()
check_error

# Stk editor
mkdir -p "$STKEDITOR_DIR/$BUILD_DIR"
cd "$STKEDITOR_DIR/$BUILD_DIR"
cmake .. -DCMAKE_FIND_ROOT_PATH="$INSTALL_DIR" \
-DSTATIC_ZLIB=1 \
-DSTATIC_PHYSFS=1 \
-DCMAKE_DISABLE_FIND_PACKAGE_Fontconfig=1 \
$STK_CMAKE_FLAGS &&
make -j$THREADS_NUMBER
check_error
# mkdir -p "$STKEDITOR_DIR/$BUILD_DIR"
# cd "$STKEDITOR_DIR/$BUILD_DIR"
# cmake .. -DCMAKE_FIND_ROOT_PATH="$INSTALL_DIR" \
# -DSTATIC_ZLIB=1 \
# -DSTATIC_PHYSFS=1 \
# -DCMAKE_DISABLE_FIND_PACKAGE_Fontconfig=1 \
# $STK_CMAKE_FLAGS &&
# make -j$THREADS_NUMBER
# check_error
}

copy_libraries()
Expand Down Expand Up @@ -649,20 +649,20 @@ test_package()
exit 1
fi

if [ `objdump -a "$PACKAGE_DIR/bin/supertuxkart-editor" | grep -c "$BINARY_ARCH"` -eq 0 ]; then
echo "Error: bin/supertuxkart-editor is not $BINARY_ARCH"
exit 1
fi
# if [ `objdump -a "$PACKAGE_DIR/bin/supertuxkart-editor" | grep -c "$BINARY_ARCH"` -eq 0 ]; then
# echo "Error: bin/supertuxkart-editor is not $BINARY_ARCH"
# exit 1
# fi

if [ `LD_LIBRARY_PATH="$PACKAGE_DIR/lib" ldd "$PACKAGE_DIR/bin/supertuxkart" | grep -c "not found"` -gt 0 ]; then
echo "Error: bin/supertuxkart has some missing libraries"
exit 1
fi

if [ `ldd "$PACKAGE_DIR/bin/supertuxkart-editor" | grep -c "not found"` -gt 0 ]; then
echo "Error: bin/supertuxkart-editor has some missing libraries"
exit 1
fi
# if [ `ldd "$PACKAGE_DIR/bin/supertuxkart-editor" | grep -c "not found"` -gt 0 ]; then
# echo "Error: bin/supertuxkart-editor has some missing libraries"
# exit 1
# fi

LD_LIBRARY_PATH="$PACKAGE_DIR/lib" "$PACKAGE_DIR/bin/supertuxkart" --version

Expand Down Expand Up @@ -711,13 +711,13 @@ create_package()
write_run_game_sh "$STK_PACKAGE_DIR"

cp "$STKCODE_DIR/$BUILD_DIR-$ARCH/bin/supertuxkart" "$STK_INSTALL_DIR/supertuxkart-$STK_VERSION-linux-$ARCH-symbols"
cp "$STKEDITOR_DIR/$BUILD_DIR-$ARCH/bin/supertuxkart-editor" "$STK_INSTALL_DIR/supertuxkart-editor-$STK_VERSION-linux-$ARCH-symbols"
# cp "$STKEDITOR_DIR/$BUILD_DIR-$ARCH/bin/supertuxkart-editor" "$STK_INSTALL_DIR/supertuxkart-editor-$STK_VERSION-linux-$ARCH-symbols"

cp -a "$STKCODE_DIR/$BUILD_DIR-$ARCH/bin/supertuxkart" "$STK_PACKAGE_DIR/bin/"
cp -a "$STKEDITOR_DIR/$BUILD_DIR-$ARCH/bin/supertuxkart-editor" "$STK_PACKAGE_DIR/bin/"
# cp -a "$STKEDITOR_DIR/$BUILD_DIR-$ARCH/bin/supertuxkart-editor" "$STK_PACKAGE_DIR/bin/"

cp -a "$STKCODE_DIR/data/." "$STK_PACKAGE_DIR/data"
cp -a "$STKASSETS_DIR/editor" "$STK_PACKAGE_DIR/data/"
# cp -a "$STKASSETS_DIR/editor" "$STK_PACKAGE_DIR/data/"
cp -a "$STKASSETS_DIR/karts" "$STK_PACKAGE_DIR/data/"
cp -a "$STKASSETS_DIR/library" "$STK_PACKAGE_DIR/data/"
cp -a "$STKASSETS_DIR/models" "$STK_PACKAGE_DIR/data/"
Expand All @@ -728,7 +728,7 @@ create_package()
cp -a "$STKASSETS_DIR/licenses.txt" "$STK_PACKAGE_DIR/data/"

strip --strip-debug "$STK_PACKAGE_DIR/bin/supertuxkart"
strip --strip-debug "$STK_PACKAGE_DIR/bin/supertuxkart-editor"
# strip --strip-debug "$STK_PACKAGE_DIR/bin/supertuxkart-editor"

find "$STK_PACKAGE_DIR/bin" -type f -exec chrpath -d {} \;
find "$STK_PACKAGE_DIR/lib" -type f -exec chrpath -d {} \;
Expand All @@ -753,7 +753,7 @@ create_package()
if [ ! -z "$1" ] && [ "$1" = "clean" ]; then
rm -rf "$DEPENDENCIES_DIR-"*
rm -rf "$STKCODE_DIR/$BUILD_DIR-"*
rm -rf "$STKEDITOR_DIR/$BUILD_DIR-"*
# rm -rf "$STKEDITOR_DIR/$BUILD_DIR-"*
rm -rf "$STK_INSTALL_DIR"
exit 0
fi
Expand Down

0 comments on commit ffa49dd

Please sign in to comment.