From d4898270c9670e7680d0aaebc20ccd3646e1e8f7 Mon Sep 17 00:00:00 2001 From: das Date: Wed, 12 Mar 2008 22:18:00 +0000 Subject: * macosx/Wish.xcodeproj/project.pbxproj: add support for Xcode 3.1 * macosx/Wish.xcodeproj/default.pbxuser: CODE_SIGN_IDENTITY and * macosx/Wish-Common.xcconfig: 'xcodebuild install'. --- ChangeLog | 6 ++++++ macosx/Wish-Common.xcconfig | 5 +++-- macosx/Wish.xcodeproj/default.pbxuser | 1 + macosx/Wish.xcodeproj/project.pbxproj | 21 +++++++++++++++++++-- 4 files changed, 29 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b2ea45..73f3a29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-03-12 Daniel Steffen + + * macosx/Wish.xcodeproj/project.pbxproj: add support for Xcode 3.1 + * macosx/Wish.xcodeproj/default.pbxuser: CODE_SIGN_IDENTITY and + * macosx/Wish-Common.xcconfig: 'xcodebuild install'. + 2008-03-12 Joe English * unix/tkUnixRFont.c: Try a fallback font if XftFontOpenPattern() diff --git a/macosx/Wish-Common.xcconfig b/macosx/Wish-Common.xcconfig index 4736c2c..7d210c3 100644 --- a/macosx/Wish-Common.xcconfig +++ b/macosx/Wish-Common.xcconfig @@ -9,14 +9,15 @@ // See the file "license.terms" for information on usage and redistribution // of this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// RCS: @(#) $Id: Wish-Common.xcconfig,v 1.9 2008/03/11 22:33:22 das Exp $ +// RCS: @(#) $Id: Wish-Common.xcconfig,v 1.10 2008/03/12 22:18:01 das Exp $ // HEADER_SEARCH_PATHS = $(TK_SRCROOT)/generic $(TK_SRCROOT)/xlib "$(DERIVED_FILE_DIR)/tcl" "$(DERIVED_FILE_DIR)/tk" $(HEADER_SEARCH_PATHS) REZ_SEARCH_PATHS = $(TK_SRCROOT)/generic $(TCL_SRCROOT)/generic $(REZ_SEARCH_PATHS) OTHER_LDFLAGS = -headerpad_max_install_names -sectcreate __TEXT __info_plist "$(DERIVED_FILE_DIR)/tk/Wish-Info.plist" $(OTHER_LDFLAGS) OTHER_LDFLAGS_AQUA = -sectcreate __TEXT __tk_rsrc "$(REZ_COLLECTOR_DIR)/$(PRODUCT_NAME).rsrc" -INSTALL_PATH = "$(BINDIR)" +INSTALL_PATH = $(APPLICATION_INSTALL_PATH) +INSTALL_MODE_FLAG = go-w,a+rX GCC_PREFIX_HEADER = $(DERIVED_FILE_DIR)/tk/tkConfig.h OTHER_CFLAGS = -imacros "$(DERIVED_FILE_DIR)/tcl/tclConfig.h" $(OTHER_CFLAGS) GCC_GENERATE_DEBUGGING_SYMBOLS = YES diff --git a/macosx/Wish.xcodeproj/default.pbxuser b/macosx/Wish.xcodeproj/default.pbxuser index 8783b64..0495782 100644 --- a/macosx/Wish.xcodeproj/default.pbxuser +++ b/macosx/Wish.xcodeproj/default.pbxuser @@ -17,6 +17,7 @@ userBuildSettings = { AUTOCONF = "/usr/local/bin/autoconf-2.59"; AUTOHEADER = "/usr/local/bin/autoheader-2.59"; + CODE_SIGN_IDENTITY = ""; SYMROOT = "${SRCROOT}/../../build/tk"; TCL_SRCROOT = "${SRCROOT}/../../tcl"; TK_SRCROOT = "${SRCROOT}/../../tk"; diff --git a/macosx/Wish.xcodeproj/project.pbxproj b/macosx/Wish.xcodeproj/project.pbxproj index 5579f7f..12f68e1 100644 --- a/macosx/Wish.xcodeproj/project.pbxproj +++ b/macosx/Wish.xcodeproj/project.pbxproj @@ -2097,7 +2097,7 @@ F966C06F08F281DC005CB29B /* Frameworks */, 1AB674ADFE9D54B511CA2CBB /* Products */, ); - comments = "Copyright (c) 2004-2008 Daniel A. Steffen \n\nSee the file \"license.terms\" for information on usage and redistribution of\nthis file, and for a DISCLAIMER OF ALL WARRANTIES.\n\nRCS: @(#) $Id: project.pbxproj,v 1.36 2008/03/11 22:30:57 das Exp $\n"; + comments = "Copyright (c) 2004-2008 Daniel A. Steffen \n\nSee the file \"license.terms\" for information on usage and redistribution of\nthis file, and for a DISCLAIMER OF ALL WARRANTIES.\n\nRCS: @(#) $Id: project.pbxproj,v 1.37 2008/03/12 22:18:02 das Exp $\n"; name = Wish; path = .; sourceTree = SOURCE_ROOT; @@ -3976,12 +3976,14 @@ files = ( ); inputPaths = ( + "${TARGET_TEMP_DIR}/.none", ); outputPaths = ( + "${TARGET_BUILD_DIR}/${WRAPPER_NAME}", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/bash; - shellScript = "gnumake -C \"${TK_SRCROOT}/macosx\" -j \"$(sysctl -n hw.activecpu)\" \"$(echo \"${ACTION}\" | sed -e s/build// -e s/clean/distclean/ -e s/..\\*/\\&-/)${MAKE_TARGET}\" CFLAGS_WARNING=\"${WARNING_CFLAGS}\" CFLAGS_OPTIMIZE=\"-O${GCC_OPTIMIZATION_LEVEL}\" SYMROOT=\"${BUILT_PRODUCTS_DIR}\" OBJ_DIR=\"${OBJECT_FILE_DIR}\" INSTALL_ROOT=\"${DSTROOT}\" PREFIX=\"${PREFIX}\" BINDIR=\"${BINDIR}\" LIBDIR=\"${FRAMEWORK_INSTALL_PATH}\" MANDIR=\"${MANDIR}\" EXTRA_CONFIGURE_ARGS=\"${CONFIGURE_ARGS}\" APPLICATION_INSTALL_PATH=\"${APPLICATION_INSTALL_PATH}\" TCL_BUILD_DIR=\"${TCL_BUILD_DIR}\" TCL_FRAMEWORK_DIR=\"${TCL_FRAMEWORK_DIR}\" ${EXTRA_MAKE_FLAGS}\nresult=$?\nif [ -e \"${BUILT_PRODUCTS_DIR}/tktest\" ]; then\n\trm -f \"${BUILT_PRODUCTS_DIR}/tktest\"\nfi\necho \"Done\"\nexit ${result}\n"; + shellScript = "gnumake -C \"${TK_SRCROOT}/macosx\" -j \"$(sysctl -n hw.activecpu)\" \"$(echo \"${ACTION}\" | sed -e s/build// -e s/clean/distclean/ -e s/..\\*/\\&-/)${MAKE_TARGET}\" CFLAGS_WARNING=\"${WARNING_CFLAGS}\" CFLAGS_OPTIMIZE=\"-O${GCC_OPTIMIZATION_LEVEL}\" SYMROOT=\"${BUILT_PRODUCTS_DIR}\" OBJ_DIR=\"${OBJECT_FILE_DIR}\" INSTALL_ROOT=\"${DSTROOT}\" PREFIX=\"${PREFIX}\" BINDIR=\"${BINDIR}\" LIBDIR=\"${FRAMEWORK_INSTALL_PATH}\" MANDIR=\"${MANDIR}\" EXTRA_CONFIGURE_ARGS=\"${CONFIGURE_ARGS}\" APPLICATION_INSTALL_PATH=\"${APPLICATION_INSTALL_PATH}\" TCL_BUILD_DIR=\"${TCL_BUILD_DIR}\" TCL_FRAMEWORK_DIR=\"${TCL_FRAMEWORK_DIR}\" ${EXTRA_MAKE_FLAGS}\nresult=$?\nif [ -e \"${BUILT_PRODUCTS_DIR}/tktest\" ]; then\n\trm -f \"${BUILT_PRODUCTS_DIR}/tktest\"\nfi\necho \"Done\"\nrm -f \"${SCRIPT_INPUT_FILE_0}\"\nexit ${result}\n"; showEnvVarsInLog = 0; }; F9A5C5F508F651A2008AE941 /* ShellScript */ = { @@ -4664,6 +4666,7 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = Wish; + SKIP_INSTALL = NO; }; name = ReleaseUniversal; }; @@ -4696,6 +4699,7 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = Wish; + SKIP_INSTALL = NO; }; name = DebugMemCompile; }; @@ -4724,6 +4728,7 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = Wish; + SKIP_INSTALL = NO; }; name = Debug; }; @@ -4731,6 +4736,7 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = Wish; + SKIP_INSTALL = NO; }; name = Release; }; @@ -4738,6 +4744,7 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = Wish; + SKIP_INSTALL = NO; }; name = DebugNoFixZL; }; @@ -4919,6 +4926,7 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = Wish; + SKIP_INSTALL = NO; }; name = "Debug gcc42"; }; @@ -4957,6 +4965,7 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = Wish; + SKIP_INSTALL = NO; }; name = "Debug llvmgcc42"; }; @@ -4999,6 +5008,7 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = Wish; + SKIP_INSTALL = NO; }; name = "ReleaseUniversal gcc42"; }; @@ -5037,6 +5047,7 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = Wish; + SKIP_INSTALL = NO; }; name = "ReleaseUniversal llvmgcc42"; }; @@ -5055,6 +5066,7 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = Wish; + SKIP_INSTALL = NO; }; name = DebugUnthreaded; }; @@ -5062,6 +5074,7 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = Wish; + SKIP_INSTALL = NO; }; name = DebugLeaks; }; @@ -5114,6 +5127,7 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = Wish; + SKIP_INSTALL = NO; }; name = ReleaseUniversal10.4uSDK; }; @@ -5149,6 +5163,7 @@ buildSettings = { LDFLAGS = "-force_cpusubtype_ALL $(LDFLAGS)"; PRODUCT_NAME = Wish; + SKIP_INSTALL = NO; }; name = ReleasePPC10.3.9SDK; }; @@ -5180,6 +5195,7 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = Wish; + SKIP_INSTALL = NO; }; name = ReleasePPC10.2.8SDK; }; @@ -5219,6 +5235,7 @@ isa = XCBuildConfiguration; buildSettings = { PRODUCT_NAME = Wish; + SKIP_INSTALL = NO; }; name = ReleaseUniversal10.5SDK; }; -- cgit v0.12