October 2009 - darwinbuild-changes - lists.macosforge.org

[613] trunk/plists/10A432.plist
by source_changes＠macosforge.org 30 Oct '09

30 Oct '09

Revision: 613 http://trac.macosforge.org/projects/darwinbuild/changeset/613 Author: wsiegrist(a)apple.com Date: 2009-10-30 15:44:27 -0700 (Fri, 30 Oct 2009) Log Message: ----------- Limit IOFWDVComponents to i386 build. Add dependencies. Modified Paths: -------------- trunk/plists/10A432.plist Modified: trunk/plists/10A432.plist =================================================================== --- trunk/plists/10A432.plist 2009-10-29 23:04:59 UTC (rev 612) +++ trunk/plists/10A432.plist 2009-10-30 22:44:27 UTC (rev 613) @@ -1973,6 +1973,60 @@ version = 30; }; IOFWDVComponents = { + dependencies = { + build = ( + CF, + CarbonHeaders, + DiskArbitration, + ICU, + IOKitUser, + Libm, + Libsystem, + Security, + bash, + cctools, + configd, + distcc, + file_cmds, + gcc, + gcc_select, + grep, + ld64, + libiconv, + objc4, + ruby, + text_cmds, + ); + header = ( + CF, + CarbonHeaders, + DiskArbitration, + IOFireWireAVC, + IOFireWireFamily, + IOGraphics, + IOHIDFamily, + IOKitUser, + Libc_headers, + Libm, + Libsyscall, + Security, + gcc, + libdispatch, + libdyld, + xnu, + ); + lib = ( + CF, + IOKitUser, + Libsystem, + ); + staticlib = ( + gcc, + ); + }; + environment = { + RC_ARCHS = i386; + }; version = 199.4.1; }; IOFireWireAVC = {

1 0

[612] tags/darwinbuild-11/
by source_changes＠macosforge.org 29 Oct '09

29 Oct '09

Revision: 612 http://trac.macosforge.org/projects/darwinbuild/changeset/612 Author: wsiegrist(a)apple.com Date: 2009-10-29 16:04:59 -0700 (Thu, 29 Oct 2009) Log Message: ----------- "Tagging darwinbuild-11 from http://svn.macosforge.org/repository/darwinbuild/trunk" Added Paths: ----------- tags/darwinbuild-11/ Property changes on: tags/darwinbuild-11 ___________________________________________________________________ Added: svn:mergeinfo + /branches/PR-4841388:399-419 /branches/PR-6358021:442-443 /branches/PR-6392966:423-427 /branches/PR-6398060:433-434 /branches/PR-6493844:460-461 /branches/PR-6497694:466-468,471 /branches/PR-6688645:479-490 /branches/PR-6722857:495-499 /trunk:432-434

1 0

[611] trunk/README
by source_changes＠macosforge.org 29 Oct '09

29 Oct '09

Revision: 611 http://trac.macosforge.org/projects/darwinbuild/changeset/611 Author: wsiegrist(a)apple.com Date: 2009-10-29 15:39:48 -0700 (Thu, 29 Oct 2009) Log Message: ----------- Update install instructions in README Modified Paths: -------------- trunk/README Modified: trunk/README =================================================================== --- trunk/README 2009-10-29 22:29:24 UTC (rev 610) +++ trunk/README 2009-10-29 22:39:48 UTC (rev 611) @@ -62,16 +62,18 @@ % port install darwinbuild Or, you can also install by checking out the source and building -darwinbuild yourself. The included Makefile will compile the tools and install -them into the location specified by the DESTDIR parameter. If the -DESTDIR parameter is not specified, the files will be installed into /usr/local. +darwinbuild yourself. The included Xcode project will compile the tools and install +them into the location specified by the PREFIX environment parameter. If the +PREFIX parameter is not specified, the files will be installed into /usr/local. -By default, darwinbuild will match the architectures of libSystem. If you want -to override this, set a list of -arch arguments in RC_CFLAGS. +By default, darwinbuild will build for x86_64 and i386. You can override this with +the ARCHS environment variable. - % make - % sudo make install +To build and install darwinbuild to the boot partition: + % cd <path to top of source> + % sudo xcodebuild install DSTROOT=/ + 2.1 Creating the Build Directory After installation, you must initialize the build directory using darwinbuild.

