diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | macosx/Makefile | 18 | ||||
| -rw-r--r-- | macosx/README | 46 | ||||
| -rw-r--r-- | macosx/Wish.pbproj/jingham.pbxuser | 1415 | ||||
| -rw-r--r-- | macosx/Wish.pbproj/project.pbxproj | 31 |
5 files changed, 79 insertions, 1446 deletions
@@ -1,3 +1,18 @@ +2003-07-17 Daniel Steffen <das@users.sourceforge.net> + + * macosx/Makefile: Changes for new tcl buildsystem. + + * macosx/Wish.pbproj/jingham.pbxuser: + * macosx/Wish.pbproj/project.pbxproj: + Changes for new tcl buildsystem. + Changed build to include tk specific html help in Tk.framework + instead of Tcl.framework. + Set default SYMROOT in target options to simplify setting up PB + (manually setting common build folder for tcl & tk no longer needed). + + * macosx/README: Updated info for changes to buildsystem, + html help location and PB setup. + 2003-07-17 Donal K. Fellows <fellowsd@cs.man.ac.uk> * doc/photo.n: [$photo put] has been able to take rectangles of diff --git a/macosx/Makefile b/macosx/Makefile index 3945438..bb5adf6 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -3,17 +3,19 @@ # Simple makefile for building on Mac OS X with the # Project Builder command line tool 'pbxbuild' # -# RCS: @(#) $Id: Makefile,v 1.7.2.1 2003/03/18 13:55:50 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.7.2.2 2003/07/18 01:06:33 das Exp $ # ################################################################################ INSTALL_ROOT ?= BUILD_DIR ?= ${CURDIR}/../../build +SYMROOT ?= ${BUILD_DIR}/${PROJECT} -TCL_FRAMEWORK_DIR ?= ${BUILD_DIR} +TCL_FRAMEWORK_DIR ?= ${BUILD_DIR}/tcl TCLSH_DIR ?= ${TCL_FRAMEWORK_DIR} +PROJECT = tk TARGET = Wish DEVBUILDSTYLE = Development @@ -21,8 +23,9 @@ DEPBUILDSTYLE = Deployment PBXBUILD = /usr/bin/pbxbuild -BUILD = ${PBXBUILD} SYMROOT="${BUILD_DIR}" -target "${TARGET}" \ - TCL_FRAMEWORK_DIR="${TCL_FRAMEWORK_DIR}" TCLSH_DIR="${TCLSH_DIR}" +BUILD = ${PBXBUILD} SYMROOT="${SYMROOT}" -target "${TARGET}" \ + TCL_FRAMEWORK_DIR="${TCL_FRAMEWORK_DIR}" \ + TCLSH_DIR="${TCLSH_DIR}" DEVBUILD = ${BUILD} -buildstyle "${DEVBUILDSTYLE}" DEPBUILD = ${BUILD} -buildstyle "${DEPBUILDSTYLE}" @@ -77,10 +80,6 @@ clean-deploy: ################################################################################ -forceRelink: - @-cd ${BUILD_DIR}; \ - rm -rf Tk.framework Wish\ Shell.app libtkstub8.4.a - cleanup-embedded: @-cd ${INSTALL_ROOT}; \ chmod -RH u+w Library/Frameworks/Tcl.framework; \ @@ -93,7 +92,6 @@ cleanup-embedded: .PHONY: all install embedded clean develop deploy install-develop install-deploy \ embedded-develop embedded-deploy install-embedded-develop install-embedded-deploy \ -clean-develop clean-deploy forceRelink \ -cleanup-embedded +clean-develop clean-deploy cleanup-embedded ################################################################################ diff --git a/macosx/README b/macosx/README index 9cde39c..65380e1 100644 --- a/macosx/README +++ b/macosx/README @@ -1,7 +1,7 @@ TclTkAqua README ---------------- -RCS: @(#) $Id: README,v 1.6.2.1 2003/03/18 13:55:51 das Exp $ +RCS: @(#) $Id: README,v 1.6.2.2 2003/07/18 01:06:33 das Exp $ This is the README file for the Mac OS X native versions of Tcl & Tk. @@ -19,7 +19,7 @@ before asking on the list, many questions have already been answered). but also check the Tcl'ers Wiki for a wealth of information: http://wiki.tcl.tk/ -- The wiki has a page listing known bugs in Mac OS X Tk (and other tips) +- The wiki has a page listing known bugs in Mac OS X Tcl/Tk (and other tips) http://wiki.tcl.tk/MacOS%20X as well as a page with info on building Tcl/Tk on Mac OS X http://wiki.tcl.tk/Steps%20to%20build%20Tcl/Tk%208.4.0%20on%20MacOS%20X @@ -58,11 +58,11 @@ $pkg/Resources/Scripts/pkgIndex.tcl as well as the usual $pkg/pkgIndex.tcl. This allows building extensions as frameworks with all script files contained in the Resources/Scripts directory of the framework. -- Tcl.framework contains the Tcl and Tk documentation in html format in the +- The Tcl and Tk frameworks contain documentation in html format in the standard location for frameworks: Tcl.framework/Resources/English.lproj/Documentation/Reference/Tcl -Tk.framework contains no documentation. No manpages are installed by -default for either tcl or tk. + Tk.framework/Resources/English.lproj/Documentation/Reference/Tk +No manpages are installed by default for either tcl or tk. - the frameworks Tcl.framework and Tk.framework can be placed in any of the system's standard framework directories: @@ -124,10 +124,14 @@ retail or should be present as a disk image on new macs that came with OSX preinstalled. It can also be downloaded from http://connect.apple.com (after you register for free ADC membership). -- Tcl and TkAqua are built as Mac OS X frameworks using Apple's ProjectBuilder -IDE, but you do not have to deal with the IDE if you don't want to: there are -Makefiles available in tcl/macosx and tk/macosx that take care of calling the -ProjectBuilder command line tool with all the details taken care of. +- Tcl is built as a Mac OS X framework via the Makefile in tcl/macosx, but can +also be built from Apple's ProjectBuilder IDE using the Tcl.pbproj project (which +calls through to the Makefile). + +- TkAqua is built as a Mac OS X frameworks using Apple's ProjectBuilder +IDE, but you do not have to deal with the IDE if you don't want to, the +Makefile in tk/macosx takes care of calling the ProjectBuilder command line tool +with all the details taken care of. - Unpack the tcl and tk source release archives and place the tcl and tk source trees in a common parent directory. @@ -198,23 +202,10 @@ Notes: auto_path. Thus you can place tcl extensions in this directory (i.e. embed them in the app package) and load them with [package require]. -- To build from the IDE using the projects directly without going through the -Makefiles you need so setup a common build folder for the projects. A simple way -to achieve this is to make symbolic links - ln -fs ../../build tcl/macosx/build - ln -fs ../../build tk/macosx/build -(this location of the build folder is compatible with the Makefiles). - -Another way is to set the build folder location directly in -tcl/macosx/Tcl.pbproj and tk/macosx/Wish/pbproj using ProjectBuilder's -"Project->Show Info" on the topmost icon in the filelist. Switch to "Place build -products in a separate location" with a setting of "$SRCROOT/../../build" -(this gets stored in Tcl.pbproj/${USER}.pbxuser & Wish.pbproj/${USER}.pbxuser). - -- It is possible to build Tk without a common build folder with Tcl, or even -without the tcl sourcetree itself; but in that case you need to tell the Tk -Makefile where the copies of 'Tcl.framework' and 'tclsh8.4' are located that -you want to build & link against (their default location is the ${BUILD_DIR}). +- It is possible to build Tk without without the tcl sourcetree; but in that +case you need to tell the Tk Makefile where the copies of 'Tcl.framework' and +'tclsh8.4' are located that you want to build & link against +(their default location is ${BUILD_DIR}/tcl). For instance to use their default systemwide install locations: make -C tk${ver}/macosx \ @@ -233,3 +224,6 @@ or to use an earlier install of Tcl into INSTALL_ROOT="${TCLTK}/" : The Makefile variables TCL_FRAMEWORK_DIR and TCLSH_DIR were added in Tk 8.4.3. +Note that html help in Tk.framework is only built if TCL_FRAMEWORK_DIR contains +the tcl Makefile (as is the case for the default value of TCL_FRAMEWORK_DIR). + diff --git a/macosx/Wish.pbproj/jingham.pbxuser b/macosx/Wish.pbproj/jingham.pbxuser index 085c8be..7deb7ad 100644 --- a/macosx/Wish.pbproj/jingham.pbxuser +++ b/macosx/Wish.pbproj/jingham.pbxuser @@ -1,1407 +1,20 @@ // !$*UTF8*$! { - 4C177118040AF24400C916F0 = { - fileReference = F5375555016C376E01DC9062; - isa = PBXFileBreakpoint; - lineNumber = 298; - state = 1; - }; - 4C177121040AF3B400C916F0 = { - fRef = F5375550016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXDialog.c: NavServicesGetFile"; - rLen = 0; - rLoc = 27371; - rType = 0; - vrLen = 1821; - vrLoc = 1768; - }; - 4C177124040AF3B400C916F0 = { - fRef = F5375550016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXDialog.c: NavServicesGetFile"; - rLen = 0; - rLoc = 27371; - rType = 0; - vrLen = 1821; - vrLoc = 1768; - }; - 4C177125040AF3B400C916F0 = { - fRef = F5375555016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXHLEvents.c: 126"; - rLen = 17; - rLoc = 4212; - rType = 0; - vrLen = 1722; - vrLoc = 4; - }; - 4C3B4CF3040B041900C916F0 = { - fileReference = F5375555016C376E01DC9062; - isa = PBXFileBreakpoint; - lineNumber = 298; - state = 1; - }; - 4C3B4CF8040BEBFA00C916F0 = { - fRef = F5375553016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXEvent.c: eventStatus"; - rLen = 0; - rLoc = 6179; - rType = 0; - vrLen = 1402; - vrLoc = 5964; - }; - 4C3B4CF9040BEBFA00C916F0 = { - isa = PBXTargetBookmark; - trg = F53756A0016C4DD401DC9062; - uiCtxt = { - TOCViewDetailVisibleRect = "{{0, 0}, {580, 811}}"; - TOCViewExpandedItems = ( - "com.apple.target-editor-pane.settings", - "com.apple.target-editor-pane.settings.simple", - "com.apple.target-editor-pane.info-plist", - "com.apple.target-editor-pane.info-plist.simple", - "com.apple.target-editor-pane.buildphases", - ); - TOCViewMasterVisibleRect = "{{0, 0}, {229, 811}}"; - TOCViewSelectedItems = ( - "com.apple.target-editor-pane.info-plist.simple", - ); - }; - }; - 4C3B4CFA040BEBFA00C916F0 = { - fRef = F5375539016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXResource.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1172; - vrLoc = 18934; - }; - 4C3B4CFB040BEBFA00C916F0 = { - fRef = F5375534016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXApplication.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1088; - vrLoc = 0; - }; - 4C3B4CFC040BEBFA00C916F0 = { - fRef = F5375533016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkAboutDlg.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1821; - vrLoc = 14127; - }; - 4C3B4CFD040BEBFA00C916F0 = { - fRef = F5375536016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXLibrary.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1005; - vrLoc = 0; - }; - 4C3B4CFE040BEBFA00C916F0 = { - fRef = F537553A016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXXCursors.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1453; - vrLoc = 0; - }; - 4C3B4CFF040BEBFA00C916F0 = { - fRef = F5375535016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXCursors.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1285; - vrLoc = 0; - }; - 4C3B4D00040BEBFA00C916F0 = { - fRef = F5375538016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXMenu.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1049; - vrLoc = 0; - }; - 4C3B4D01040BEBFA00C916F0 = { - fRef = 4C3B4CF6040B18B200C916F0; - isa = PBXTextBookmark; - name = "tkMacOSXAETE.r: 21"; - rLen = 0; - rLoc = 568; - rType = 0; - vrLen = 974; - vrLoc = 492; - }; - 4C3B4D02040BEBFA00C916F0 = { - fRef = F5375555016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXHLEvents.c: TkMacOSXInitAppleEvents"; - rLen = 0; - rLoc = 3804; - rType = 0; - vrLen = 1539; - vrLoc = 2499; - }; - 4C3B4D03040BEBFA00C916F0 = { - fRef = F5375553016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXEvent.c: eventStatus"; - rLen = 0; - rLoc = 6179; - rType = 0; - vrLen = 1402; - vrLoc = 5964; - }; - 4C3B4D04040BEBFA00C916F0 = { - fRef = F5375555016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXHLEvents.c: 126"; - rLen = 17; - rLoc = 4212; - rType = 0; - vrLen = 1722; - vrLoc = 4; - }; - 4C3B4D05040BEBFA00C916F0 = { - isa = PBXTargetBookmark; - trg = F53756A0016C4DD401DC9062; - uiCtxt = { - TOCViewDetailVisibleRect = "{{0, 0}, {580, 811}}"; - TOCViewExpandedItems = ( - "com.apple.target-editor-pane.settings", - "com.apple.target-editor-pane.settings.simple", - "com.apple.target-editor-pane.info-plist", - "com.apple.target-editor-pane.info-plist.simple", - "com.apple.target-editor-pane.buildphases", - ); - TOCViewMasterVisibleRect = "{{0, 0}, {229, 811}}"; - TOCViewSelectedItems = ( - "com.apple.target-editor-pane.info-plist.simple", - ); - }; - }; - 4C3B4D06040BEBFA00C916F0 = { - fRef = F5375534016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXApplication.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1543; - vrLoc = 7169; - }; - 4C3B4D07040BEBFA00C916F0 = { - fRef = F5375536016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXLibrary.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1189; - vrLoc = 18502; - }; - 4C3B4D08040BEBFA00C916F0 = { - fRef = F5375539016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXResource.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1172; - vrLoc = 18934; - }; - 4C3B4D09040BEBFA00C916F0 = { - fRef = F537553A016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXXCursors.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1453; - vrLoc = 0; - }; - 4C3B4D0A040BEBFA00C916F0 = { - fRef = F5375538016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXMenu.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1049; - vrLoc = 0; - }; - 4C3B4D0B040BEBFA00C916F0 = { - fRef = F5375536016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXLibrary.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1192; - vrLoc = 18499; - }; - 4C3B4D0C040BEBFA00C916F0 = { - fRef = F5375534016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXApplication.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1088; - vrLoc = 0; - }; - 4C3B4D0D040BEBFA00C916F0 = { - fRef = F5375533016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkAboutDlg.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1821; - vrLoc = 14127; - }; - 4C3B4D0E040BEBFA00C916F0 = { - fRef = F5375555016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXHLEvents.c: ScriptHandler"; - rLen = 0; - rLoc = 10553; - rType = 0; - vrLen = 1863; - vrLoc = 9972; - }; - 4C3B4D0F040BEBFA00C916F0 = { - fRef = 4C3B4CF6040B18B200C916F0; - isa = PBXTextBookmark; - name = "tkMacOSXAETE.r: 42"; - rLen = 0; - rLoc = 979; - rType = 0; - vrLen = 1021; - vrLoc = 495; - }; - 4C3B4D10040BEBFA00C916F0 = { - fRef = F5375536016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXLibrary.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1005; - vrLoc = 0; - }; - 4C3B4D11040BEBFA00C916F0 = { - fRef = F537553A016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXXCursors.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1453; - vrLoc = 0; - }; - 4C3B4D12040BEBFA00C916F0 = { - fRef = F5375535016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXCursors.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1285; - vrLoc = 0; - }; - 4C3B4D13040BEBFA00C916F0 = { - fRef = F5375538016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXMenu.r: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 1049; - vrLoc = 0; - }; - 4C3B4D14040BEBFA00C916F0 = { - fRef = 4C3B4CF6040B18B200C916F0; - isa = PBXTextBookmark; - name = "tkMacOSXAETE.r: 21"; - rLen = 0; - rLoc = 568; - rType = 0; - vrLen = 974; - vrLoc = 492; - }; - 4C3B4D15040BEBFA00C916F0 = { - fRef = F5375555016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXHLEvents.c: 201"; - rLen = 11; - rLoc = 6300; - rType = 0; - vrLen = 553; - vrLoc = 7239; - }; - 4C3B4D16040BEBFA00C916F0 = { - fRef = F5375555016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXHLEvents.c: 287"; - rLen = 13; - rLoc = 8314; - rType = 0; - vrLen = 721; - vrLoc = 8314; - }; - 4C3B4D17040BEBFA00C916F0 = { - fRef = F5375555016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXHLEvents.c: theFSRef"; - rLen = 0; - rLoc = 10328; - rType = 0; - vrLen = 886; - vrLoc = 10063; - }; - 4C3B4D18040BEBFA00C916F0 = { - fRef = F5375555016C376E01DC9062; - isa = PBXTextBookmark; - rLen = 0; - rLoc = 297; - rType = 1; - }; - 4C3B4D19040BEBFA00C916F0 = { - fRef = F5375555016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXHLEvents.c: ScriptHandler"; - rLen = 0; - rLoc = 8588; - rType = 0; - vrLen = 602; - vrLoc = 8397; - }; - 4C3B4D1A040BEBFA00C916F0 = { - fRef = F5375555016C376E01DC9062; - isa = PBXTextBookmark; - rLen = 0; - rLoc = 347; - rType = 1; - }; - 4C3B4D1B040BEBFA00C916F0 = { - fRef = F5375555016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXHLEvents.c: aliasHandle"; - rLen = 11; - rLoc = 10378; - rType = 0; - vrLen = 1308; - vrLoc = 9662; - }; - 4C864644040AD22700C916F0 = { - fRef = F5375567016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXWm.c: 4468"; - rLen = 17; - rLoc = 135745; - rType = 0; - vrLen = 2539; - vrLoc = 140040; - }; - 4C864645040AD22700C916F0 = { - fRef = F5375558016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXKeyEvent.c: __GXX_ABI_VERSION"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 2261; - vrLoc = 0; - }; - 4C864646040AD22700C916F0 = { - fRef = F537555C016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXMouseEvent.c: 471"; - rLen = 21; - rLoc = 15543; - rType = 0; - vrLen = 1543; - vrLoc = 15543; - }; - 4C864648040AD22700C916F0 = { - fRef = F537555C016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXMouseEvent.c: GeneratePollingEvents"; - rLen = 0; - rLoc = 16956; - rType = 0; - vrLen = 1500; - vrLoc = 15684; - }; - 4C864649040AD22700C916F0 = { - fRef = F5375567016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXWm.c: 4468"; - rLen = 17; - rLoc = 135745; - rType = 0; - vrLen = 2539; - vrLoc = 140040; - }; - 4C86464A040AD22700C916F0 = { - fRef = F5375558016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXKeyEvent.c: __GXX_ABI_VERSION"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 2261; - vrLoc = 0; - }; - 4C86464B040AD22700C916F0 = { - fRef = F537555C016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXMouseEvent.c: GeneratePollingEvents"; - rLen = 0; - rLoc = 16956; - rType = 0; - vrLen = 1503; - vrLoc = 15268; - }; - 4C86464C040AD22700C916F0 = { - fRef = F5375558016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXKeyEvent.c: __GXX_ABI_VERSION"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 2261; - vrLoc = 0; - }; - 4C86464D040AD22700C916F0 = { - fRef = F537555C016C376E01DC9062; - isa = PBXTextBookmark; - name = "tkMacOSXMouseEvent.c: 471"; - rLen = 21; - rLoc = 15543; - rType = 0; - vrLen = 1543; - vrLoc = 15543; - }; F537552A016C352C01DC9062 = { activeBuildStyle = F537552C016C352C01DC9062; - activeExecutable = F53756AB016C4DD401DC9062; + activeExecutable = F9B92F14047876F1006F146B; activeTarget = F53756A0016C4DD401DC9062; - addToTargets = ( - F53756A0016C4DD401DC9062, - ); breakpoints = ( - F5979A0A033DA68401DC9062, - 4C177118040AF24400C916F0, - 4C3B4CF3040B041900C916F0, ); executables = ( - F53756AB016C4DD401DC9062, + F9B92F14047876F1006F146B, ); perUserDictionary = { - PBXPerProjectTemplateStateSaveDate = 67827278; - "PBXTemplateGeometry-F5CA7EC9015C08ED0DCA290F" = { - ContentSize = "{1105, 833}"; - LeftSlideOut = { - Collapsed = NO; - Frame = "{{0, 0}, {1105, 833}}"; - Split0 = { - ActiveTab = 3; - ActiveTabName = PBXProjectFindModule; - Collapsed = NO; - Frame = "{{0, 0}, {1105, 833}}"; - Split0 = { - Frame = "{{0, 301}, {1105, 532}}"; - }; - SplitCount = 1; - Tab0 = { - Frame = "{{0, 0}, {484, 208}}"; - }; - Tab1 = { - Debugger = { - Collapsed = NO; - Frame = "{{0, 0}, {664, 208}}"; - Split0 = { - Frame = "{{0, 24}, {664, 184}}"; - Split0 = { - Frame = "{{0, 0}, {325, 184}}"; - }; - Split1 = { - DebugVariablesTableConfiguration = ( - Name, - 123, - Value, - 85, - Summary, - 96.123, - ); - Frame = "{{334, 0}, {330, 184}}"; - }; - SplitCount = 2; - }; - SplitCount = 1; - Tab0 = { - Frame = "{{0, 0}, {100, 50}}"; - }; - Tab1 = { - Frame = "{{0, 0}, {100, 50}}"; - }; - TabCount = 2; - TabsVisible = YES; - }; - Frame = "{{0, 0}, {664, 208}}"; - LauncherConfigVersion = 7; - }; - Tab2 = { - Frame = "{{0, 0}, {664, 50}}"; - LauncherConfigVersion = 3; - Runner = { - Frame = "{{0, 0}, {664, 50}}"; - }; - }; - Tab3 = { - BuildMessageFrame = "{{0, 0}, {667, 265}}"; - BuildTranscriptFrame = "{{0, 274}, {667, 2}}"; - BuildTranscriptFrameExpanded = YES; - Frame = "{{0, 0}, {665, 298}}"; - }; - Tab4 = { - Frame = "{{0, 0}, {1105, 295}}"; - }; - TabCount = 5; - TabsVisible = NO; - }; - SplitCount = 1; - Tab0 = { - Frame = "{{0, 0}, {313, 531}}"; - GroupTreeTableConfiguration = ( - TargetStatusColumn, - 18, - MainColumn, - 280, - ); - }; - Tab1 = { - ClassesFrame = "{{0, 0}, {280, 398}}"; - ClassesTreeTableConfiguration = ( - PBXBookColumnIdentifier, - 20, - PBXClassColumnIdentifier, - 237, - ); - Frame = "{{0, 0}, {278, 659}}"; - MembersFrame = "{{0, 407}, {280, 252}}"; - MembersTreeTableConfiguration = ( - PBXBookColumnIdentifier, - 20, - PBXMethodColumnIdentifier, - 236, - ); - }; - Tab2 = { - Frame = "{{0, 0}, {200, 100}}"; - }; - Tab3 = { - Frame = "{{0, 0}, {200, 557}}"; - TargetTableConfiguration = ( - ActiveObject, - 16, - ObjectNames, - 202.296, - ); - }; - Tab4 = { - BreakpointsTreeTableConfiguration = ( - breakpointColumn, - 197, - enabledColumn, - 31, - ); - Frame = "{{0, 0}, {250, 100}}"; - }; - TabCount = 5; - TabsVisible = NO; - }; - NavBarShownByDefault = YES; - StatusViewVisible = NO; - Template = F5CA7EC9015C08ED0DCA290F; - ToolbarVisible = YES; - WindowLocation = "{69, 93}"; - }; - "PBXTemplateGeometry-F5CA7ECC015C09990DCA290F" = { - ContentSize = "{980, 839}"; - LeftSlideOut = { - Collapsed = NO; - Frame = "{{0, 23}, {980, 816}}"; - Split0 = { - ActiveTab = 0; - ActiveTabName = PBXDebugSessionModule; - Collapsed = NO; - Frame = "{{0, 0}, {980, 816}}"; - Split0 = { - Frame = "{{0, 214}, {980, 602}}"; - }; - SplitCount = 1; - Tab0 = { - Frame = "{{0, 0}, {773, 267}}"; - }; - Tab1 = { - Debugger = { - ActiveTab = 0; - ActiveTabName = PBXDebugCLIModule; - Collapsed = NO; - Frame = "{{0, 0}, {980, 208}}"; - Split0 = { - Frame = "{{0, 208}, {980, 0}}"; - Split0 = { - Frame = "{{0, 0}, {467, 0}}"; - }; - Split1 = { - DebugVariablesTableConfiguration = ( - Name, - 123, - Value, - 85, - Summary, - 270.123, - ); - Frame = "{{476, 0}, {504, 0}}"; - }; - SplitCount = 2; - }; - SplitCount = 1; - Tab0 = { - Frame = "{{0, 0}, {100, 50}}"; - }; - Tab1 = { - Frame = "{{0, 0}, {980, 184}}"; - }; - TabCount = 2; - TabsVisible = YES; - }; - Frame = "{{0, 0}, {980, 208}}"; - LauncherConfigVersion = 7; - }; - Tab2 = { - Frame = "{{0, 0}, {664, 50}}"; - LauncherConfigVersion = 3; - Runner = { - Frame = "{{0, 0}, {664, 50}}"; - }; - }; - Tab3 = { - BuildMessageFrame = "{{0, 0}, {614, 262}}"; - BuildTranscriptFrame = "{{0, 271}, {614, 2}}"; - BuildTranscriptFrameExpanded = YES; - Frame = "{{0, 0}, {612, 295}}"; - }; - Tab4 = { - Frame = "{{0, 0}, {612, 295}}"; - }; - TabCount = 5; - TabsVisible = NO; - }; - SplitCount = 1; - Tab0 = { - Frame = "{{0, 0}, {313, 531}}"; - GroupTreeTableConfiguration = ( - TargetStatusColumn, - 18, - MainColumn, - 280, - ); - }; - Tab1 = { - ClassesFrame = "{{0, 0}, {280, 398}}"; - ClassesTreeTableConfiguration = ( - PBXBookColumnIdentifier, - 20, - PBXClassColumnIdentifier, - 237, - ); - Frame = "{{0, 0}, {278, 659}}"; - MembersFrame = "{{0, 407}, {280, 252}}"; - MembersTreeTableConfiguration = ( - PBXBookColumnIdentifier, - 20, - PBXMethodColumnIdentifier, - 236, - ); - }; - Tab2 = { - Frame = "{{0, 0}, {200, 100}}"; - }; - Tab3 = { - Frame = "{{0, 0}, {200, 557}}"; - TargetTableConfiguration = ( - ActiveObject, - 16, - ObjectNames, - 202.296, - ); - }; - Tab4 = { - BreakpointsTreeTableConfiguration = ( - breakpointColumn, - 197, - enabledColumn, - 31, - ); - Frame = "{{0, 0}, {250, 100}}"; - }; - TabCount = 5; - TabsVisible = NO; - }; - NavBarShownByDefault = YES; - StatusViewVisible = YES; - Template = F5CA7ECC015C09990DCA290F; - ToolbarVisible = YES; - WindowLocation = "{186, 101}"; - }; - PBXWorkspaceContents = ( - { - LeftSlideOut = { - Split0 = { - Split0 = { - NavContent0 = { - bookmark = 4C3B4D15040BEBFA00C916F0; - history = ( - 4C864644040AD22700C916F0, - 4C864645040AD22700C916F0, - 4C864646040AD22700C916F0, - 4C177121040AF3B400C916F0, - 4C3B4CF8040BEBFA00C916F0, - 4C3B4CF9040BEBFA00C916F0, - 4C3B4CFA040BEBFA00C916F0, - 4C3B4CFB040BEBFA00C916F0, - 4C3B4CFC040BEBFA00C916F0, - 4C3B4CFD040BEBFA00C916F0, - 4C3B4CFE040BEBFA00C916F0, - 4C3B4CFF040BEBFA00C916F0, - 4C3B4D00040BEBFA00C916F0, - 4C3B4D01040BEBFA00C916F0, - 4C3B4D02040BEBFA00C916F0, - ); - prevStack = ( - 4C864648040AD22700C916F0, - 4C864649040AD22700C916F0, - 4C86464A040AD22700C916F0, - 4C86464B040AD22700C916F0, - 4C86464C040AD22700C916F0, - 4C86464D040AD22700C916F0, - 4C177124040AF3B400C916F0, - 4C177125040AF3B400C916F0, - 4C3B4D03040BEBFA00C916F0, - 4C3B4D04040BEBFA00C916F0, - 4C3B4D05040BEBFA00C916F0, - 4C3B4D06040BEBFA00C916F0, - 4C3B4D07040BEBFA00C916F0, - 4C3B4D08040BEBFA00C916F0, - 4C3B4D09040BEBFA00C916F0, - 4C3B4D0A040BEBFA00C916F0, - 4C3B4D0B040BEBFA00C916F0, - 4C3B4D0C040BEBFA00C916F0, - 4C3B4D0D040BEBFA00C916F0, - 4C3B4D0E040BEBFA00C916F0, - 4C3B4D0F040BEBFA00C916F0, - 4C3B4D10040BEBFA00C916F0, - 4C3B4D11040BEBFA00C916F0, - 4C3B4D12040BEBFA00C916F0, - 4C3B4D13040BEBFA00C916F0, - 4C3B4D14040BEBFA00C916F0, - ); - }; - NavContent1 = { - bookmark = 4C3B4D17040BEBFA00C916F0; - history = ( - 4C3B4D16040BEBFA00C916F0, - ); - }; - NavCount = 2; - NavGeometry0 = { - Frame = "{{0, 0}, {848, 428}}"; - NavBarVisible = YES; - }; - NavGeometry1 = { - Frame = "{{0, 437}, {848, 428}}"; - NavBarVisible = YES; - }; - NavSplitVertical = NO; - }; - SplitCount = 1; - Tab1 = { - Debugger = { - Split0 = { - SplitCount = 2; - }; - SplitCount = 1; - TabCount = 2; - }; - LauncherConfigVersion = 7; - }; - Tab2 = { - LauncherConfigVersion = 3; - Runner = { - }; - }; - TabCount = 5; - }; - SplitCount = 1; - Tab1 = { - OptionsSetName = "Default Options"; - }; - TabCount = 5; - }; - }, - { - LeftSlideOut = { - Split0 = { - Split0 = { - NavContent0 = { - bookmark = 4C3B4D19040BEBFA00C916F0; - history = ( - 4C3B4D18040BEBFA00C916F0, - ); - }; - NavCount = 1; - NavGeometry0 = { - Frame = "{{0, 0}, {967, 365}}"; - NavBarVisible = YES; - }; - NavSplitVertical = NO; - }; - SplitCount = 1; - Tab1 = { - Debugger = { - Split0 = { - SplitCount = 2; - }; - SplitCount = 1; - TabCount = 2; - }; - LauncherConfigVersion = 7; - }; - Tab2 = { - LauncherConfigVersion = 3; - Runner = { - }; - }; - TabCount = 5; - }; - SplitCount = 1; - Tab1 = { - OptionsSetName = "Default Options"; - }; - TabCount = 5; - }; - }, - { - LeftSlideOut = { - Split0 = { - Split0 = { - NavContent0 = { - bookmark = 4C3B4D1B040BEBFA00C916F0; - history = ( - 4C3B4D1A040BEBFA00C916F0, - ); - }; - NavCount = 1; - NavGeometry0 = { - Frame = "{{0, 0}, {980, 602}}"; - NavBarVisible = YES; - }; - NavSplitVertical = NO; - }; - SplitCount = 1; - Tab1 = { - Debugger = { - Split0 = { - SplitCount = 2; - }; - SplitCount = 1; - TabCount = 2; - }; - LauncherConfigVersion = 7; - }; - Tab2 = { - LauncherConfigVersion = 3; - Runner = { - }; - }; - TabCount = 5; - }; - SplitCount = 1; - Tab1 = { - OptionsSetName = "Default Options"; - }; - TabCount = 5; - }; - }, - ); - PBXWorkspaceGeometries = ( - { - ContentSize = "{1132, 888}"; - LeftSlideOut = { - ActiveTab = 0; - ActiveTabName = PBXGroupTreeModule; - Collapsed = NO; - Frame = "{{0, 23}, {1132, 865}}"; - Split0 = { - Collapsed = NO; - Frame = "{{284, 0}, {848, 865}}"; - Split0 = { - Frame = "{{0, 0}, {848, 865}}"; - }; - SplitCount = 1; - Tab0 = { - Frame = "{{0, 0}, {681, 289}}"; - }; - Tab1 = { - Debugger = { - Collapsed = NO; - Frame = "{{0, 0}, {681, 150}}"; - Split0 = { - Frame = "{{0, 24}, {681, 126}}"; - Split0 = { - Frame = "{{0, 0}, {333, 126}}"; - }; - Split1 = { - DebugVariablesTableConfiguration = ( - Name, - 123, - Value, - 85, - Summary, - 105.123, - ); - Frame = "{{342, 0}, {339, 126}}"; - }; - SplitCount = 2; - }; - SplitCount = 1; - Tab0 = { - Frame = "{{0, 0}, {100, 50}}"; - }; - Tab1 = { - Frame = "{{0, 0}, {100, 50}}"; - }; - TabCount = 2; - TabsVisible = YES; - }; - Frame = "{{0, 0}, {681, 120}}"; - LauncherConfigVersion = 7; - }; - Tab2 = { - Frame = "{{0, 0}, {681, 234}}"; - LauncherConfigVersion = 3; - Runner = { - Frame = "{{0, 0}, {681, 234}}"; - }; - }; - Tab3 = { - BuildMessageFrame = "{{0, 0}, {683, 205}}"; - BuildTranscriptFrame = "{{0, 214}, {683, 2}}"; - BuildTranscriptFrameExpanded = YES; - Frame = "{{0, 0}, {681, 238}}"; - }; - Tab4 = { - Frame = "{{0, 0}, {612, 295}}"; - }; - TabCount = 5; - TabsVisible = NO; - }; - SplitCount = 1; - Tab0 = { - Frame = "{{0, 0}, {260, 865}}"; - GroupTreeTableConfiguration = ( - SCMStatusColumn, - 22, - TargetStatusColumn, - 18, - MainColumn, - 205, - ); - }; - Tab1 = { - ClassesFrame = "{{0, 0}, {250, 333}}"; - ClassesTreeTableConfiguration = ( - PBXBookColumnIdentifier, - 20, - PBXClassColumnIdentifier, - 207, - ); - Frame = "{{0, 0}, {248, 554}}"; - MembersFrame = "{{0, 342}, {250, 212}}"; - MembersTreeTableConfiguration = ( - PBXBookColumnIdentifier, - 20, - PBXMethodColumnIdentifier, - 206, - ); - }; - Tab2 = { - Frame = "{{0, 0}, {217, 554}}"; - }; - Tab3 = { - Frame = "{{0, 0}, {239, 865}}"; - TargetTableConfiguration = ( - ActiveObject, - 16, - ObjectNames, - 206.296, - ); - }; - Tab4 = { - BreakpointsTreeTableConfiguration = ( - breakpointColumn, - 197, - enabledColumn, - 31, - ); - Frame = "{{0, 0}, {250, 810}}"; - }; - TabCount = 5; - TabsVisible = YES; - }; - NavBarShownByDefault = YES; - StatusViewVisible = YES; - Template = 64ABBB4501FA494900185B06; - ToolbarVisible = YES; - WindowLocation = "{28, 60}"; - }, - { - ContentSize = "{967, 689}"; - LeftSlideOut = { - Collapsed = NO; - Frame = "{{0, 23}, {967, 666}}"; - Split0 = { - ActiveTab = 2; - ActiveTabName = PBXBuildResultsModule; - Collapsed = NO; - Frame = "{{0, 0}, {967, 666}}"; - Split0 = { - Frame = "{{0, 301}, {967, 365}}"; - }; - SplitCount = 1; - Tab0 = { - Frame = "{{0, 0}, {952, 321}}"; - }; - Tab1 = { - Debugger = { - Collapsed = NO; - Frame = "{{0, 0}, {781, 452}}"; - Split0 = { - Frame = "{{0, 24}, {781, 428}}"; - Split0 = { - Frame = "{{0, 0}, {383, 428}}"; - }; - Split1 = { - DebugVariablesTableConfiguration = ( - Name, - 123, - Value, - 85, - Summary, - 155.123, - ); - Frame = "{{392, 0}, {389, 428}}"; - }; - SplitCount = 2; - }; - SplitCount = 1; - Tab0 = { - Frame = "{{0, 0}, {100, 50}}"; - }; - Tab1 = { - Frame = "{{0, 0}, {100, 50}}"; - }; - TabCount = 2; - TabsVisible = YES; - }; - Frame = "{{0, 0}, {781, 452}}"; - LauncherConfigVersion = 7; - }; - Tab2 = { - Frame = "{{0, 0}, {685, 198}}"; - LauncherConfigVersion = 3; - Runner = { - Frame = "{{0, 0}, {685, 198}}"; - }; - }; - Tab3 = { - BuildMessageFrame = "{{0, 0}, {969, 128}}"; - BuildTranscriptFrame = "{{0, 137}, {969, 136}}"; - BuildTranscriptFrameExpanded = YES; - Frame = "{{0, 0}, {967, 295}}"; - }; - Tab4 = { - Frame = "{{0, 0}, {612, 295}}"; - }; - TabCount = 5; - TabsVisible = NO; - }; - SplitCount = 1; - Tab0 = { - Frame = "{{0, 0}, {300, 533}}"; - GroupTreeTableConfiguration = ( - TargetStatusColumn, - 18, - MainColumn, - 267, - ); - }; - Tab1 = { - ClassesFrame = "{{0, 0}, {280, 398}}"; - ClassesTreeTableConfiguration = ( - PBXBookColumnIdentifier, - 20, - PBXClassColumnIdentifier, - 237, - ); - Frame = "{{0, 0}, {278, 659}}"; - MembersFrame = "{{0, 407}, {280, 252}}"; - MembersTreeTableConfiguration = ( - PBXBookColumnIdentifier, - 20, - PBXMethodColumnIdentifier, - 236, - ); - }; - Tab2 = { - Frame = "{{0, 0}, {200, 100}}"; - }; - Tab3 = { - Frame = "{{0, 0}, {200, 100}}"; - TargetTableConfiguration = ( - ActiveObject, - 16, - ObjectNames, - 202.296, - ); - }; - Tab4 = { - BreakpointsTreeTableConfiguration = ( - breakpointColumn, - 197, - enabledColumn, - 31, - ); - Frame = "{{0, 0}, {250, 100}}"; - }; - TabCount = 5; - TabsVisible = NO; - }; - NavBarShownByDefault = YES; - StatusViewVisible = YES; - Template = F5314676015831810DCA290F; - ToolbarVisible = YES; - WindowLocation = "{7, 247}"; - }, - { - ContentSize = "{980, 839}"; - LeftSlideOut = { - Collapsed = NO; - Frame = "{{0, 23}, {980, 816}}"; - Split0 = { - ActiveTab = 0; - ActiveTabName = PBXDebugSessionModule; - Collapsed = NO; - Frame = "{{0, 0}, {980, 816}}"; - Split0 = { - Frame = "{{0, 214}, {980, 602}}"; - }; - SplitCount = 1; - Tab0 = { - Frame = "{{0, 0}, {773, 267}}"; - }; - Tab1 = { - Debugger = { - ActiveTab = 0; - ActiveTabName = PBXDebugCLIModule; - Collapsed = NO; - Frame = "{{0, 0}, {980, 208}}"; - Split0 = { - Frame = "{{0, 208}, {980, 0}}"; - Split0 = { - Frame = "{{0, 0}, {466, 0}}"; - }; - Split1 = { - DebugVariablesTableConfiguration = ( - Name, - 123, - Value, - 85, - Summary, - 271.123, - ); - Frame = "{{475, 0}, {505, 0}}"; - }; - SplitCount = 2; - }; - SplitCount = 1; - Tab0 = { - Frame = "{{0, 0}, {100, 50}}"; - }; - Tab1 = { - Frame = "{{0, 0}, {980, 184}}"; - }; - TabCount = 2; - TabsVisible = YES; - }; - Frame = "{{0, 0}, {980, 208}}"; - LauncherConfigVersion = 7; - }; - Tab2 = { - Frame = "{{0, 0}, {664, 50}}"; - LauncherConfigVersion = 3; - Runner = { - Frame = "{{0, 0}, {664, 50}}"; - }; - }; - Tab3 = { - BuildMessageFrame = "{{0, 0}, {614, 262}}"; - BuildTranscriptFrame = "{{0, 271}, {614, 2}}"; - BuildTranscriptFrameExpanded = YES; - Frame = "{{0, 0}, {612, 295}}"; - }; - Tab4 = { - Frame = "{{0, 0}, {612, 295}}"; - }; - TabCount = 5; - TabsVisible = NO; - }; - SplitCount = 1; - Tab0 = { - Frame = "{{0, 0}, {313, 531}}"; - GroupTreeTableConfiguration = ( - TargetStatusColumn, - 18, - MainColumn, - 280, - ); - }; - Tab1 = { - ClassesFrame = "{{0, 0}, {280, 398}}"; - ClassesTreeTableConfiguration = ( - PBXBookColumnIdentifier, - 20, - PBXClassColumnIdentifier, - 237, - ); - Frame = "{{0, 0}, {278, 659}}"; - MembersFrame = "{{0, 407}, {280, 252}}"; - MembersTreeTableConfiguration = ( - PBXBookColumnIdentifier, - 20, - PBXMethodColumnIdentifier, - 236, - ); - }; - Tab2 = { - Frame = "{{0, 0}, {200, 100}}"; - }; - Tab3 = { - Frame = "{{0, 0}, {200, 557}}"; - TargetTableConfiguration = ( - ActiveObject, - 16, - ObjectNames, - 202.296, - ); - }; - Tab4 = { - BreakpointsTreeTableConfiguration = ( - breakpointColumn, - 197, - enabledColumn, - 31, - ); - Frame = "{{0, 0}, {250, 100}}"; - }; - TabCount = 5; - TabsVisible = NO; - }; - NavBarShownByDefault = YES; - StatusViewVisible = YES; - Template = F5CA7ECC015C09990DCA290F; - ToolbarVisible = YES; - WindowLocation = "{186, 101}"; - }, - ); - PBXWorkspaceStateSaveDate = 67827278; - }; - perUserProjectItems = { - 4C177121040AF3B400C916F0 = 4C177121040AF3B400C916F0; - 4C177124040AF3B400C916F0 = 4C177124040AF3B400C916F0; - 4C177125040AF3B400C916F0 = 4C177125040AF3B400C916F0; - 4C3B4CF8040BEBFA00C916F0 = 4C3B4CF8040BEBFA00C916F0; - 4C3B4CF9040BEBFA00C916F0 = 4C3B4CF9040BEBFA00C916F0; - 4C3B4CFA040BEBFA00C916F0 = 4C3B4CFA040BEBFA00C916F0; - 4C3B4CFB040BEBFA00C916F0 = 4C3B4CFB040BEBFA00C916F0; - 4C3B4CFC040BEBFA00C916F0 = 4C3B4CFC040BEBFA00C916F0; - 4C3B4CFD040BEBFA00C916F0 = 4C3B4CFD040BEBFA00C916F0; - 4C3B4CFE040BEBFA00C916F0 = 4C3B4CFE040BEBFA00C916F0; - 4C3B4CFF040BEBFA00C916F0 = 4C3B4CFF040BEBFA00C916F0; - 4C3B4D00040BEBFA00C916F0 = 4C3B4D00040BEBFA00C916F0; - 4C3B4D01040BEBFA00C916F0 = 4C3B4D01040BEBFA00C916F0; - 4C3B4D02040BEBFA00C916F0 = 4C3B4D02040BEBFA00C916F0; - 4C3B4D03040BEBFA00C916F0 = 4C3B4D03040BEBFA00C916F0; - 4C3B4D04040BEBFA00C916F0 = 4C3B4D04040BEBFA00C916F0; - 4C3B4D05040BEBFA00C916F0 = 4C3B4D05040BEBFA00C916F0; - 4C3B4D06040BEBFA00C916F0 = 4C3B4D06040BEBFA00C916F0; - 4C3B4D07040BEBFA00C916F0 = 4C3B4D07040BEBFA00C916F0; - 4C3B4D08040BEBFA00C916F0 = 4C3B4D08040BEBFA00C916F0; - 4C3B4D09040BEBFA00C916F0 = 4C3B4D09040BEBFA00C916F0; - 4C3B4D0A040BEBFA00C916F0 = 4C3B4D0A040BEBFA00C916F0; - 4C3B4D0B040BEBFA00C916F0 = 4C3B4D0B040BEBFA00C916F0; - 4C3B4D0C040BEBFA00C916F0 = 4C3B4D0C040BEBFA00C916F0; - 4C3B4D0D040BEBFA00C916F0 = 4C3B4D0D040BEBFA00C916F0; - 4C3B4D0E040BEBFA00C916F0 = 4C3B4D0E040BEBFA00C916F0; - 4C3B4D0F040BEBFA00C916F0 = 4C3B4D0F040BEBFA00C916F0; - 4C3B4D10040BEBFA00C916F0 = 4C3B4D10040BEBFA00C916F0; - 4C3B4D11040BEBFA00C916F0 = 4C3B4D11040BEBFA00C916F0; - 4C3B4D12040BEBFA00C916F0 = 4C3B4D12040BEBFA00C916F0; - 4C3B4D13040BEBFA00C916F0 = 4C3B4D13040BEBFA00C916F0; - 4C3B4D14040BEBFA00C916F0 = 4C3B4D14040BEBFA00C916F0; - 4C3B4D15040BEBFA00C916F0 = 4C3B4D15040BEBFA00C916F0; - 4C3B4D16040BEBFA00C916F0 = 4C3B4D16040BEBFA00C916F0; - 4C3B4D17040BEBFA00C916F0 = 4C3B4D17040BEBFA00C916F0; - 4C3B4D18040BEBFA00C916F0 = 4C3B4D18040BEBFA00C916F0; - 4C3B4D19040BEBFA00C916F0 = 4C3B4D19040BEBFA00C916F0; - 4C3B4D1A040BEBFA00C916F0 = 4C3B4D1A040BEBFA00C916F0; - 4C3B4D1B040BEBFA00C916F0 = 4C3B4D1B040BEBFA00C916F0; - 4C864644040AD22700C916F0 = 4C864644040AD22700C916F0; - 4C864645040AD22700C916F0 = 4C864645040AD22700C916F0; - 4C864646040AD22700C916F0 = 4C864646040AD22700C916F0; - 4C864648040AD22700C916F0 = 4C864648040AD22700C916F0; - 4C864649040AD22700C916F0 = 4C864649040AD22700C916F0; - 4C86464A040AD22700C916F0 = 4C86464A040AD22700C916F0; - 4C86464B040AD22700C916F0 = 4C86464B040AD22700C916F0; - 4C86464C040AD22700C916F0 = 4C86464C040AD22700C916F0; - 4C86464D040AD22700C916F0 = 4C86464D040AD22700C916F0; + PBXPerProjectTemplateStateSaveDate = 79872368; + PBXWorkspaceStateSaveDate = 79872368; }; projectwideBuildSettings = { - OBJROOT = "/Volumes/TheCloset/jingham/tcl-tk/Objects"; - SYMROOT = "/Volumes/TheCloset/jingham/tcl-tk/Products"; + SYMROOT = "${SRCROOT}/../../build/tk"; }; wantsIndex = 1; wantsSCM = -1; @@ -1412,10 +25,13 @@ F53756A0016C4DD401DC9062 = { activeExec = 0; executables = ( - F53756AB016C4DD401DC9062, + F9B92F14047876F1006F146B, ); }; - F53756AB016C4DD401DC9062 = { + F548F8CE0313CEF0016F146B = { + activeExec = 0; + }; + F9B92F14047876F1006F146B = { activeArgIndex = 2147483647; activeArgIndices = ( ); @@ -1429,19 +45,10 @@ environmentEntries = ( ); isa = PBXExecutable; - name = "Wish Shell"; + name = Wish; shlibInfoDictList = ( ); sourceDirectories = ( ); }; - F548F8CE0313CEF0016F146B = { - activeExec = 0; - }; - F5979A0A033DA68401DC9062 = { - fileReference = F5375560016C376E01DC9062; - isa = PBXFileBreakpoint; - lineNumber = 1082; - state = 2; - }; } diff --git a/macosx/Wish.pbproj/project.pbxproj b/macosx/Wish.pbproj/project.pbxproj index 6520d0f..8b1daed 100644 --- a/macosx/Wish.pbproj/project.pbxproj +++ b/macosx/Wish.pbproj/project.pbxproj @@ -1506,8 +1506,10 @@ F5C1D51901B88F9A01DC9062, F52D38C5031F4259016F146B, F5877FBC031FA968016F146B, + F9A61D2F04C2C861006F5A0B, ); buildSettings = { + DOCDIR = "${INSTALL_PATH}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Versions/${FRAMEWORK_VERSION}/Resources/English.lproj/Documentation/Reference"; DYLIB_COMPATIBILITY_VERSION = 8.4; DYLIB_CURRENT_VERSION = "$(FRAMEWORK_VERSION)"; DYLIB_INSTALL_PATH = /Library/Frameworks; @@ -1526,8 +1528,9 @@ PRINCIPAL_CLASS = ""; PRODUCT_NAME = Tk; SECTORDER_FLAGS = ""; + SYMROOT = "${SRCROOT}/../../build/tk"; TCLSH_DIR = "$(TCL_FRAMEWORK_DIR)"; - TCL_FRAMEWORK_DIR = "$(SYMROOT)"; + TCL_FRAMEWORK_DIR = "$(SYMROOT)/../tcl"; USE_GCC3_PFE_SUPPORT = YES; WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; WRAPPER_EXTENSION = framework; @@ -2889,7 +2892,8 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright  OTHER_REZFLAGS = "-i \"$(TCL_FRAMEWORK_DIR)/Tcl.framework/Headers\" -i \"../generic\""; PRODUCT_NAME = "Wish Shell"; SECTORDER_FLAGS = ""; - TCL_FRAMEWORK_DIR = "$(SYMROOT)"; + SYMROOT = "${SRCROOT}/../../build/tk"; + TCL_FRAMEWORK_DIR = "$(SYMROOT)/../tcl"; USE_GCC3_PFE_SUPPORT = NO; WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; WRAPPER_EXTENSION = app; @@ -3093,7 +3097,8 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright  PRODUCT_NAME = libtkstub8.4.a; REZ_EXECUTABLE = YES; SECTORDER_FLAGS = ""; - TCL_FRAMEWORK_DIR = "$(SYMROOT)"; + SYMROOT = "${SRCROOT}/../../build/tk"; + TCL_FRAMEWORK_DIR = "$(SYMROOT)/../tcl"; WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; }; dependencies = ( @@ -3136,7 +3141,7 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright  ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ -n \"${EMBEDDED_BUILD:-}\" ]; then\ncd \"${TARGET_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents\"\n\n# if we are embedding frameworks, copy them into the app\nrm -rf \"Frameworks\"\nmkdir -p \"Frameworks\"\nif [ \"${DEPLOYMENT_LOCATION:-}\" = \"YES\" -o \"${ACTION}\" = \"install\" ]; then\n FWKDIR=\"${INSTALL_ROOT}/Library/Frameworks\"\nelse\n FWKDIR=\"${TARGET_BUILD_DIR}\"\nfi\ncp -fRP \"${FWKDIR}/Tcl.framework\" \"Frameworks\"\ncp -fRP \"${FWKDIR}/Tk.framework\" \"Frameworks\"\n\n# fix install names when embedding\nfix_install_id ( ) {\n chmod -RH a+w \"$1\"\n install_name_tool -id $(otool -L \"$1\" | awk \"/$(basename \"$1\")\\.framework.*[^:]\\$/ {sub(\\\"^.*/Frameworks\\\",\\\"@executable_path/../Frameworks\\\",\\$1); print \\$1}\") \"$1\"\n chmod -RH a-w \"$1\" \n}\nfix_install_name ( ) {\n chmod -RH a+w \"$1\"\n install_name_tool -change $(otool -L \"$1\" | awk \"/$2\\.framework.*[^:]\\$/ {print \\$1; sub(\\\"^.*/Frameworks\\\",\\\"@executable_path/../Frameworks\\\",\\$1); print \\$1}\") \"$1\"\n chmod -RH a-w \"$1\" \n}\nfix_install_id Frameworks/Tcl.framework/Tcl\nfix_install_id Frameworks/Tk.framework/Tk\nfix_install_name Frameworks/Tk.framework/Tk Tcl\nfix_install_name \"MacOS/${PRODUCT_NAME}\" Tcl\nfix_install_name \"MacOS/${PRODUCT_NAME}\" Tk\n\nfi"; + shellScript = "if [ -n \"${EMBEDDED_BUILD:-}\" ]; then\ncd \"${TARGET_BUILD_DIR}/${PRODUCT_NAME}.${WRAPPER_EXTENSION}/Contents\"\n\n# if we are embedding frameworks, copy them into the app\nrm -rf \"Frameworks\"\nmkdir -p \"Frameworks\"\nif [ \"${DEPLOYMENT_LOCATION:-}\" = \"YES\" -o \"${ACTION}\" = \"install\" ]; then\n FWKDIR=\"${INSTALL_ROOT}/Library/Frameworks\"\nelse\n FWKDIR=\"${TARGET_BUILD_DIR}\"\nfi\ncp -fRPH \"${FWKDIR}/Tcl.framework\" \"Frameworks\"\ncp -fRPH \"${FWKDIR}/Tk.framework\" \"Frameworks\"\n\n# fix install names when embedding\nfix_install_id ( ) {\n chmod -RH a+w \"$1\"\n install_name_tool -id $(otool -L \"$1\" | awk \"/$(basename \"$1\")\\.framework.*[^:]\\$/ {sub(\\\"^.*/Frameworks\\\",\\\"@executable_path/../Frameworks\\\",\\$1); print \\$1}\") \"$1\"\n chmod -RH a-w \"$1\" \n}\nfix_install_name ( ) {\n chmod -RH a+w \"$1\"\n install_name_tool -change $(otool -L \"$1\" | awk \"/$2\\.framework.*[^:]\\$/ {print \\$1; sub(\\\"^.*/Frameworks\\\",\\\"@executable_path/../Frameworks\\\",\\$1); print \\$1}\") \"$1\"\n chmod -RH a-w \"$1\" \n}\nfix_install_id Frameworks/Tcl.framework/Tcl\nfix_install_id Frameworks/Tk.framework/Tk\nfix_install_name Frameworks/Tk.framework/Tk Tcl\nfix_install_name \"MacOS/${PRODUCT_NAME}\" Tcl\nfix_install_name \"MacOS/${PRODUCT_NAME}\" Tk\n\nfi"; }; F55BC46802B2D38B01DC9062 = { fileEncoding = 5; @@ -3165,7 +3170,8 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright  }; F5875C7B016FEF1D01DC9062 = { isa = PBXFrameworkReference; - path = Tcl.framework; + name = Tcl.framework; + path = ../tcl/Tcl.framework; refType = 3; }; F5875C7D016FEF1D01DC9062 = { @@ -3797,7 +3803,7 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright  ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ \"${BUILD_STYLE}\" = \"Development\" ]; then\n\t# force Deployment build to be relinked next time\n\tif [ -f \"${OBJROOT}/Deployment.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\" ]; then\n\t touch -t `date -r \\`expr \\\\\\`date +\"%s\"\\\\\\` + 30\\` +\"%Y%m%d%H%M.%S\"` \"${OBJROOT}/Deployment.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\"\n\tfi\nelse\n\t# force Development build to be relinked next time\n\tif [ -f \"${OBJROOT}/Development.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\" ]; then\n\t touch -t `date -r \\`expr \\\\\\`date +\"%s\"\\\\\\` + 30\\` +\"%Y%m%d%H%M.%S\"` \"${OBJROOT}/Development.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\"\n\tfi\nfi"; + shellScript = "if [ \"${BUILD_STYLE}\" = \"Development\" ]; then\n\t# force Deployment build to be relinked next time\n\tif [ -f \"${OBJROOT}/Deployment.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\" ]; then\n\t touch -t `date -r \\`expr \\\\\\`date +\"%s\"\\\\\\` + 30\\` +\"%Y%m%d%H%M.%S\"` \"${OBJROOT}/Deployment.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\"\n\tfi\nelse\n\t# force Development build to be relinked next time\n\tif [ -f \"${OBJROOT}/Development.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\" ]; then\n\t touch -t `date -r \\`expr \\\\\\`date +\"%s\"\\\\\\` + 30\\` +\"%Y%m%d%H%M.%S\"` \"${OBJROOT}/Development.build/${PROJECT_NAME}.build/${TARGET_NAME}.build/Objects-normal/LinkFileList\"\n\tfi\nfi\n# create symbolic link to Tcl.framework if necessary\ncd \"${SYMROOT}\"\nif [ ! -e Tcl.framework -o -L Tcl.framework ]; then\n\trm -f Tcl.framework && ln -s \"${TCL_FRAMEWORK_DIR}/Tcl.framework\" .\nfi"; }; //F50 //F51 @@ -3816,6 +3822,19 @@ MacOS X Port by Jim Ingham <jingham@apple.com> & Ian Reid, Copyright  path = ../ChangeLog; refType = 2; }; + F9A61D2F04C2C861006F5A0B = { + buildActionMask = 8; + files = ( + ); + generatedFileNames = ( + ); + isa = PBXShellScriptBuildPhase; + neededFileNames = ( + ); + runOnlyForDeploymentPostprocessing = 1; + shellPath = /bin/sh; + shellScript = "if [ -z \"${EMBEDDED_BUILD:-}\" ]; then\n# build html documentation\nif [ \"${BUILD_STYLE}\" = \"Deployment\" ]; then\n\texport DYLD_FRAMEWORK_PATH=\"${TCL_FRAMEWORK_DIR}\"\n\tif [ -e \"${TCL_FRAMEWORK_DIR}/Deployment/Makefile\" ]; then\n\t\tcd \"${TCL_FRAMEWORK_DIR}/Deployment\"\n\t\texport DYLD_FRAMEWORK_PATH=\"${TCL_FRAMEWORK_DIR}\"\n\t\tgnumake html-tk DISTDIR=\"${INSTALL_ROOT}${DOCDIR}\" TCL_EXE=\"${TCLSH_DIR}/tclsh${FRAMEWORK_VERSION}\"\n\t\tcd \"${INSTALL_ROOT}${DOCDIR}\"\n\t\tln -fs contents.htm html/${PRODUCT_NAME}TOC.html\n\t\trm -fr \"${PRODUCT_NAME}\"; mv -f html \"${PRODUCT_NAME}\"\n\telse\n\t\techo \"Couldn't build html documentation!\"\n\tfi\nfi\nfi"; + }; }; rootObject = F537552A016C352C01DC9062; } |