From 8f4b6e83ebef9c6d4cd147e1eb74fb8e3109402f Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Tue, 18 Feb 2025 21:28:03 -0500 Subject: [PATCH] ios: This fixes the build on macos and runs in the simulator. --- GNUmakefile | 16 +++++++++------- src/ios/Info.plist | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index b18dca50f..4e34afefc 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -912,8 +912,10 @@ src/android/AndroidManifest.xml : $(firstword $(MAKEFILE_LIST)) src/ios/Info.plist : $(firstword $(MAKEFILE_LIST)) @echo "[ios_version] $@" - @sed -z -r -i \ - -e 's@(CFBundleShortVersionString\s*)[0-9.]*()@\1$(VERSION_NUMBER)\2@' \ + @cat $@ | \ + tr '\n' '^' | \ + sed -r -e 's@(CFBundleShortVersionString\s*)[0-9.]*()@\1$(VERSION_NUMBER)\2@' | \ + tr '^' '\n' > \ $@ ## @@ -973,11 +975,11 @@ out/apk/classes.dex: $(CLASS_FILES) @$(ANDROID_BUILD_TOOLS)/d8 --lib $(ANDROID_PLATFORM)/android.jar --output $(dir $@) out/classes/com/unprompted/tildefriends/*.class PACKAGE_DIRS := \ - apps/ \ - core/ \ - deps/codemirror/ \ - deps/prettier/ \ - deps/lit/ + apps \ + core \ + deps/codemirror \ + deps/prettier \ + deps/lit RAW_FILES := $(sort $(filter-out apps/blog% apps/issues% apps/welcome% apps/journal% %.map, $(shell find $(PACKAGE_DIRS) -type f -not -name '.*'))) diff --git a/src/ios/Info.plist b/src/ios/Info.plist index 89dd3a7bd..a5c0afc4c 100644 --- a/src/ios/Info.plist +++ b/src/ios/Info.plist @@ -19,7 +19,7 @@ iPhoneOS CFBundleVersion - 6 + 7 DTPlatformName iphoneos LSRequiresIPhoneOS