1 0

[610] trunk
by source_changes＠macosforge.org 29 Oct '09

29 Oct '09

Revision: 610 http://trac.macosforge.org/projects/darwinbuild/changeset/610 Author: wsiegrist(a)apple.com Date: 2009-10-29 15:29:24 -0700 (Thu, 29 Oct 2009) Log Message: ----------- Default to building for x86_64 and i386 Modified Paths: -------------- trunk/darwinbuild.xcodeproj/project.pbxproj trunk/prefix.xcconfig Modified: trunk/darwinbuild.xcodeproj/project.pbxproj =================================================================== --- trunk/darwinbuild.xcodeproj/project.pbxproj 2009-10-29 22:14:22 UTC (rev 609) +++ trunk/darwinbuild.xcodeproj/project.pbxproj 2009-10-29 22:29:24 UTC (rev 610) @@ -583,7 +583,7 @@ isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7227AC7E1098EF6400BE33D7 /* libredo_prebinding.a */; + remoteGlobalIDString = 7227AC7E1098EF6400BE33D7; remoteInfo = libredo_prebinding.a; }; /* End PBXContainerItemProxy section */ Modified: trunk/prefix.xcconfig =================================================================== --- trunk/prefix.xcconfig 2009-10-29 22:14:22 UTC (rev 609) +++ trunk/prefix.xcconfig 2009-10-29 22:29:24 UTC (rev 610) @@ -35,3 +35,4 @@ INCDIR = $(PREFIX)/include DEPLOYMENT_LOCATION = YES DSTROOT = $(BUILT_PRODUCTS_DIR) +ARCHS = x86_64 i386

1 0

[609] trunk/darwinbuild.xcodeproj/project.pbxproj
by source_changes＠macosforge.org 29 Oct '09

29 Oct '09

