mirror of
https://github.com/macvim-dev/macvim.git
synced 2026-06-02 11:19:22 +02:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f539a147c1 | |||
| 1f8d90334b | |||
| 3123f01324 | |||
| db650bbf43 |
+6
-1
@@ -18,7 +18,8 @@ env:
|
||||
vi_cv_dll_name_python3=/usr/local/Frameworks/Python.framework/Versions/3.9/Python
|
||||
vi_cv_dll_name_ruby=/usr/local/opt/ruby/lib/libruby.dylib
|
||||
VIMCMD=src/MacVim/build/Release/MacVim.app/Contents/MacOS/Vim
|
||||
CONFOPT="--with-features=huge --enable-netbeans --with-tlib=ncurses --enable-cscope --enable-gui=macvim"
|
||||
MACVIM_BIN=src/MacVim/build/Release/MacVim.app/Contents/MacOS/MacVim
|
||||
CONFOPT="--with-features=huge --enable-netbeans --with-tlib=ncurses --enable-cscope --enable-gui=macvim --with-macarchs=x86_64"
|
||||
BASH_SILENCE_DEPRECATION_WARNING=1
|
||||
|
||||
_anchors:
|
||||
@@ -85,6 +86,10 @@ script:
|
||||
# Make sure there isn't any dynamic linkage to third-party dependencies in the built binary, as we should only use
|
||||
# static linkage to avoid dependency hell. Test that all those dylib's are in /usr/lib which is bundled with macOS and not third-party.
|
||||
- (! otool -L ${VIMCMD} | grep '\.dylib\s' | grep -v '^\s*/usr/lib/')
|
||||
# Make sure we are building x86_64 only. arm64 builds don't work properly now, so we don't want to accidentally build
|
||||
# it as it will get prioritized by Apple Silicon Macs.
|
||||
- (lipo -archs ${VIMCMD} | grep '^x86_64$')
|
||||
- (lipo -archs ${MACVIM_BIN} | grep '^x86_64$')
|
||||
- echo -en "travis_fold:end:smoketest\\r\\033[0K"
|
||||
|
||||
# Run standard test suites.
|
||||
|
||||
@@ -1255,7 +1255,7 @@
|
||||
</dict>
|
||||
</array>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>167</string>
|
||||
<string>168</string>
|
||||
<key>LSApplicationCategoryType</key>
|
||||
<string>public.app-category.productivity</string>
|
||||
<key>NSAppTransportSecurity</key>
|
||||
@@ -1312,7 +1312,7 @@
|
||||
<key>SUPublicDSAKeyFile</key>
|
||||
<string>dsa_pub.pem</string>
|
||||
<key>SUPublicEDKey</key>
|
||||
<string>EnnNZOR1zR6TmKXohjTNWbToLYNE4/1qd/dtkuTE2zc=</string>
|
||||
<string>Pt4zsg/8S3/mxKW7Cmt0cZFw/+2LOuXOYS93evP+Mfc=</string>
|
||||
<key>NSAppleEventsUsageDescription</key>
|
||||
<string>MacVim uses Apple Events to allow you to communicate with other apps using Apple Script, and to support working as an ODB external editor.</string>
|
||||
<key>NSAppleScriptEnabled</key>
|
||||
|
||||
Vendored
+9
-1
@@ -4758,7 +4758,15 @@ fi
|
||||
$as_echo_n "checking if architectures are supported... " >&6; }
|
||||
save_cflags="$CFLAGS"
|
||||
save_ldflags="$LDFLAGS"
|
||||
archflags=`echo "$ARCHS" | sed -e 's/[[:<:]]/-arch /g'`
|
||||
|
||||
# Apple's sed is supposed to treat [[:<:]] as word beginning, but seems
|
||||
# like that broke some time ago and means *any* word character (but
|
||||
# [[:>:]] still seems to work as word end).
|
||||
# Use a more convoluted regex in order to properly to split the archs by
|
||||
# word and prefix each with "-arch" to pass to the compiler.
|
||||
#archflags=`echo "$ARCHS" | sed -e 's/[[[:<:]]]/-arch /g'`
|
||||
archflags=`echo "$ARCHS" | sed 's/[[:>:]][ ][ ]*[[:<:]]/ -arch /g' | sed 's/^/-arch /g'`
|
||||
|
||||
CFLAGS="$CFLAGS $archflags"
|
||||
LDFLAGS="$LDFLAGS $archflags"
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
|
||||
+9
-1
@@ -273,7 +273,15 @@ if test "`(uname) 2>/dev/null`" = Darwin; then
|
||||
AC_MSG_CHECKING(if architectures are supported)
|
||||
save_cflags="$CFLAGS"
|
||||
save_ldflags="$LDFLAGS"
|
||||
archflags=`echo "$ARCHS" | sed -e 's/[[[:<:]]]/-arch /g'`
|
||||
|
||||
# Apple's sed is supposed to treat [[:<:]] as word beginning, but seems
|
||||
# like that broke some time ago and means *any* word character (but
|
||||
# [[:>:]] still seems to work as word end).
|
||||
# Use a more convoluted regex in order to properly to split the archs by
|
||||
# word and prefix each with "-arch" to pass to the compiler.
|
||||
#archflags=`echo "$ARCHS" | sed -e 's/[[[:<:]]]/-arch /g'`
|
||||
archflags=`echo "$ARCHS" | sed 's/[[[:>:]]][[ ]][[ ]]*[[[:<:]]]/ -arch /g' | sed 's/^/-arch /g'`
|
||||
|
||||
CFLAGS="$CFLAGS $archflags"
|
||||
LDFLAGS="$LDFLAGS $archflags"
|
||||
AC_TRY_LINK([ ], [ ],
|
||||
|
||||
Reference in New Issue
Block a user