mirror of
https://github.com/arsenetar/dupeguru.git
synced 2026-02-02 03:21:39 +00:00
Update to Sparkle 1.14
This commit is contained in:
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -7,3 +7,6 @@
|
|||||||
[submodule "cocoalib"]
|
[submodule "cocoalib"]
|
||||||
path = cocoalib
|
path = cocoalib
|
||||||
url = https://github.com/hsoft/cocoalib.git
|
url = https://github.com/hsoft/cocoalib.git
|
||||||
|
[submodule "cocoa/Sparkle"]
|
||||||
|
path = cocoa/Sparkle
|
||||||
|
url = https://github.com/sparkle-project/Sparkle.git
|
||||||
|
|||||||
8
build.py
8
build.py
@@ -106,6 +106,12 @@ def build_xibless(dest='cocoa/autogen'):
|
|||||||
)
|
)
|
||||||
|
|
||||||
def build_cocoa(dev):
|
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")
|
print("Creating OS X app structure")
|
||||||
app = cocoa_app()
|
app = cocoa_app()
|
||||||
app_version = get_module_version('core')
|
app_version = get_module_version('core')
|
||||||
@@ -154,7 +160,7 @@ def build_cocoa(dev):
|
|||||||
image_path = 'cocoa/dupeguru.icns'
|
image_path = 'cocoa/dupeguru.icns'
|
||||||
resources = [image_path, 'cocoa/dsa_pub.pem', 'build/dg_cocoa.py', 'build/help']
|
resources = [image_path, 'cocoa/dsa_pub.pem', 'build/dg_cocoa.py', 'build/help']
|
||||||
app.copy_resources(*resources, use_symlinks=dev)
|
app.copy_resources(*resources, use_symlinks=dev)
|
||||||
app.copy_frameworks('build/Python', 'cocoalib/Sparkle.framework')
|
app.copy_frameworks('build/Python', sparkle_framework_path)
|
||||||
print("Creating the run.py file")
|
print("Creating the run.py file")
|
||||||
tmpl = open('cocoa/run_template.py', 'rt').read()
|
tmpl = open('cocoa/run_template.py', 'rt').read()
|
||||||
run_contents = tmpl.replace('{{app_path}}', app.dest)
|
run_contents = tmpl.replace('{{app_path}}', app.dest)
|
||||||
|
|||||||
1
cocoa/Sparkle
Submodule
1
cocoa/Sparkle
Submodule
Submodule cocoa/Sparkle added at 1c8d54166b
@@ -30,9 +30,8 @@ def configure(conf):
|
|||||||
conf.check_python_headers()
|
conf.check_python_headers()
|
||||||
conf.env.FRAMEWORK_COCOA = 'Cocoa'
|
conf.env.FRAMEWORK_COCOA = 'Cocoa'
|
||||||
conf.env.ARCH_COCOA = ['x86_64']
|
conf.env.ARCH_COCOA = ['x86_64']
|
||||||
# Add cocoalib dir to the framework search path so we can find Sparkle.
|
conf.env.CFLAGS = ['-F'+op.abspath('Sparkle/build/Release')]
|
||||||
conf.env.CFLAGS = ['-F'+op.abspath('../cocoalib')]
|
conf.env.LINKFLAGS = ['-F'+op.abspath('Sparkle/build/Release')]
|
||||||
conf.env.LINKFLAGS = ['-F'+op.abspath('../cocoalib')]
|
|
||||||
|
|
||||||
def build(ctx):
|
def build(ctx):
|
||||||
# What do we compile?
|
# What do we compile?
|
||||||
|
|||||||
2
cocoalib
2
cocoalib
Submodule cocoalib updated: 65ab3b5fb6...bb41785aaa
Reference in New Issue
Block a user