Revision: 609 http://trac.macosforge.org/projects/darwinbuild/changeset/609 Author: wsiegrist(a)apple.com Date: 2009-10-29 15:14:22 -0700 (Thu, 29 Oct 2009) Log Message: ----------- Fix libredo_prebinding.a fetch target Modified Paths: -------------- trunk/darwinbuild.xcodeproj/project.pbxproj Modified: trunk/darwinbuild.xcodeproj/project.pbxproj =================================================================== --- trunk/darwinbuild.xcodeproj/project.pbxproj 2009-10-29 20:46:02 UTC (rev 608) +++ trunk/darwinbuild.xcodeproj/project.pbxproj 2009-10-29 22:14:22 UTC (rev 609) @@ -170,231 +170,231 @@ isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 725740981097B051008AD4D7 /* darwinxref_plugins */; + remoteGlobalIDString = 725740981097B051008AD4D7; remoteInfo = darwinxref_plugins; }; 7227AB47109897E000BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7227AB3D1098977C00BE33D7 /* tcl_plugins */; + remoteGlobalIDString = 7227AB3D1098977C00BE33D7; remoteInfo = tcl_plugins; }; 7227AC351098DC6A00BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7227AC271098DBDF00BE33D7 /* installXcode32 */; + remoteGlobalIDString = 7227AC271098DBDF00BE33D7; remoteInfo = installXcode32; }; 7227AC371098DC6A00BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7227AC1E1098DB9200BE33D7 /* installXcode */; + remoteGlobalIDString = 7227AC1E1098DB9200BE33D7; remoteInfo = installXcode; }; 7227AC391098DC6A00BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7227AC151098D8DB00BE33D7 /* thinPackages */; + remoteGlobalIDString = 7227AC151098D8DB00BE33D7; remoteInfo = thinPackages; }; 7227AC3B1098DC6A00BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7227AC0C1098D84600BE33D7 /* packageRoots */; + remoteGlobalIDString = 7227AC0C1098D84600BE33D7; remoteInfo = packageRoots; }; 7227AC3D1098DC6A00BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7227ABFF1098D78C00BE33D7 /* darwinmaster */; + remoteGlobalIDString = 7227ABFF1098D78C00BE33D7; remoteInfo = darwinmaster; }; 7227AC3F1098DC6A00BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7227AB6C10989A9900BE33D7 /* manifest */; + remoteGlobalIDString = 7227AB6C10989A9900BE33D7; remoteInfo = manifest; }; 7227AC411098DC6A00BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 72C86C371096607900C66E90 /* darwinbuild */; + remoteGlobalIDString = 72C86C371096607900C66E90; remoteInfo = darwinbuild; }; 7227AC431098DC7B00BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7227AC311098DC4E00BE33D7 /* darwinbuild_scripts */; + remoteGlobalIDString = 7227AC311098DC4E00BE33D7; remoteInfo = darwinbuild_scripts; }; 7227AC461098DD1700BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC481098DD1900BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC4A1098DD1C00BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC4C1098DD2000BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC4E1098DD2300BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC501098DD2700BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC521098DD2B00BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC541098DD2E00BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC561098DD3200BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC581098DD3600BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC5A1098DD3C00BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC5C1098DD4B00BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC5E1098DD5000BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC601098DD9F00BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC621098DDA100BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC641098DDA400BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC661098DDA800BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC681098DDAB00BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC6A1098DDAE00BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC6C1098DDBC00BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC6E1098DDBE00BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC701098DDC200BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 7227AC721098DDC500BE33D7 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 726DD14910965C5700D5AEAB /* Project object */; proxyType = 1; - remoteGlobalIDString = 7257499F1097697300B13BC3 /* darwinxref */; + remoteGlobalIDString = 7257499F1097697300B13BC3; remoteInfo = darwinxref; }; 725740961097B03D008AD4D7 /* PBXContainerItemProxy */ = { @@ -579,6 +579,13 @@ remoteGlobalIDString = 72C86C51109660CA00C66E90; remoteInfo = darwintrace; }; + DFCB82D9109A2F9A00D2DB2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 726DD14910965C5700D5AEAB /* Project object */; + proxyType = 1; + remoteGlobalIDString = 7227AC7E1098EF6400BE33D7 /* libredo_prebinding.a */; + remoteInfo = libredo_prebinding.a; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -1656,6 +1663,7 @@ buildRules = ( ); dependencies = ( + DFCB82DA109A2F9A00D2DB2F /* PBXTargetDependency */, ); name = darwinup; productName = darwinup; @@ -1927,11 +1935,10 @@ inputPaths = ( ); outputPaths = ( - "$(BUILT_PRODUCTS_DIR)/libredo_prebinding.a", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "set -x\nBUILD=10A432\nHOST=src.macosforge.org\n\n# make sure we only run when needed\nif [ -f /usr/local/lib/libredo_prebinding.a ]; then\n\texit 0;\nfi\n\n/usr/bin/curl -kL http://$HOST/Roots/$BUILD/cctools_ofiles.root.tar.gz | /usr/bin/tar zxO ./usr/local/lib/libredo_prebinding.a > $BUILT_PRODUCTS_DIR/libredo_prebinding.a\n"; + shellScript = "set -x\nBUILD=10A432\nHOST=src.macosforge.org\n\n# make sure we only run when needed\nif [ -f /usr/local/lib/libredo_prebinding.a ]; then\n\texit 0;\nfi\n\n/usr/bin/curl -kL http://$HOST/Roots/$BUILD/cctools_ofiles.root.tar.gz > $CONFIGURATION_TEMP_DIR/cctools_ofiles.root.tar.gz\n\n/bin/mkdir -p $BUILT_PRODUCTS_DIR\n\n/usr/bin/tar zxOf $CONFIGURATION_TEMP_DIR/cctools_ofiles.root.tar.gz ./usr/local/lib/libredo_prebinding.a > $BUILT_PRODUCTS_DIR/libredo_prebinding.a\n\n/bin/mkdir -p $DSTROOT/$PREFIX/lib/\n\n/bin/cp $BUILT_PRODUCTS_DIR/libredo_prebinding.a $DSTROOT/$PREFIX/lib/\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -2460,6 +2467,11 @@ target = 72C86C51109660CA00C66E90 /* darwintrace */; targetProxy = 72C86C601096617500C66E90 /* PBXContainerItemProxy */; }; + DFCB82DA109A2F9A00D2DB2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 7227AC7E1098EF6400BE33D7 /* libredo_prebinding.a */; + targetProxy = DFCB82D9109A2F9A00D2DB2F /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */

