Skip to content

Commit 9e71cd1

Browse files
committed
Added xxd to build
1 parent 3f23f2f commit 9e71cd1

File tree

3 files changed

+40
-9
lines changed

3 files changed

+40
-9
lines changed

basic_Info.plist

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@
3131
<key>DTPlatformName</key>
3232
<string>iphoneos</string>
3333
<key>DTPlatformVersion</key>
34-
<string>11.0</string>
34+
<string>14.0</string>
3535
<key>DTSDKBuild</key>
3636
<string>16B91</string>
3737
<key>DTSDKName</key>
38-
<string>iphoneos11.0</string>
38+
<string>iphoneos14.0</string>
3939
<key>DTXcode</key>
4040
<string>1010</string>
4141
<key>DTXcodeBuild</key>
4242
<string>10B61</string>
4343
<key>MinimumOSVersion</key>
44-
<string>11.0</string>
44+
<string>14.0</string>
4545
<key>UIDeviceFamily</key>
4646
<array>
4747
<integer>1</integer>

basic_Info_Simulator.plist

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,17 @@
3131
<key>DTPlatformName</key>
3232
<string>iphonesimulator</string>
3333
<key>DTPlatformVersion</key>
34-
<string>11.0</string>
34+
<string>14.0</string>
3535
<key>DTSDKBuild</key>
3636
<string>16B91</string>
3737
<key>DTSDKName</key>
38-
<string>iphonesimulator11.0</string>
38+
<string>iphonesimulator14.0</string>
3939
<key>DTXcode</key>
4040
<string>1010</string>
4141
<key>DTXcodeBuild</key>
4242
<string>10B61</string>
4343
<key>MinimumOSVersion</key>
44-
<string>11.0</string>
44+
<string>14.0</string>
4545
<key>UIDeviceFamily</key>
4646
<array>
4747
<integer>1</integer>

build_vim_xcframework.sh

+34-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ OSX_SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
77
IOS_SDKROOT=$(xcrun --sdk iphoneos --show-sdk-path)
88
SIM_SDKROOT=$(xcrun --sdk iphonesimulator --show-sdk-path)
99

10+
FRAMEWORKS=$PWD/Frameworks
1011
echo "Building for iOS:"
1112
rm Frameworks
1213
ln -s Frameworks_iOS Frameworks
1314

1415
make distclean
1516
# 1) configure
16-
./configure vim_cv_toupper_broken=no vim_cv_terminfo=no vim_cv_tgetent=zero vim_cv_memmove_handles_overlap=no vim_cv_memcpy_handles_overlap=no vim_cv_bcopy_handles_overlap=no vim_cv_tty_group=world vim_cv_stat_ignores_slash=yes vim_cv_getcwd_broken=no LUA_PREFIX=${PWD} vi_cv_path_plain_lua=/usr/bin/lua vi_cv_version_plain_lua=5.3.4 --with-tlib=ncurses --with-features=big --enable-terminal --enable-luainterp --enable-python3interp --with-python3-command=python3 CC=clang CXX=clang++ CFLAGS="-DEXITFREE -arch arm64 -g2 -miphoneos-version-min=14.0 -isysroot $IOS_SDKROOT -fembed-bitcode" CPPFLAGS="-DEXITFREE -arch arm64 -g2 -miphoneos-version-min=14.0 -isysroot $IOS_SDKROOT" CXXFLAGS="-DEXITFREE -arch arm64 -g2 -miphoneos-version-min=14.0 -isysroot $IOS_SDKROOT -fembed-bitcode" LDFLAGS="-shared -arch arm64 -g2 -miphoneos-version-min=14.0 -isysroot $IOS_SDKROOT " --build=x86_64-apple-darwin --host=armv7-apple-darwin
17+
./configure vim_cv_toupper_broken=no vim_cv_terminfo=no vim_cv_tgetent=zero vim_cv_memmove_handles_overlap=no vim_cv_memcpy_handles_overlap=no vim_cv_bcopy_handles_overlap=no vim_cv_tty_group=world vim_cv_stat_ignores_slash=yes vim_cv_getcwd_broken=no LUA_PREFIX=${PWD} vi_cv_path_plain_lua=/usr/bin/lua vi_cv_version_plain_lua=5.3.4 --with-tlib=ncurses --with-features=big --enable-terminal --enable-luainterp --enable-python3interp --with-python3-command=python3 CC=clang CXX=clang++ CFLAGS="-DEXITFREE -arch arm64 -O2 -miphoneos-version-min=14.0 -isysroot $IOS_SDKROOT -fembed-bitcode" CPPFLAGS="-DEXITFREE -arch arm64 -O2 -miphoneos-version-min=14.0 -isysroot $IOS_SDKROOT" CXXFLAGS="-DEXITFREE -arch arm64 -O2 -miphoneos-version-min=14.0 -isysroot $IOS_SDKROOT -fembed-bitcode" LDFLAGS="-shared -arch arm64 -O2 -miphoneos-version-min=14.0 -isysroot $IOS_SDKROOT -F$FRAMEWORKS -framework ios_system " --build=x86_64-apple-darwin --host=armv7-apple-darwin
1718

