arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2024-11-14 03:29:02 +00:00
Code Releases Wiki Activity

Removed a needless cocoa build step.

Browse Source 
Previously, dependencies were collected in "build/py" and then copied into OS X app's Resources folder. Now, dependencies are collected direcly in the Resources folder.
This commit is contained in:
Virgil Dupras 2012-08-02 15:23:17 -04:00
parent c5c4e02bf4
commit d90764a9ea
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build.py
View File

@ -98,8 +98,9 @@ def build_cocoa(edition, dev):
print("Building the cocoa layer") print("Building the cocoa layer")
from pluginbuilder import copy_embeddable_python_dylib, collect_dependencies from pluginbuilder import copy_embeddable_python_dylib, collect_dependencies
copy_embeddable_python_dylib('build') copy_embeddable_python_dylib('build')
if not op.exists('build/py'): pydep_folder = op.join(app.resources, 'py')
os.mkdir('build/py') if not op.exists(pydep_folder):
os.mkdir(pydep_folder)
shutil.copy(op.join(cocoa_project_path, 'dg_cocoa.py'), 'build') shutil.copy(op.join(cocoa_project_path, 'dg_cocoa.py'), 'build')
specific_packages = { specific_packages = {
'se': ['core_se'], 'se': ['core_se'],
@ -109,13 +110,13 @@ def build_cocoa(edition, dev):
tocopy = ['core', 'hscommon', 'cocoa/inter', 'cocoalib/cocoa'] + specific_packages tocopy = ['core', 'hscommon', 'cocoa/inter', 'cocoalib/cocoa'] + specific_packages
copy_packages(tocopy, 'build') copy_packages(tocopy, 'build')
sys.path.insert(0, 'build') sys.path.insert(0, 'build')
collect_dependencies('build/dg_cocoa.py', 'build/py', excludes=['PyQt4']) collect_dependencies('build/dg_cocoa.py', pydep_folder, excludes=['PyQt4'])
del sys.path[0] del sys.path[0]
if dev: if dev:
copy_packages(tocopy, 'build/py', create_links=True) copy_packages(tocopy, pydep_folder, create_links=True)
# Views are not referenced by python code, so they're not found by the collector. # Views are not referenced by python code, so they're not found by the collector.
copy_all('build/inter/*.so', 'build/py/inter') copy_all('build/inter/*.so', op.join(pydep_folder, 'inter'))
copy_sysconfig_files_for_embed('build/py') copy_sysconfig_files_for_embed(pydep_folder)
print("Compiling with WAF") print("Compiling with WAF")
os.chdir('cocoa') os.chdir('cocoa')
print_and_do(cocoa_compile_command(edition)) print_and_do(cocoa_compile_command(edition))
@ -123,7 +124,7 @@ def build_cocoa(edition, dev):
app.copy_executable('cocoa/build/dupeGuru') app.copy_executable('cocoa/build/dupeGuru')
print("Copying resources and frameworks") print("Copying resources and frameworks")
image_path = ed('cocoa/{}/dupeguru.icns') image_path = ed('cocoa/{}/dupeguru.icns')
resources = [image_path, 'cocoa/base/dsa_pub.pem', 'build/dg_cocoa.py', 'build/py', 'build/help'] resources = [image_path, 'cocoa/base/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', 'cocoalib/Sparkle.framework')
print("Creating the run.py file") print("Creating the run.py file")