1 0

[608] trunk/darwinxref/plugins
by source_changes＠macosforge.org 29 Oct '09

29 Oct '09

Revision: 608 http://trac.macosforge.org/projects/darwinbuild/changeset/608 Author: wsiegrist(a)apple.com Date: 2009-10-29 13:46:02 -0700 (Thu, 29 Oct 2009) Log Message: ----------- Fix some potentially-used-uninitialized errors Modified Paths: -------------- trunk/darwinxref/plugins/exportProject.c trunk/darwinxref/plugins/register.c Modified: trunk/darwinxref/plugins/exportProject.c =================================================================== --- trunk/darwinxref/plugins/exportProject.c 2009-10-29 19:52:56 UTC (rev 607) +++ trunk/darwinxref/plugins/exportProject.c 2009-10-29 20:46:02 UTC (rev 608) @@ -41,7 +41,7 @@ if (count > 2) return -1; int xml = 0, i; CFMutableDictionaryRef dict, preplist; - CFDictionaryRef project; + CFDictionaryRef project = NULL; CFStringRef projname; CFArrayRef builds; const void *ssites, *bsites; Modified: trunk/darwinxref/plugins/register.c =================================================================== --- trunk/darwinxref/plugins/register.c 2009-10-29 19:52:56 UTC (rev 607) +++ trunk/darwinxref/plugins/register.c 2009-10-29 20:46:02 UTC (rev 608) @@ -607,7 +607,7 @@ } int register_files(char* build, char* project, char* path) { - int res; + int res = 0; int loaded = 0; create_tables(); @@ -697,7 +697,7 @@ } int register_files_from_stdin(char* build, char* project, char* path) { - int res; + int res = 0; int loaded = 0; char *line; size_t size;

1 0

[606] trunk
by source_changes＠macosforge.org 29 Oct '09

29 Oct '09

