diff --git a/.gitmodules b/.gitmodules index 9da27ac0..5a80a95c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,3 @@ [submodule "cocoalib"] path = cocoalib url = https://github.com/hsoft/cocoalib.git -[submodule "cocoa/Sparkle"] - path = cocoa/Sparkle - url = https://github.com/sparkle-project/Sparkle.git diff --git a/README.md b/README.md index e98aea89..2757230a 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,6 @@ This folder contains the source for dupeGuru. Its documentation is in `help`, bu There are also other sub-folder that comes from external repositories and are part of this repo as git submodules: -* Sparkle: An auto-update library for the OS X version. * hscommon: A collection of helpers used across HS applications. * cocoalib: A collection of helpers used across Cocoa UI codebases of HS applications. * qtlib: A collection of helpers used across Qt UI codebases of HS applications. diff --git a/build.py b/build.py index 12c3f6e5..35c56cfc 100644 --- a/build.py +++ b/build.py @@ -106,12 +106,6 @@ def build_xibless(dest='cocoa/autogen'): ) def build_cocoa(dev): - sparkle_framework_path = op.join('cocoa', 'Sparkle', 'build', 'Release', 'Sparkle.framework') - if not op.exists(sparkle_framework_path): - print("Building Sparkle") - os.chdir(op.join('cocoa', 'Sparkle')) - print_and_do('make build') - os.chdir(op.join('..', '..')) print("Creating OS X app structure") app = cocoa_app() app_version = get_module_version('core') diff --git a/cocoa/AppDelegate.h b/cocoa/AppDelegate.h index 43df44c8..63a6c1fd 100644 --- a/cocoa/AppDelegate.h +++ b/cocoa/AppDelegate.h @@ -7,7 +7,6 @@ http://www.gnu.org/licenses/gpl-3.0.html */ #import -#import #import "PyDupeGuru.h" #import "ResultWindow.h" #import "ResultTable.h" @@ -24,7 +23,6 @@ http://www.gnu.org/licenses/gpl-3.0.html { NSMenu *recentResultsMenu; NSMenu *columnsMenu; - SUUpdater *updater; PyDupeGuru *model; ResultWindow *_resultWindow; @@ -41,7 +39,6 @@ http://www.gnu.org/licenses/gpl-3.0.html @property (readwrite, retain) NSMenu *recentResultsMenu; @property (readwrite, retain) NSMenu *columnsMenu; -@property (readwrite, retain) SUUpdater *updater; /* Virtual */ + (NSDictionary *)defaultPreferences; diff --git a/cocoa/AppDelegate.m b/cocoa/AppDelegate.m index c0c24723..59fe9334 100644 --- a/cocoa/AppDelegate.m +++ b/cocoa/AppDelegate.m @@ -22,7 +22,6 @@ http://www.gnu.org/licenses/gpl-3.0.html @synthesize recentResultsMenu; @synthesize columnsMenu; -@synthesize updater; + (NSDictionary *)defaultPreferences { @@ -70,7 +69,6 @@ http://www.gnu.org/licenses/gpl-3.0.html self = [super init]; model = [[PyDupeGuru alloc] init]; [model bindCallback:createCallback(@"DupeGuruView", self)]; - [self setUpdater:[SUUpdater sharedUpdater]]; NSMutableIndexSet *contentsIndexes = [NSMutableIndexSet indexSet]; [contentsIndexes addIndex:1]; [contentsIndexes addIndex:2]; @@ -92,12 +90,6 @@ http://www.gnu.org/licenses/gpl-3.0.html // We can only finalize initialization once the main menu has been created, which cannot happen // before AppDelegate is created. NSUserDefaults *ud = [NSUserDefaults standardUserDefaults]; - /* Because the pref pane is lazily loaded, we have to manually do the update check if the - preference is set. - */ - if ([ud boolForKey:@"SUEnableAutomaticChecks"]) { - [[SUUpdater sharedUpdater] checkForUpdatesInBackground]; - } _recentResults = [[HSRecentFiles alloc] initWithName:@"recentResults" menu:recentResultsMenu]; [_recentResults setDelegate:self]; _directoryPanel = [[DirectoryPanel alloc] initWithParentApp:self]; diff --git a/cocoa/Sparkle b/cocoa/Sparkle deleted file mode 160000 index 1c8d5416..00000000 --- a/cocoa/Sparkle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1c8d54166b7829ec12dc659983c66be2b347d98e diff --git a/cocoa/ui/main_menu.py b/cocoa/ui/main_menu.py index 4c6a8ce3..5b0e74bc 100644 --- a/cocoa/ui/main_menu.py +++ b/cocoa/ui/main_menu.py @@ -12,7 +12,6 @@ windowMenu = result.addMenu("Window") helpMenu = result.addMenu("Help") appMenu.addItem("About dupeGuru", Action(owner, 'showAboutBox')) -appMenu.addItem("Check for update...", Action(owner.updater, 'checkForUpdates:')) appMenu.addSeparator() appMenu.addItem("Preferences...", Action(owner, 'showPreferencesPanel'), 'cmd+,') appMenu.addSeparator() diff --git a/cocoa/wscript b/cocoa/wscript index bd7f58a9..ee4f0d8b 100644 --- a/cocoa/wscript +++ b/cocoa/wscript @@ -31,8 +31,6 @@ def configure(conf): conf.env.FRAMEWORK_COCOA = 'Cocoa' conf.env.ARCH_COCOA = ['x86_64'] conf.env.MACOSX_DEPLOYMENT_TARGET = '10.8' - conf.env.CFLAGS = ['-F'+op.abspath('Sparkle/build/Release')] - conf.env.LINKFLAGS = ['-F'+op.abspath('Sparkle/build/Release')] def build(ctx): # What do we compile? @@ -62,7 +60,7 @@ def build(ctx): # Because our python lib's install name is "@rpath/Python", we need to set the executable's # rpath. Fortunately, WAF supports it and we just need to supply the "rpath" argument. rpath = '@executable_path/../Frameworks', - framework = ['Sparkle', 'Quartz'], + framework = ['Quartz'], ) from waflib import TaskGen