diff --git a/pe/cocoa/dupeguru.xcodeproj/project.pbxproj b/pe/cocoa/dupeguru.xcodeproj/project.pbxproj index eeb21896..10b5dd4c 100644 --- a/pe/cocoa/dupeguru.xcodeproj/project.pbxproj +++ b/pe/cocoa/dupeguru.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 44; objects = { /* Begin PBXBuildFile section */ @@ -360,7 +360,7 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */; - compatibilityVersion = "Xcode 3.2"; + compatibilityVersion = "Xcode 3.0"; hasScannedForEncodings = 1; mainGroup = 29B97314FDCFA39411CA2CEA /* dupeguru */; projectDirPath = ""; @@ -480,12 +480,13 @@ C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.5; - SDKROOT = macosx10.5; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"; }; name = Release; }; diff --git a/pe/cocoa/gen.py b/pe/cocoa/gen.py index 06c73e35..60cabb4e 100644 --- a/pe/cocoa/gen.py +++ b/pe/cocoa/gen.py @@ -5,13 +5,15 @@ # which should be included with this package. The terms are also available at # http://www.hardcoded.net/licenses/hs_license +import sys +sys.path.insert(0, 'py') # for hsutil and hsdocgen import os +from help import gen + print "Generating help" -os.chdir('help') -os.system('python -u gen.py') -os.system('/Developer/Applications/Utilities/Help\\ Indexer.app/Contents/MacOS/Help\\ Indexer dupeguru_pe_help') -os.chdir('..') +gen.generate() +os.system('/Developer/Applications/Utilities/Help\\ Indexer.app/Contents/MacOS/Help\\ Indexer help/dupeguru_pe_help') print "Generating py plugin" os.chdir('py') diff --git a/pe/cocoa/py/gen.py b/pe/cocoa/py/gen.py index bd44475f..98225454 100644 --- a/pe/cocoa/py/gen.py +++ b/pe/cocoa/py/gen.py @@ -20,4 +20,4 @@ if op.exists('build'): if op.exists('dist'): shutil.rmtree('dist') -print_and_do('python -u setup.py py2app') \ No newline at end of file +print_and_do('python -u setup.py py2app -A') \ No newline at end of file diff --git a/pe/help/gen.py b/pe/help/gen.py index 5e9c34c2..f5d78df2 100644 --- a/pe/help/gen.py +++ b/pe/help/gen.py @@ -5,8 +5,10 @@ # which should be included with this package. The terms are also available at # http://www.hardcoded.net/licenses/hs_license +import os.path as op from hsdocgen import generate_help, filters def generate(windows=False): tix = filters.tixgen("https://hardcoded.lighthouseapp.com/projects/31699-dupeguru/tickets/{0}") - generate_help.main('.', 'dupeguru_pe_help', force_render=True, tix=tix, windows=windows) + basepath = op.dirname(__file__) + generate_help.main(basepath, op.join(basepath, 'dupeguru_pe_help'), force_render=True, tix=tix, windows=windows)