Revision: 606 http://trac.macosforge.org/projects/darwinbuild/changeset/606 Author: wsiegrist(a)apple.com Date: 2009-10-29 11:05:23 -0700 (Thu, 29 Oct 2009) Log Message: ----------- Back out r605 since that approach is not going to work well Revision Links: -------------- http://trac.macosforge.org/projects/darwinbuild/changeset/605 Modified Paths: -------------- trunk/darwinbuild/Makefile trunk/darwintrace/Makefile trunk/darwinup/Makefile trunk/darwinxref/Makefile Modified: trunk/darwinbuild/Makefile =================================================================== --- trunk/darwinbuild/Makefile 2009-10-23 23:36:25 UTC (rev 605) +++ trunk/darwinbuild/Makefile 2009-10-29 18:05:23 UTC (rev 606) @@ -5,8 +5,6 @@ ### DATDIR:=$(DATDIR)/darwinbuild -override OBJROOT:=$(OBJROOT)/darwinbuild~obj - PrefixReplacements = darwinbuild \ darwinmaster.sh \ packageRoots.sh \ @@ -17,27 +15,25 @@ all: manifest prefixes manifest: manifest.c - @mkdir -p $(OBJROOT) cc $(CFLAGS) -Wall -Werror -o $(OBJROOT)/$@ -lcrypto $^ prefixes: $(PrefixReplacements) $(PrefixReplacements): % : %.in - @mkdir -p $(OBJROOT) - $(SED) -e 's,%%PREFIX%%,$(PREFIX),' $@.in > $(OBJROOT)/$@ ; + $(SED) -e 's,%%PREFIX%%,$(PREFIX),' $@.in > $@ ; install: all [ -d $(BINDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(BINDIR) - $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/darwinbuild $(BINDIR) - $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/darwinmaster.sh $(BINDIR)/darwinmaster + $(INSTALL) $(INSTALL_EXE_FLAGS) darwinbuild $(BINDIR) + $(INSTALL) $(INSTALL_EXE_FLAGS) darwinmaster.sh $(BINDIR)/darwinmaster [ -d $(DATDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(DATDIR) $(INSTALL) $(INSTALL_DOC_FLAGS) darwinbuild.common $(DATDIR) - $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/installXcode $(DATDIR) + $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode $(DATDIR) $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode2 $(DATDIR) $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode3 $(DATDIR) $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode31 $(DATDIR) - $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/installXcode32 $(DATDIR) + $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode32 $(DATDIR) $(INSTALL) $(INSTALL_DOC_FLAGS) Info.plist $(DATDIR) $(INSTALL) $(INSTALL_DOC_FLAGS) SDKSettings.plist $(DATDIR) @@ -46,10 +42,10 @@ $(INSTALL) $(INSTALL_EXE_FLAGS) ditto.sh $(DATDIR)/ditto $(INSTALL) $(INSTALL_EXE_FLAGS) buildlist.sh $(DATDIR)/buildlist $(INSTALL) $(INSTALL_EXE_FLAGS) buildorder.pl $(DATDIR)/buildorder - $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/packageRoots.sh $(DATDIR)/packageRoots + $(INSTALL) $(INSTALL_EXE_FLAGS) packageRoots.sh $(DATDIR)/packageRoots $(INSTALL) $(INSTALL_EXE_FLAGS) synthfat.sh $(DATDIR)/synthfat $(INSTALL) $(INSTALL_EXE_FLAGS) thinFile.sh $(DATDIR)/thinFile - $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/thinPackages.sh $(DATDIR)/thinPackages + $(INSTALL) $(INSTALL_EXE_FLAGS) thinPackages.sh $(DATDIR)/thinPackages uninstall: rm -f $(BINDIR)/darwinbuild @@ -74,5 +70,6 @@ clean: - rm -rf $(OBJROOT) - + rm -f manifest + @$(foreach SCRIPT,$(PrefixReplacements), \ + rm -f $(SCRIPT) ; ) Modified: trunk/darwintrace/Makefile =================================================================== --- trunk/darwintrace/Makefile 2009-10-23 23:36:25 UTC (rev 605) +++ trunk/darwintrace/Makefile 2009-10-29 18:05:23 UTC (rev 606) @@ -7,8 +7,6 @@ ### DATDIR:=$(DATDIR)/darwinbuild -override OBJROOT:=$(OBJROOT)/darwintrace~obj - all: darwintrace.dylib VERSION=$(shell uname -r | cut -f1 -d. ) @@ -19,7 +17,6 @@ endif darwintrace.dylib: darwintrace.c - @mkdir -p $(OBJROOT) cc -o $(OBJROOT)/$@ \ $(CFLAGS) \ -Wall -Werror -pedantic -std=c99 \ @@ -30,7 +27,7 @@ -dynamiclib \ $^ $(LIBS) clean: - rm -rf $(OBJROOT) + rm -f darwintrace.dylib install: all [ -d $(DATDIR) ] || \ Modified: trunk/darwinup/Makefile =================================================================== --- trunk/darwinup/Makefile 2009-10-23 23:36:25 UTC (rev 605) +++ trunk/darwinup/Makefile 2009-10-29 18:05:23 UTC (rev 606) @@ -1,7 +1,5 @@ include ../common.mk -override OBJROOT:=$(OBJROOT)/darwinup~obj - CXXFLAGS=-g -Wall -Werror -Wno-non-virtual-dtor $(CFLAGS) # libredo.o is generated from cctools_ofiles REDO=$(shell if [ -f /usr/local/lib/libredo_prebinding.a ]; then \ @@ -29,5 +27,4 @@ rm -f $(BINDIR)/darwinup clean: - rm -rf $(OBJROOT) - + rm -f darwinup Archive.o Depot.o Digest.o File.o SerialSet.o Utils.o main.o Modified: trunk/darwinxref/Makefile =================================================================== --- trunk/darwinxref/Makefile 2009-10-23 23:36:25 UTC (rev 605) +++ trunk/darwinxref/Makefile 2009-10-29 18:05:23 UTC (rev 606) @@ -6,8 +6,6 @@ DATDIR:=$(DATDIR)/darwinxref INCDIR:=$(INCDIR)/darwinbuild -override OBJROOT:=$(OBJROOT)/darwinxref~obj - SOURCES= \ DBDataStore.c \ DBPlugin.c \ @@ -77,10 +75,15 @@ -rmdir $(INCDIR) clean: - rm -rf $(OBJROOT) + rm -f darwinxref + rm -rf darwinxref.dSYM + rm -f $(SOURCES:.c=.o) + rm -f $(PLUGIN_SOURCES:.c=.so) + rm -rf $(PLUGIN_SOURCES:.c=.so.dSYM) + rm -f upgrade_plist + rm -rf upgrade_plist.dSYM darwinxref: $(SOURCES) - @mkdir -p $(OBJROOT) @for CFILE in $(SOURCES); do \ OFILE=$$(echo $$(basename $${CFILE}) | sed -e 's,\.[^.]*$$,.o,') ; \ CMD="$(CC) $(CFLAGS) -c -o $(OBJROOT)/$${OFILE} $${CFILE}"; \ @@ -100,7 +103,6 @@ cc $(CFLAGS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $< plugins-darwinports/%.so: plugins-darwinports/%.c DBPlugin.h darwinxref - @mkdir -p $(OBJROOT)/plugins-darwinports cc $(CFLAGS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $< apple_plugins: @@ -114,6 +116,5 @@ fi upgrade_plist: upgrade_plist.c cfutils.c - @mkdir -p $(OBJROOT) cc $(CFLAGS) -o $(OBJROOT)/$@ $(CFLAGS) $(LDFLAGS) $^

