Permalink
Browse files

Updated prefpane build to handle current pre-hackday Playdar

Also automated sparkle steps

Also run tagger after scan so Boffin will work
  • Loading branch information...
1 parent 01a140e commit f7b5b1994037ac32447077855aa07c2e82c53565 @mxcl committed Jul 10, 2009
Showing with 115 additions and 151 deletions.
  1. +3 −3 .gitignore
  2. +2 −10 English.lproj/main.xib
  3. +2 −2 Info.plist
  4. +95 −117 {playdar.prefPane.xcodeproj → Playdar.prefPane.xcodeproj}/project.pbxproj
  5. +0 −15 install_name_tool.rb
  6. +10 −3 main.m
  7. +3 −1 scanner.sh
View
@@ -1,3 +1,3 @@
-playdar.prefPane.xcodeproj/*.mode*v3
-playdar.prefPane.xcodeproj/*.pbxuser
-build
+/Playdar.prefPane.xcodeproj/*.mode*v3
+/Playdar.prefPane.xcodeproj/*.pbxuser
+/build/
View
@@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">9G55</string>
+ <string key="IBDocument.SystemVersion">9J61</string>
<string key="IBDocument.InterfaceBuilderVersion">670</string>
- <string key="IBDocument.AppKitVersion">949.43</string>
+ <string key="IBDocument.AppKitVersion">949.46</string>
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -653,14 +653,6 @@ ARcABAAAAAEAAAACARwAAwAAAAEAAQAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">resume_text</string>
- <reference key="source" ref="294453543"/>
- <reference key="destination" ref="1034468664"/>
- </object>
- <int key="connectionID">285</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">demos</string>
<reference key="source" ref="294453543"/>
<reference key="destination" ref="480942105"/>
View
@@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
- <string>playdar.prefPane</string>
+ <string>PlaydarPrefPanePlugin</string>
<key>CFBundleIconFile</key>
<string>playdar.icns</string>
<key>CFBundleIdentifier</key>
@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleVersion</key>
- <string>0.1.4</string>
+ <string>0.1.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>NSMainNibFile</key>

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -1,15 +0,0 @@
-#!/usr/bin/ruby
-
-def opt( f )
- lines = `otool -L #{f}`.split( "\n" )
- lines.shift
- lines.each do |line|
- path = line.strip.split[0]
- yield( path, "@executable_path/#{File.basename( path )}" ) if path.match( '^/opt' )
- end
-end
-
-Dir['*'].each do |f|
- `install_name_tool -id #{f} #{f}` if File.extname( f ) == '.dylib'
- opt( f ) { |from, to| `install_name_tool -change #{from} #{to} #{f}` }
-end
View
13 main.m
@@ -87,16 +87,19 @@ @implementation OrgPlaydarPreferencePane
-(void)mainViewDidLoad
{
NSFileManager* fm = [NSFileManager defaultManager];
- if([fm fileExistsAtPath:daemon_script_path()] == false)
+ NSString* scriptpath = daemon_script_path();
+ if([fm fileExistsAtPath:scriptpath] == false){
+ [fm createDirectoryAtPath:[scriptpath stringByDeletingLastPathComponent] attributes:nil];
[self writeDaemonScript];
+ }
NSString* ini = ini_path();
if([fm fileExistsAtPath:ini] == false){
NSArray* args = [NSArray arrayWithObjects: fullname(), db_path(), ini, nil];
[self execScript:@"playdar.conf.rb" withArgs:args];
}
[[popup menu] addItem:[NSMenuItem separatorItem]];
- [[[popup menu] addItemWithTitle:@"Other..." action:@selector(onSelect:) keyEquivalent:@""] setTarget:self];
+ [[[popup menu] addItemWithTitle:@"Other" action:@selector(onSelect:) keyEquivalent:@""] setTarget:self];
NSString* home = NSHomeDirectory();
[self addFolder:[home stringByAppendingPathComponent:@"Music"] setSelected:true];
@@ -292,7 +295,11 @@ -(NSTask*)execScript:(NSString*)script_name withArgs:(NSArray*)args
}
@catch (NSException* e)
{
- [[NSAlert alertWithMessageText:[e reason]] runModal];
+ [[NSAlert alertWithMessageText:[e reason]
+ defaultButton:nil
+ alternateButton:nil
+ otherButton:nil
+ informativeTextWithFormat:nil] runModal];
}
return task;
}
View
@@ -9,6 +9,8 @@ sqlite3 "$2" < schema.sql
# go
tmp=`mktemp -t playdar`
-echo "'"`pwd`"/../MacOS/scanner' '$2' '$1'; rm '$tmp'" >> "$tmp"
+echo "'"`pwd`"/../MacOS/scanner' '$2' '$1'" > "$tmp"
+echo "'"`pwd`"/../MacOS/tagger' '$2' '$d/boffin.db'" >> "$tmp"
+echo "rm '$tmp'" >> "$tmp"
chmod u+x "$tmp"
open -a Terminal "$tmp"

0 comments on commit f7b5b19

Please sign in to comment.