diff --git a/.github/workflows/ecode-nightly.yml b/.github/workflows/ecode-nightly.yml index bd7e053d8..e6c05cf7b 100644 --- a/.github/workflows/ecode-nightly.yml +++ b/.github/workflows/ecode-nightly.yml @@ -227,9 +227,6 @@ jobs: - name: Install Dependencies run: | brew install bash sdl2 create-dmg premake p7zip - curl -OL https://github.com/libsdl-org/SDL/releases/download/release-2.30.8/SDL2-2.30.8.dmg - 7z x SDL2-2.30.8.dmg - cp -r ./SDL2/SDL2.framework src/thirdparty/ - name: Build run: | bash projects/macos/ecode/build.app.sh --version ${{ env.INSTALL_REF }} @@ -272,7 +269,7 @@ jobs: echo "INSTALL_REF=${{ needs.release.outputs.version }}" >> "$GITHUB_ENV" - name: Install Dependencies run: | - brew install bash sdl2 create-dmg premake p7zip + brew install bash create-dmg premake p7zip curl -OL https://github.com/libsdl-org/SDL/releases/download/release-2.30.8/SDL2-2.30.8.dmg hdiutil attach SDL2-2.30.8.dmg sudo cp -r /Volumes/SDL2/SDL2.framework /Library/Frameworks/ diff --git a/projects/macos/ecode/build.app.sh b/projects/macos/ecode/build.app.sh index c00764bbf..07e6c33a4 100755 --- a/projects/macos/ecode/build.app.sh +++ b/projects/macos/ecode/build.app.sh @@ -62,11 +62,10 @@ else ECODE_VERSION="$ECODE_MAJOR_VERSION"."$ECODE_MINOR_VERSION"."$ECODE_PATCH_LEVEL" fi -cat Info.plist.tpl | sed "s/ECODE_VERSION/${ECODE_VERSION}/g" | sed "s/ECODE_MAJOR_VERSION/${ECODE_MAJOR_VERSION}/g" | sed "s/ECODE_MINOR_VERSION/${ECODE_MINOR_VERSION}/g" > Info.plist +cat Info.plist.tpl | sed "s/ECODE_VERSION_STRING/${ECODE_VERSION}/g" | sed "s/ECODE_MAJOR_VERSION/${ECODE_MAJOR_VERSION}/g" | sed "s/ECODE_MINOR_VERSION/${ECODE_MINOR_VERSION}/g" > Info.plist cp Info.plist ecode.app/Contents/ rm Info.plist cp ../../../libs/macosx/"$ARCH_PATH"libeepp.dylib ecode.app/Contents/MacOS - cp ../../../bin/ecode ecode.app/Contents/MacOS if [ -z "$SDL2_CONFIG" ]; then diff --git a/projects/macos/ecode/cross.build.app.sh b/projects/macos/ecode/cross.build.app.sh index b6f9e3abf..f73f9afb7 100755 --- a/projects/macos/ecode/cross.build.app.sh +++ b/projects/macos/ecode/cross.build.app.sh @@ -40,7 +40,7 @@ else ECODE_VERSION="$ECODE_MAJOR_VERSION"."$ECODE_MINOR_VERSION"."$ECODE_PATCH_LEVEL" fi -cat Info.plist.tpl | sed "s/ECODE_VERSION/${ECODE_VERSION}/g" | sed "s/ECODE_MAJOR_VERSION/${ECODE_MAJOR_VERSION}/g" | sed "s/ECODE_MINOR_VERSION/${ECODE_MINOR_VERSION}/g" > Info.plist +cat Info.plist.tpl | sed "s/ECODE_VERSION_STRING/${ECODE_VERSION}/g" | sed "s/ECODE_MAJOR_VERSION/${ECODE_MAJOR_VERSION}/g" | sed "s/ECODE_MINOR_VERSION/${ECODE_MINOR_VERSION}/g" > Info.plist cp Info.plist ecode.app/Contents/ rm Info.plist