1 0

[605] trunk
by source_changes＠macosforge.org 23 Oct '09

23 Oct '09

Revision: 605 http://trac.macosforge.org/projects/darwinbuild/changeset/605 Author: wsiegrist(a)apple.com Date: 2009-10-23 16:36:25 -0700 (Fri, 23 Oct 2009) Log Message: ----------- Obey OBJROOT more. Darwinup still needs to be fixed. Modified Paths: -------------- trunk/darwinbuild/Makefile trunk/darwintrace/Makefile trunk/darwinup/Makefile trunk/darwinxref/Makefile Modified: trunk/darwinbuild/Makefile =================================================================== --- trunk/darwinbuild/Makefile 2009-10-23 23:10:22 UTC (rev 604) +++ trunk/darwinbuild/Makefile 2009-10-23 23:36:25 UTC (rev 605) @@ -5,6 +5,8 @@ ### DATDIR:=$(DATDIR)/darwinbuild +override OBJROOT:=$(OBJROOT)/darwinbuild~obj + PrefixReplacements = darwinbuild \ darwinmaster.sh \ packageRoots.sh \ @@ -15,25 +17,27 @@ all: manifest prefixes manifest: manifest.c + @mkdir -p $(OBJROOT) cc $(CFLAGS) -Wall -Werror -o $(OBJROOT)/$@ -lcrypto $^ prefixes: $(PrefixReplacements) $(PrefixReplacements): % : %.in - $(SED) -e 's,%%PREFIX%%,$(PREFIX),' $@.in > $@ ; + @mkdir -p $(OBJROOT) + $(SED) -e 's,%%PREFIX%%,$(PREFIX),' $@.in > $(OBJROOT)/$@ ; install: all [ -d $(BINDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(BINDIR) - $(INSTALL) $(INSTALL_EXE_FLAGS) darwinbuild $(BINDIR) - $(INSTALL) $(INSTALL_EXE_FLAGS) darwinmaster.sh $(BINDIR)/darwinmaster + $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/darwinbuild $(BINDIR) + $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/darwinmaster.sh $(BINDIR)/darwinmaster [ -d $(DATDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(DATDIR) $(INSTALL) $(INSTALL_DOC_FLAGS) darwinbuild.common $(DATDIR) - $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode $(DATDIR) + $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/installXcode $(DATDIR) $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode2 $(DATDIR) $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode3 $(DATDIR) $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode31 $(DATDIR) - $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode32 $(DATDIR) + $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/installXcode32 $(DATDIR) $(INSTALL) $(INSTALL_DOC_FLAGS) Info.plist $(DATDIR) $(INSTALL) $(INSTALL_DOC_FLAGS) SDKSettings.plist $(DATDIR) @@ -42,10 +46,10 @@ $(INSTALL) $(INSTALL_EXE_FLAGS) ditto.sh $(DATDIR)/ditto $(INSTALL) $(INSTALL_EXE_FLAGS) buildlist.sh $(DATDIR)/buildlist $(INSTALL) $(INSTALL_EXE_FLAGS) buildorder.pl $(DATDIR)/buildorder - $(INSTALL) $(INSTALL_EXE_FLAGS) packageRoots.sh $(DATDIR)/packageRoots + $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/packageRoots.sh $(DATDIR)/packageRoots $(INSTALL) $(INSTALL_EXE_FLAGS) synthfat.sh $(DATDIR)/synthfat $(INSTALL) $(INSTALL_EXE_FLAGS) thinFile.sh $(DATDIR)/thinFile - $(INSTALL) $(INSTALL_EXE_FLAGS) thinPackages.sh $(DATDIR)/thinPackages + $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/thinPackages.sh $(DATDIR)/thinPackages uninstall: rm -f $(BINDIR)/darwinbuild @@ -70,6 +74,5 @@ clean: - rm -f manifest - @$(foreach SCRIPT,$(PrefixReplacements), \ - rm -f $(SCRIPT) ; ) + rm -rf $(OBJROOT) + Modified: trunk/darwintrace/Makefile =================================================================== --- trunk/darwintrace/Makefile 2009-10-23 23:10:22 UTC (rev 604) +++ trunk/darwintrace/Makefile 2009-10-23 23:36:25 UTC (rev 605) @@ -7,6 +7,8 @@ ### DATDIR:=$(DATDIR)/darwinbuild +override OBJROOT:=$(OBJROOT)/darwintrace~obj + all: darwintrace.dylib VERSION=$(shell uname -r | cut -f1 -d. ) @@ -17,6 +19,7 @@ endif darwintrace.dylib: darwintrace.c + @mkdir -p $(OBJROOT) cc -o $(OBJROOT)/$@ \ $(CFLAGS) \ -Wall -Werror -pedantic -std=c99 \ @@ -27,7 +30,7 @@ -dynamiclib \ $^ $(LIBS) clean: - rm -f darwintrace.dylib + rm -rf $(OBJROOT) install: all [ -d $(DATDIR) ] || \ Modified: trunk/darwinup/Makefile =================================================================== --- trunk/darwinup/Makefile 2009-10-23 23:10:22 UTC (rev 604) +++ trunk/darwinup/Makefile 2009-10-23 23:36:25 UTC (rev 605) @@ -1,5 +1,7 @@ include ../common.mk +override OBJROOT:=$(OBJROOT)/darwinup~obj + CXXFLAGS=-g -Wall -Werror -Wno-non-virtual-dtor $(CFLAGS) # libredo.o is generated from cctools_ofiles REDO=$(shell if [ -f /usr/local/lib/libredo_prebinding.a ]; then \ @@ -27,4 +29,5 @@ rm -f $(BINDIR)/darwinup clean: - rm -f darwinup Archive.o Depot.o Digest.o File.o SerialSet.o Utils.o main.o + rm -rf $(OBJROOT) + Modified: trunk/darwinxref/Makefile =================================================================== --- trunk/darwinxref/Makefile 2009-10-23 23:10:22 UTC (rev 604) +++ trunk/darwinxref/Makefile 2009-10-23 23:36:25 UTC (rev 605) @@ -6,6 +6,8 @@ DATDIR:=$(DATDIR)/darwinxref INCDIR:=$(INCDIR)/darwinbuild +override OBJROOT:=$(OBJROOT)/darwinxref~obj + SOURCES= \ DBDataStore.c \ DBPlugin.c \ @@ -75,15 +77,10 @@ -rmdir $(INCDIR) clean: - rm -f darwinxref - rm -rf darwinxref.dSYM - rm -f $(SOURCES:.c=.o) - rm -f $(PLUGIN_SOURCES:.c=.so) - rm -rf $(PLUGIN_SOURCES:.c=.so.dSYM) - rm -f upgrade_plist - rm -rf upgrade_plist.dSYM + rm -rf $(OBJROOT) darwinxref: $(SOURCES) + @mkdir -p $(OBJROOT) @for CFILE in $(SOURCES); do \ OFILE=$$(echo $$(basename $${CFILE}) | sed -e 's,\.[^.]*$$,.o,') ; \ CMD="$(CC) $(CFLAGS) -c -o $(OBJROOT)/$${OFILE} $${CFILE}"; \ @@ -103,6 +100,7 @@ cc $(CFLAGS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $< plugins-darwinports/%.so: plugins-darwinports/%.c DBPlugin.h darwinxref + @mkdir -p $(OBJROOT)/plugins-darwinports cc $(CFLAGS) -o $(OBJROOT)/$@ $(PLUGIN_CFLAGS) $(PLUGIN_LDFLAGS) $< apple_plugins: @@ -116,5 +114,6 @@ fi upgrade_plist: upgrade_plist.c cfutils.c + @mkdir -p $(OBJROOT) cc $(CFLAGS) -o $(OBJROOT)/$@ $(CFLAGS) $(LDFLAGS) $^

