diff --git a/.hgignore b/.hgignore index a8fdf8e5..0c6079b7 100644 --- a/.hgignore +++ b/.hgignore @@ -15,6 +15,7 @@ install installer_tmp-cache cocoa/*/Info.plist cocoa/*/build +cocoa/*/*.app cocoa/*/dg_cocoa.plugin cocoa/*/fr.lproj/*.xib cocoa/*/de.lproj/*.xib diff --git a/build.py b/build.py index b291bf9a..11457162 100644 --- a/build.py +++ b/build.py @@ -78,12 +78,11 @@ def build_cocoa(edition, dev): os.system('xcodebuild {0}'.format(args)) os.chdir('../..') print("Creating the run.py file") - subfolder = 'dev' if dev else 'release' app_path = { - 'se': 'cocoa/se/build/{0}/dupeGuru.app', - 'me': 'cocoa/me/build/{0}/dupeGuru\\ ME.app', - 'pe': 'cocoa/pe/build/{0}/dupeGuru\\ PE.app', - }[edition].format(subfolder) + 'se': 'cocoa/se/dupeGuru.app', + 'me': 'cocoa/me/dupeGuru\\ ME.app', + 'pe': 'cocoa/pe/dupeGuru\\ PE.app', + }[edition] tmpl = open('run_template_cocoa.py', 'rt').read() run_contents = tmpl.replace('{{app_path}}', app_path) open('run.py', 'wt').write(run_contents) diff --git a/cocoa/me/dupeguru.xcodeproj/project.pbxproj b/cocoa/me/dupeguru.xcodeproj/project.pbxproj index 971053bd..9594db90 100644 --- a/cocoa/me/dupeguru.xcodeproj/project.pbxproj +++ b/cocoa/me/dupeguru.xcodeproj/project.pbxproj @@ -816,9 +816,12 @@ C01FCF4C08A954540054247B /* release */ = { isa = XCBuildConfiguration; buildSettings = { + DEPLOYMENT_LOCATION = YES; + DEPLOYMENT_POSTPROCESSING = YES; + DSTROOT = /; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; + INSTALL_PATH = "$(PROJECT_DIR)"; PRODUCT_NAME = "dupeGuru ME"; WRAPPER_EXTENSION = app; }; @@ -851,8 +854,11 @@ CED596C6111AF56D00C0CF2B /* dev */ = { isa = XCBuildConfiguration; buildSettings = { + DEPLOYMENT_LOCATION = YES; + DEPLOYMENT_POSTPROCESSING = YES; + DSTROOT = /; INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; + INSTALL_PATH = "$(PROJECT_DIR)"; PRODUCT_NAME = "dupeGuru ME"; WRAPPER_EXTENSION = app; }; diff --git a/cocoa/pe/dupeguru.xcodeproj/project.pbxproj b/cocoa/pe/dupeguru.xcodeproj/project.pbxproj index 7c95b78f..413d2acd 100644 --- a/cocoa/pe/dupeguru.xcodeproj/project.pbxproj +++ b/cocoa/pe/dupeguru.xcodeproj/project.pbxproj @@ -823,8 +823,12 @@ C01FCF4C08A954540054247B /* release */ = { isa = XCBuildConfiguration; buildSettings = { + DEPLOYMENT_LOCATION = YES; + DEPLOYMENT_POSTPROCESSING = YES; + DSTROOT = /; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(PROJECT_DIR)"; PRODUCT_NAME = "dupeGuru PE"; WRAPPER_EXTENSION = app; }; @@ -857,7 +861,11 @@ CEE00FF1111AF37400BC1A77 /* dev */ = { isa = XCBuildConfiguration; buildSettings = { + DEPLOYMENT_LOCATION = YES; + DEPLOYMENT_POSTPROCESSING = YES; + DSTROOT = /; INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(PROJECT_DIR)"; PRODUCT_NAME = "dupeGuru PE"; WRAPPER_EXTENSION = app; }; diff --git a/cocoa/se/dupeguru.xcodeproj/project.pbxproj b/cocoa/se/dupeguru.xcodeproj/project.pbxproj index 2d1e5186..14e775a8 100644 --- a/cocoa/se/dupeguru.xcodeproj/project.pbxproj +++ b/cocoa/se/dupeguru.xcodeproj/project.pbxproj @@ -804,8 +804,12 @@ C01FCF4C08A954540054247B /* release */ = { isa = XCBuildConfiguration; buildSettings = { + DEPLOYMENT_LOCATION = YES; + DEPLOYMENT_POSTPROCESSING = YES; + DSTROOT = /; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(PROJECT_DIR)"; PRODUCT_NAME = dupeGuru; WRAPPER_EXTENSION = app; }; @@ -838,7 +842,11 @@ CE85E850111AF63D00187B0D /* dev */ = { isa = XCBuildConfiguration; buildSettings = { + DEPLOYMENT_LOCATION = YES; + DEPLOYMENT_POSTPROCESSING = YES; + DSTROOT = /; INFOPLIST_FILE = Info.plist; + INSTALL_PATH = "$(PROJECT_DIR)"; PRODUCT_NAME = dupeGuru; WRAPPER_EXTENSION = app; }; diff --git a/package.py b/package.py index d71ca4fd..dce2780a 100644 --- a/package.py +++ b/package.py @@ -19,9 +19,9 @@ from hscommon.build import (build_dmg, add_to_pythonpath, print_and_do, copy_pac def package_cocoa(edition): app_path = { - 'se': 'cocoa/se/build/release/dupeGuru.app', - 'me': 'cocoa/me/build/release/dupeGuru ME.app', - 'pe': 'cocoa/pe/build/release/dupeGuru PE.app', + 'se': 'cocoa/se/dupeGuru.app', + 'me': 'cocoa/me/dupeGuru ME.app', + 'pe': 'cocoa/pe/dupeGuru PE.app', }[edition] build_dmg(app_path, '.')