Use the copy_ecode_assets.sh script for building ecode in macOS too.

Fix incorrect check in `build_sdl2.sh`.
This commit is contained in:
Martín Lucas Golini
2025-12-13 11:51:07 -03:00
parent 474856ac38
commit fa95500ab0
3 changed files with 5 additions and 64 deletions

View File

@@ -47,9 +47,8 @@ fi
RESOURCES_PATH="ecode.app/Contents/Resources"
rm -rf ./ecode.app
bash ../../scripts/copy_ecode_assets.sh ../../bin $RESOURCES_PATH || exit
mkdir -p ecode.app/Contents/MacOS/
mkdir -p "$RESOURCES_PATH"
cp ../../../bin/assets/icon/ecode.icns $RESOURCES_PATH/ecode.icns
VERSIONPATH=../../../src/tools/ecode/version.hpp
@@ -91,36 +90,6 @@ fi
fi
#cp -r ../../../bin/assets $RESOURCES_PATH/assets
mkdir -p $RESOURCES_PATH/assets/colorschemes
cp -r ../../../bin/assets/colorschemes/ $RESOURCES_PATH/assets/colorschemes/
mkdir -p $RESOURCES_PATH/assets/i18n
cp -r ../../../bin/assets/i18n/ $RESOURCES_PATH/assets/i18n/
#cp -r ../../../bin/assets/fonts $RESOURCES_PATH/assets/
mkdir -p $RESOURCES_PATH/assets/fonts
cp -r ../../../bin/assets/fonts/DejaVuSansMono.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/DejaVuSansMono-Bold.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/DejaVuSansMono-Oblique.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/DejaVuSansMono-BoldOblique.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/DejaVuSansMonoNerdFontComplete.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/nonicons.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/codicon.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/NotoSans-Regular.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/remixicon.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/NotoEmoji-Regular.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/NotoSans-Bold.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/NotoSans-Italic.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/NotoSans-BoldItalic.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/NotoColorEmoji.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/DroidSansFallbackFull.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/plugins $RESOURCES_PATH/assets/
# cp -r ../../../bin/assets/icon $RESOURCES_PATH/assets/
mkdir -p $RESOURCES_PATH/assets/icon
cp ../../../bin/assets/icon/ecode.png $RESOURCES_PATH/assets/icon
cp ../../../bin/assets/ca-bundle.pem $RESOURCES_PATH/assets/ca-bundle.pem
mkdir $RESOURCES_PATH/assets/ui
cp ../../../bin/assets/ui/breeze.css $RESOURCES_PATH/assets/ui/
# Clear quarantine flag recursively (more targeted than -cr)
xattr -d -r com.apple.quarantine ecode.app 2>/dev/null || true

View File

@@ -25,9 +25,9 @@ RESOURCES_PATH="ecode.app/Contents/Resources"
premake5 --file=../../../premake5.lua --disable-static-build --with-text-shaper --use-frameworks gmake || exit
make -C ../../../make/macosx/ -j$(sysctl -n hw.ncpu) -e verbose=true -e config=release_x86_64 ecode || exit
rm -rf ./ecode.app
bash ../../scripts/copy_ecode_assets.sh ../../bin $RESOURCES_PATH || exit
mkdir -p ecode.app/Contents/MacOS/
mkdir -p "$RESOURCES_PATH"
cp ../../../bin/assets/icon/ecode.icns $RESOURCES_PATH/ecode.icns
VERSIONPATH=../../../src/tools/ecode/version.hpp
@@ -54,34 +54,6 @@ install_name_tool -change @rpath/SDL2.framework/Versions/A/SDL2 @executable_path
codesign --force -s - ecode.app/Contents/MacOS/SDL2
install_name_tool -change @rpath/libeepp.dylib @executable_path/libeepp.dylib ecode.app/Contents/MacOS/ecode
#cp -r ../../../bin/assets $RESOURCES_PATH/assets
mkdir -p $RESOURCES_PATH/assets/colorschemes
cp -r ../../../bin/assets/colorschemes/ $RESOURCES_PATH/assets/colorschemes/
#cp -r ../../../bin/assets/fonts $RESOURCES_PATH/assets/
mkdir -p $RESOURCES_PATH/assets/fonts
cp -r ../../../bin/assets/fonts/DejaVuSansMono.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/DejaVuSansMono-Bold.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/DejaVuSansMono-Oblique.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/DejaVuSansMono-BoldOblique.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/DejaVuSansMonoNerdFontComplete.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/nonicons.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/codicon.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/NotoSans-Regular.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/remixicon.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/NotoEmoji-Regular.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/NotoSans-Bold.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/NotoSans-Italic.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/NotoSans-BoldItalic.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/NotoColorEmoji.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/fonts/DroidSansFallbackFull.ttf $RESOURCES_PATH/assets/fonts/
cp -r ../../../bin/assets/plugins $RESOURCES_PATH/assets/
# cp -r ../../../bin/assets/icon $RESOURCES_PATH/assets/
mkdir -p $RESOURCES_PATH/assets/icon
cp ../../../bin/assets/icon/ecode.png $RESOURCES_PATH/assets/icon
cp ../../../bin/assets/ca-bundle.pem $RESOURCES_PATH/assets/ca-bundle.pem
mkdir $RESOURCES_PATH/assets/ui
cp ../../../bin/assets/ui/breeze.css $RESOURCES_PATH/assets/ui/
# Clear permissions (basically for libSDL2)
chmod -R u+rwX,go+rX,go-w ecode.app
xattr -cr ecode.app

View File

@@ -19,9 +19,9 @@ if [[ "$ARCH" == "arm64" ]]; then
echo "Building SDL2 for arch $ARCH"
HOST="--host=aarch64-w64-mingw32"
if [ ! -f "/usr/local/cross-tools/aarch64-w64-mingw32/bin/SDL2.dll" ]; then
if [ -f "/usr/local/cross-tools/aarch64-w64-mingw32/bin/SDL2.dll" ]; then
echo "SDL2 found in cross-tools folder"
# exit 0
exit 0
fi
else