skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

work around pinf hang under Travis by forcing the TERM to dumb.

Browse Source
This commit is contained in:
Maarten Billemont 2014-11-18 07:32:17 -05:00
parent c6cd50379e
commit 7d6f2533db
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -2,5 +2,6 @@ language: objective-c
xcode_project: MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj xcode_project: MasterPassword/ObjC/iOS/MasterPassword-iOS.xcodeproj
xcode_scheme: MasterPassword iOS (Development) xcode_scheme: MasterPassword iOS (Development)
xcode_sdk: iphonesimulator xcode_sdk: iphonesimulator
env: TERM=dumb
git: git:
submodules: true submodules: true

5
MasterPassword/C/build
View File

@ -2,6 +2,8 @@
# #
# TROUBLESHOOTING # TROUBLESHOOTING
# - To enable verbose algorithm/implementation debugging, use ./build -DDEBUG # - 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'', # - If you see 'undefined reference to `clock_gettime'',
# try ./build -lrt instead. # try ./build -lrt instead.
# - If you see 'x86.S:202: Error: junk at end of line, first unrecognized character is `,'', # - If you see 'x86.S:202: Error: junk at end of line, first unrecognized character is `,'',
@ -245,6 +247,9 @@ mpw-bench() {
### TARGETS ### TARGETS
haslib() {
LC_ALL=C cc -l"$1" 2>&1 | ! grep -q 'library not found'
}
cc() { cc() {
if hash llvm-gcc 2>/dev/null; then if hash llvm-gcc 2>/dev/null; then
llvm-gcc "$@" llvm-gcc "$@"

3
MasterPassword/ObjC/Mac/MPMacAppDelegate.m
View File

@ -109,8 +109,7 @@ static OSStatus MPHotKeyHander(EventHandlerCallRef nextHandler, EventRef theEven
// Global hotkey. // Global hotkey.
EventHotKeyRef hotKeyRef; EventHotKeyRef hotKeyRef;
EventTypeSpec hotKeyEvents[1] = { { .eventClass = kEventClassKeyboard, .eventKind = kEventHotKeyPressed } }; EventTypeSpec hotKeyEvents[1] = { { .eventClass = kEventClassKeyboard, .eventKind = kEventHotKeyPressed } };
OSStatus status = InstallApplicationEventHandler( NewEventHandlerUPP( MPHotKeyHander ), GetEventTypeCount( hotKeyEvents ), OSStatus status = InstallApplicationEventHandler( NewEventHandlerUPP( MPHotKeyHander ), GetEventTypeCount( hotKeyEvents ), hotKeyEvents, (__bridge void *)self, NULL );
hotKeyEvents, (__bridge void *)self, NULL );
if (status != noErr) if (status != noErr)
err( @"Error installing application event handler: %i", (int)status ); err( @"Error installing application event handler: %i", (int)status );
status = RegisterEventHotKey( 35 /* p */, controlKey + cmdKey, MPShowHotKey, GetApplicationEventTarget(), 0, &hotKeyRef ); status = RegisterEventHotKey( 35 /* p */, controlKey + cmdKey, MPShowHotKey, GetApplicationEventTarget(), 0, &hotKeyRef );

2
Scripts/genassets
View File

@ -56,7 +56,6 @@ copyImage() {
local src=$1 dst=$2 local src=$1 dst=$2
if [[ $src = *.9.png || $src = *.9@*.png ]]; then if [[ $src = *.9.png || $src = *.9@*.png ]]; then
exit
pinf '%s -> %s (ninepatch)' "${src##*/}" "${dst##*/}" pinf '%s -> %s (ninepatch)' "${src##*/}" "${dst##*/}"
niftyNinePatch=$(java -Dapple.awt.UIElement=true -jar Scripts/NiftyNinePatchHelper.jar "$src" "$dst") || return niftyNinePatch=$(java -Dapple.awt.UIElement=true -jar Scripts/NiftyNinePatchHelper.jar "$src" "$dst") || return
while IFS='=' read var value; do while IFS='=' read var value; do
@ -68,7 +67,6 @@ exit
done <<< "$niftyNinePatch" done <<< "$niftyNinePatch"
fnip fnip
else else
exit
pinf '%s -> %s' "${src##*/}" "${dst##*/}" pinf '%s -> %s' "${src##*/}" "${dst##*/}"
cp "$src" "$dst" cp "$src" "$dst"
fnip fnip