1 0

[604] trunk/Makefile
by source_changes＠macosforge.org 23 Oct '09

23 Oct '09

Revision: 604 http://trac.macosforge.org/projects/darwinbuild/changeset/604 Author: wsiegrist(a)apple.com Date: 2009-10-23 16:10:22 -0700 (Fri, 23 Oct 2009) Log Message: ----------- Exclude patches, plists, and testing during installsrc Modified Paths: -------------- trunk/Makefile Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2009-10-23 17:30:33 UTC (rev 603) +++ trunk/Makefile 2009-10-23 23:10:22 UTC (rev 604) @@ -20,7 +20,7 @@ make -C $(DIR) $@) || exit 1; ) installsrc: - tar czf - . | tar xzf - -C "$(SRCROOT)" --exclude=.svn --exclude=sqlite --exclude=www --exclude=darwinup/libredo.o + tar czf - . | tar xzf - -C "$(SRCROOT)" --exclude=.svn --exclude=sqlite --exclude=www --exclude=darwinup/libredo.o --exclude=patches --exclude=plists --exclude=testing installhdrs: @echo Nothing to be done for $@

1 0

[603] trunk/darwintrace/darwintrace.c
by source_changes＠macosforge.org 23 Oct '09

23 Oct '09

Revision: 603 http://trac.macosforge.org/projects/darwinbuild/changeset/603 Author: wsiegrist(a)apple.com Date: 2009-10-23 10:30:33 -0700 (Fri, 23 Oct 2009) Log Message: ----------- Add more redirection exceptions Modified Paths: -------------- trunk/darwintrace/darwintrace.c Modified: trunk/darwintrace/darwintrace.c =================================================================== --- trunk/darwintrace/darwintrace.c 2009-10-23 17:30:12 UTC (rev 602) +++ trunk/darwintrace/darwintrace.c 2009-10-23 17:30:33 UTC (rev 603) @@ -65,11 +65,14 @@ */ static char *__darwintrace_redirect = NULL; static char *__darwintrace_buildroot = NULL; -static const char *__redirect_exceptions[] = {"/Developer/Library/PrivateFrameworks", - "/Developer/usr/bin/../../Library/PrivateFrameworks", +static const char *__redirect_exceptions[] = {"/Developer/Library/Private", + "/Developer/Library/Frameworks", + "/Developer/usr/bin/../../Library/Private", + "/Developer/usr/bin/../../Library/Frameworks", "/Developer/Library/Xcode", "/Developer/Platforms/", "/Developer/usr/bin/xcode", + "/System/Library/Frameworks/Carbon", "/Volumes/BuildRoot_", "/usr/bin/xcrun", "/usr/bin/xcode",

1 0