1819
# 2) make. This creates ./src/vim, a Mach-O 64-bit dynamically linked shared library for arm64.
1920
make
@@ -33,12 +34,28 @@ signature=${framework//_/-}
3334
plutil -replace CFBundleIdentifier -string Nicolas-Holzschuch.$signature Frameworks/$framework.framework/Info.plist
3435
install_name_tool -id @rpath/$framework.framework/$framework Frameworks/$framework.framework/$framework
3536

37+
echo "Creating: Frameworks/xxd.framework"
38+
framework=xxd
39+
libraryFile=src/xxd/xxd
40+
rm -rf Frameworks/$framework.framework
41+
mkdir -p Frameworks/$framework.framework
42+
cp $libraryFile Frameworks/$framework.framework/$framework
43+
cp basic_Info.plist Frameworks/$framework.framework/Info.plist
44+
plutil -replace CFBundleExecutable -string $framework Frameworks/$framework.framework/Info.plist
45+
plutil -replace CFBundleName -string $framework Frameworks/$framework.framework/Info.plist
46+
# underscore is not allowed in CFBundleIdentifier:
47+
signature=${framework//_/-}
48+
plutil -replace CFBundleIdentifier -string Nicolas-Holzschuch.$signature Frameworks/$framework.framework/Info.plist
49+
install_name_tool -id @rpath/$framework.framework/$framework Frameworks/$framework.framework/$framework
50+
51+
52+
3653
echo "Building for Simulator:"
3754
rm Frameworks
3855
ln -s Frameworks_Simulator Frameworks
3956

4057
make distclean
41-
./configure vim_cv_toupper_broken=no vim_cv_terminfo=no vim_cv_tgetent=zero vim_cv_memmove_handles_overlap=no vim_cv_memcpy_handles_overlap=no vim_cv_bcopy_handles_overlap=no vim_cv_tty_group=world vim_cv_stat_ignores_slash=yes vim_cv_getcwd_broken=no --with-tlib=ncurses --with-features=big --enable-terminal CC=clang CXX=clang++ CFLAGS="-DEXITFREE -g2 -mios-simulator-version-min=14.0 -isysroot $SIM_SDKROOT -fembed-bitcode" CPPFLAGS="-DEXITFREE -g2 -mios-simulator-version-min=14.0 -isysroot $SIM_SDKROOT" CXXFLAGS="-DEXITFREE -g2 -mios-simulator-version-min=14.0 -isysroot $SIM_SDKROOT -fembed-bitcode" LDFLAGS="-g2 -shared -mios-simulator-version-min=14.0 -isysroot $SIM_SDKROOT -fembed-bitcode" --build=x86_64-apple-darwin --host=armv7-apple-darwin
58+
./configure vim_cv_toupper_broken=no vim_cv_terminfo=no vim_cv_tgetent=zero vim_cv_memmove_handles_overlap=no vim_cv_memcpy_handles_overlap=no vim_cv_bcopy_handles_overlap=no vim_cv_tty_group=world vim_cv_stat_ignores_slash=yes vim_cv_getcwd_broken=no --with-tlib=ncurses --with-features=big --enable-terminal CC=clang CXX=clang++ CFLAGS="-DEXITFREE -O2 -mios-simulator-version-min=14.0 -isysroot $SIM_SDKROOT -fembed-bitcode" CPPFLAGS="-DEXITFREE -O2 -mios-simulator-version-min=14.0 -isysroot $SIM_SDKROOT" CXXFLAGS="-DEXITFREE -O2 -mios-simulator-version-min=14.0 -isysroot $SIM_SDKROOT -fembed-bitcode" LDFLAGS="-O2 -shared -mios-simulator-version-min=14.0 -isysroot $SIM_SDKROOT -fembed-bitcode -F$FRAMEWORKS -framework ios_system " --build=x86_64-apple-darwin --host=armv7-apple-darwin
4259

4360
# 2) make. This creates ./src/vim, a Mach-O 64-bit dynamically linked shared library for arm64.
4461
make
@@ -58,11 +75,25 @@ signature=${framework//_/-}
5875
plutil -replace CFBundleIdentifier -string Nicolas-Holzschuch.$signature Frameworks/$framework.framework/Info.plist
5976
install_name_tool -id @rpath/$framework.framework/$framework Frameworks/$framework.framework/$framework
6077

78+
echo "Creating: Frameworks/xxd.framework"
79+
framework=xxd
80+
libraryFile=src/xxd/xxd
81+
rm -rf Frameworks/$framework.framework
82+
mkdir -p Frameworks/$framework.framework
83+
cp $libraryFile Frameworks/$framework.framework/$framework
84+
cp basic_Info_Simulator.plist Frameworks/$framework.framework/Info.plist
85+
plutil -replace CFBundleExecutable -string $framework Frameworks/$framework.framework/Info.plist
86+
plutil -replace CFBundleName -string $framework Frameworks/$framework.framework/Info.plist
87+
# underscore is not allowed in CFBundleIdentifier:
88+
signature=${framework//_/-}
89+
plutil -replace CFBundleIdentifier -string Nicolas-Holzschuch.$signature Frameworks/$framework.framework/Info.plist
90+
install_name_tool -id @rpath/$framework.framework/$framework Frameworks/$framework.framework/$framework
91+
6192
# 6)
6293
echo "Merging into xcframeworks:"
6394
rm Frameworks
6495

65-
for framework in vim
96+
for framework in vim xxd
6697
do
6798
rm -rf $framework.xcframework
6899
xcodebuild -create-xcframework -framework Frameworks_iOS/$framework.framework -framework Frameworks_Simulator/$framework.framework -output $framework.xcframework

0 commit comments

Comments
 (0)