mirror of
https://github.com/arsenetar/dupeguru.git
synced 2025-03-10 05:34:36 +00:00
cocoa: remove Sparkle
It's a deployment headache. Old sparkle versions generate runtime warnings about security and up to date version requires me to compile on 10.10, but after many tries, it seems that I absolutely need to build on my minimum requirements version which is 10.8. So screw Sparkle.
This commit is contained in:
parent
76cc2000ab
commit
79e99db1d3
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -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
|
||||
|
@ -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.
|
||||
|
6
build.py
6
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')
|
||||
|
@ -7,7 +7,6 @@ http://www.gnu.org/licenses/gpl-3.0.html
|
||||
*/
|
||||
|
||||
#import <Cocoa/Cocoa.h>
|
||||
#import <Sparkle/SUUpdater.h>
|
||||
#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;
|
||||
|
@ -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];
|
||||
|
@ -1 +0,0 @@
|
||||
Subproject commit 1c8d54166b7829ec12dc659983c66be2b347d98e
|
@ -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()
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user