work around pinf hang under Travis by forcing the TERM to dumb.
This commit is contained in:
parent
c6cd50379e
commit
7d6f2533db
@ -2,5 +2,6 @@ language: objective-c
|
||||
xcode_project: MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj
|
||||
xcode_scheme: MasterPassword iOS (Development)
|
||||
xcode_sdk: iphonesimulator
|
||||
env: TERM=dumb
|
||||
git:
|
||||
submodules: true
|
||||
|
@ -2,6 +2,8 @@
|
||||
#
|
||||
# TROUBLESHOOTING
|
||||
# - To enable verbose algorithm/implementation debugging, use ./build -DDEBUG
|
||||
# - If you see 'undefined reference to `AES_encrypt'',
|
||||
# make sure you have openssl installed.
|
||||
# - If you see 'undefined reference to `clock_gettime'',
|
||||
# try ./build -lrt instead.
|
||||
# - If you see 'x86.S:202: Error: junk at end of line, first unrecognized character is `,'',
|
||||
@ -245,6 +247,9 @@ mpw-bench() {
|
||||
|
||||
### TARGETS
|
||||
|
||||
haslib() {
|
||||
LC_ALL=C cc -l"$1" 2>&1 | ! grep -q 'library not found'
|
||||
}
|
||||
cc() {
|
||||
if hash llvm-gcc 2>/dev/null; then
|
||||
llvm-gcc "$@"
|
||||
|
@ -109,8 +109,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
|
||||
// Global hotkey.
|
||||
EventHotKeyRef hotKeyRef;
|
||||
EventTypeSpec hotKeyEvents[1] = { { .eventClass = kEventClassKeyboard, .eventKind = kEventHotKeyPressed } };
|
||||
OSStatus status = InstallApplicationEventHandler( NewEventHandlerUPP( MPHotKeyHander ), GetEventTypeCount( hotKeyEvents ),
|
||||
hotKeyEvents, (__bridge void *)self, NULL );
|
||||
OSStatus status = InstallApplicationEventHandler( NewEventHandlerUPP( MPHotKeyHander ), GetEventTypeCount( hotKeyEvents ), hotKeyEvents, (__bridge void *)self, NULL );
|
||||
if (status != noErr)
|
||||
err( @"Error installing application event handler: %i", (int)status );
|
||||
status = RegisterEventHotKey( 35 /* p */, controlKey + cmdKey, MPShowHotKey, GetApplicationEventTarget(), 0, &hotKeyRef );
|
||||
|
@ -56,7 +56,6 @@ copyImage() {
|
||||
local src=$1 dst=$2
|
||||
|
||||
if [[ $src = *.9.png || $src = *.9@*.png ]]; then
|
||||
exit
|
||||
pinf '%s -> %s (ninepatch)' "${src##*/}" "${dst##*/}"
|
||||
niftyNinePatch=$(java -Dapple.awt.UIElement=true -jar Scripts/NiftyNinePatchHelper.jar "$src" "$dst") || return
|
||||
while IFS='=' read var value; do
|
||||
@ -68,7 +67,6 @@ exit
|
||||
done <<< "$niftyNinePatch"
|
||||
fnip
|
||||
else
|
||||
exit
|
||||
pinf '%s -> %s' "${src##*/}" "${dst##*/}"
|
||||
cp "$src" "$dst"
|
||||
fnip
|
||||
|
Loading…
Reference in New Issue
Block a user