September 2008 - darwinbuild-changes

[391] trunk/plists/9A581.plist
by source_changes＠macosforge.org 27 Sep '08

27 Sep '08

Revision: 391 http://trac.macosforge.org/projects/darwinbuild/changeset/391 Author: wsiegrist(a)apple.com Date: 2008-09-26 17:19:01 -0700 (Fri, 26 Sep 2008) Log Message: ----------- More dependency updates for Leopard Modified Paths: -------------- trunk/plists/9A581.plist Modified: trunk/plists/9A581.plist =================================================================== --- trunk/plists/9A581.plist 2008-09-26 22:28:50 UTC (rev 390) +++ trunk/plists/9A581.plist 2008-09-27 00:19:01 UTC (rev 391) @@ -8224,6 +8224,8 @@ gcc, launchd, libdyld, + libedit, + mDNSResponderSystemLibraries, xnu, ); lib = ( @@ -9114,6 +9116,7 @@ distcc, file_cmds, gcc, + gcc_42, gcc_os, gcc_select, gm4, @@ -9121,6 +9124,7 @@ jam, libgcc, mDNSResponder, + pb_makefiles, shell_cmds, system_cmds, tcsh, @@ -9153,6 +9157,7 @@ configd, dyld, libgcc, + objc4, ); staticlib = ( Csu,

1 0

[390] trunk
by source_changes＠macosforge.org 26 Sep '08

26 Sep '08

Revision: 390 http://trac.macosforge.org/projects/darwinbuild/changeset/390 Author: wsiegrist(a)apple.com Date: 2008-09-26 15:28:50 -0700 (Fri, 26 Sep 2008) Log Message: ----------- More Xcode 3.x fixes: * Add more symlinks to open source binaries * Be more precise with Jamfile and resource rewriting * Replace dsymutil with /usr/bin/true to disable debug builds and remove a dependency on libauto * Only set DEVELOPER_DIR when chrooted * Add dependencies for IOKitUser and launchd Modified Paths: -------------- trunk/darwinbuild/darwinbuild trunk/darwinbuild/installXcode31 trunk/plists/9A581.plist Modified: trunk/darwinbuild/darwinbuild =================================================================== --- trunk/darwinbuild/darwinbuild 2008-09-24 21:58:24 UTC (rev 389) +++ trunk/darwinbuild/darwinbuild 2008-09-26 22:28:50 UTC (rev 390) @@ -526,9 +526,9 @@ cp "$DITTO" "$BuildRoot/usr/bin/ditto" fi - ### need dsymutil too... (hack for now) + ### need dsymutil but it depends on libauto so disable for now if [ ! -x "$BuildRoot/usr/bin/dsymutil" ]; then - cp "/usr/bin/dsymutil" "$BuildRoot/usr/bin/dsymutil" + cp "/usr/bin/true" "$BuildRoot/usr/bin/dsymutil" fi ### CoreOSMakefiles @@ -594,8 +594,10 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin/:/usr/local/bin:/usr/local/sbin -# sets the install path to xcode tools -export DEVELOPER_DIR="/XCD/loper" +# sets the install path to xcode tools if we're chrooted +if [ "$CHROOTED" == "YES" ]; then + export DEVELOPER_DIR="/XCD/loper" +fi export SHELL="/bin/sh" export HOME="/var/root" Modified: trunk/darwinbuild/installXcode31 =================================================================== --- trunk/darwinbuild/installXcode31 2008-09-24 21:58:24 UTC (rev 389) +++ trunk/darwinbuild/installXcode31 2008-09-26 22:28:50 UTC (rev 390) @@ -13,12 +13,11 @@ /usr/bin/xcodebuild \ /usr/bin/xcode-select \ /Developer/Library/version.plist \ - /Developer/usr/bin/dsymutil \ - /Developer/usr/bin/xcodebuild \ - /Developer/Platforms/MacOSX.platform \ - /Developer/Makefiles/pbx_jamfiles) + /Developer/usr/bin/xcodebuild) BINSYMLINKS=( \ + cc \ + dsymutil \ gcc \ gcc-4.0 \ gcc-4.2 \ @@ -28,6 +27,8 @@ g++ \ g++-4.0 \ g++-4.2 \ + libtool \ + mig \ strip) @@ -136,7 +137,6 @@ echo "Copying Xcode and dependencies ..." # copy files and use sed to rewrite paths during copy - # The [^m] used for /Developer is to prevent matching Platform subdirectories cpio -o -c < /tmp/installXcode.files.$$ | \ sed -e 's,/System,/XCD/SY,g' \ -e 's,CoreServices/XCD/SY,CoreServices/System,g' \ @@ -154,10 +154,17 @@ ln -s loper/Library/PrivateFrameworks R popd > /dev/null - echo "Copying Jamfiles, Xcode Resources, and CoreServices ..." - find ".$JAMFILES" ".$XCODERESOURCES" \ - ./System/Library/CoreServices/System*.{plist,bundle} \ - ./System/Library/CoreServices/CoreTypes.bundle/ \ + echo "Copying Jamfiles and Xcode Resources ..." + find ".$JAMFILES" ".$XCODERESOURCES" | cpio -o -c | \ + sed -e 's,$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks,/XCD/SY///////Library/PrivateFrameworks,g' \ + -e 's,/Developer/Makefiles/pbx_jamfiles,/XCD/loper/Makefiles/pbx_jamfiles,g' \ + -e 's,/Developer/Library/PrivateFrameworks/DevToolsCore.framework,/XCD/loper/Library/PrivateFrameworks/DevToolsCore.framework,g' | \ + (cd "$BUILDROOT"; cpio -ium${VERBOSECPIO}d ) + + + echo "Copying CoreServices ..." + find ./System/Library/CoreServices/System*.{plist,bundle} \ + ./System/Library/CoreServices/CoreTypes.bundle/ \ | cpio -o -c | \ sed -e 's,/System,/XCD/SY,g' \ -e 's,CoreServices/XCD/SY,CoreServices/System,g' \ @@ -184,6 +191,19 @@ -e 's,platform/XCD/loper,platform/Developer,g' | \ (cd "$BUILDROOT"; cpio -ium${VERBOSECPIO}d ) + # Platform + echo "Copying Mac OS X Platform ..." + find "./Developer/Platforms/MacOSX.platform" | cpio -o -c | \ + sed -e 's,/System,/XCD/SY,g' \ + -e 's,CoreServices/XCD/SY,CoreServices/System,g' \ + -e 's,Resources/XCD/SY,Resources/System,g' \ + -e 's,/usr/lib,/XCD/lib,g' \ + -e 's,/usr/share/icu,/XCD/share/icu,g' \ + -e 's,@rpath,/XCD/R,g' \ + -e 's,/Developer,/XCD/loper,g' \ + -e 's,platform/XCD/loper,platform/Developer,g' | \ + (cd "$BUILDROOT"; cpio -ium${VERBOSECPIO}d ) + } @@ -206,6 +226,6 @@ popd > /dev/null -RemoveTemps +#RemoveTemps echo "Completed Xcode installation!" Modified: trunk/plists/9A581.plist =================================================================== --- trunk/plists/9A581.plist 2008-09-24 21:58:24 UTC (rev 389) +++ trunk/plists/9A581.plist 2008-09-26 22:28:50 UTC (rev 390) @@ -2670,6 +2670,15 @@ environment = { RC_ARCHS = "ppc ppc64 i386 x86_64"; }; + dependencies = { + build = ( + bootstrap_cmds, + xnu, + ); + header = ( + PowerManagement, + ); + }; version = 376; }; IONetworkingFamily = { @@ -8201,7 +8210,10 @@ xnu, ); header = ( + CarbonHeaders, + CF, DiskArbitration, + IOKitUser, Libc_headers, Libinfo, Libm,

1 0

[389] trunk
by source_changes＠macosforge.org 24 Sep '08

24 Sep '08

Revision: 389 http://trac.macosforge.org/projects/darwinbuild/changeset/389 Author: wsiegrist(a)apple.com Date: 2008-09-24 14:58:24 -0700 (Wed, 24 Sep 2008) Log Message: ----------- Fix build problems on non-standard OSes and support more versions of gcc Modified Paths: -------------- trunk/darwinbuild/installXcode31 trunk/darwintrace/Makefile trunk/darwintrace/darwintrace.c Modified: trunk/darwinbuild/installXcode31 =================================================================== --- trunk/darwinbuild/installXcode31 2008-09-19 22:08:26 UTC (rev 388) +++ trunk/darwinbuild/installXcode31 2008-09-24 21:58:24 UTC (rev 389) @@ -20,8 +20,14 @@ BINSYMLINKS=( \ gcc \ - gcc-3.3 \ gcc-4.0 \ + gcc-4.2 \ + gcov \ + gcov-4.0 \ + gcov-4.2 \ + g++ \ + g++-4.0 \ + g++-4.2 \ strip) Modified: trunk/darwintrace/Makefile =================================================================== --- trunk/darwintrace/Makefile 2008-09-19 22:08:26 UTC (rev 388) +++ trunk/darwintrace/Makefile 2008-09-24 21:58:24 UTC (rev 389) @@ -10,16 +10,17 @@ all: darwintrace.dylib VERSION=$(shell uname -r | cut -f1 -d. ) -ifeq ($(VERSION), 9) +ifeq ($(VERSION), 8) +CFLAGS = -nostdlib +else CFLAGS = -nodefaultlibs -else -CFLAGS = -nostdlib endif +ARCHS=$(shell lipo -info /usr/lib/libSystem.dylib | cut -d : -f 3 | sed 's/ppc7400/ppc/' | awk '{ ORS=" "; for(i=1;i<=NF;i++) print "-arch", $$i}') darwintrace.dylib: darwintrace.c cc -o $(OBJROOT)/$@ \ - -arch i386 -arch ppc -arch ppc64 \ + $(ARCHS) \ -W -Wall -pedantic -std=c99 \ -flat_namespace \ -fno-common \ Modified: trunk/darwintrace/darwintrace.c =================================================================== --- trunk/darwintrace/darwintrace.c 2008-09-19 22:08:26 UTC (rev 388) +++ trunk/darwintrace/darwintrace.c 2008-09-24 21:58:24 UTC (rev 389) @@ -43,18 +43,17 @@ #include <sys/paths.h> #include <errno.h> -#define DARWINTRACE_SHOW_PROCESS 0 #define DARWINTRACE_LOG_FULL_PATH 1 #define DARWINTRACE_DEBUG_OUTPUT 0 #define START_FD 81 static int __darwintrace_fd = -2; #define BUFFER_SIZE 1024 -#if DARWINTRACE_SHOW_PROCESS + static char __darwintrace_progname[BUFFER_SIZE]; static pid_t __darwintrace_pid = -1; -#endif + #if DARWINTRACE_DEBUG_OUTPUT #define dprintf(...) fprintf(stderr, __VA_ARGS__) #else @@ -82,7 +81,7 @@ errno = olderrno; } } -#if DARWINTRACE_SHOW_PROCESS + if (__darwintrace_pid == -1) { __darwintrace_pid = getpid(); char** progname = _NSGetProgname(); @@ -90,7 +89,7 @@ strcpy(__darwintrace_progname, *progname); } } -#endif + } /* __darwintrace_setup must have been called already */ @@ -100,13 +99,13 @@ int size; size = snprintf(__darwintrace_buf, sizeof(__darwintrace_buf), -#if DARWINTRACE_SHOW_PROCESS + "%s[%d]\t" -#endif + "%s\t%s\n", -#if DARWINTRACE_SHOW_PROCESS + procname ? procname : __darwintrace_progname, __darwintrace_pid, -#endif + tag, path ); write(fd, __darwintrace_buf, size); @@ -333,10 +332,10 @@ /* we have liftoff */ if (interp && interp[0] != '\0') { const char* procname = NULL; -#if DARWINTRACE_SHOW_PROCESS + procname = strrchr(argv[0], '/') + 1; if (procname == NULL) procname = argv[0]; -#endif + __darwintrace_cleanup_path(interp); __darwintrace_logpath(__darwintrace_fd, procname, "execve", interp);

1 0

[388] trunk/plists/9F33.plist
by source_changes＠macosforge.org 19 Sep '08

19 Sep '08

Revision: 388 http://trac.macosforge.org/projects/darwinbuild/changeset/388 Author: wsiegrist(a)apple.com Date: 2008-09-19 15:08:26 -0700 (Fri, 19 Sep 2008) Log Message: ----------- Add Darwin and MacOS version metadata and the URL to get roots from Modified Paths: -------------- trunk/plists/9F33.plist Modified: trunk/plists/9F33.plist =================================================================== --- trunk/plists/9F33.plist 2008-09-19 01:22:00 UTC (rev 387) +++ trunk/plists/9F33.plist 2008-09-19 22:08:26 UTC (rev 388) @@ -2,6 +2,11 @@ { build = 9F33; inherits = 9E17; + darwin = "Darwin 9.5"; + macosx = "Mac OS X 10.5.5"; + binary_sites = ( + "http://src.macosforge.org/Roots/9F33/", + ); projects = { AppleUSBCDCDriver = { version = 3310.4.1;

1 0

[387] trunk/darwinbuild/installXcode31
by source_changes＠macosforge.org 19 Sep '08

19 Sep '08

Revision: 387 http://trac.macosforge.org/projects/darwinbuild/changeset/387 Author: wsiegrist(a)apple.com Date: 2008-09-18 18:22:00 -0700 (Thu, 18 Sep 2008) Log Message: ----------- Change the symlinking of compilers to be a generic step to symlink any binaries that Xcode wants to use that are open source Modified Paths: -------------- trunk/darwinbuild/installXcode31 Modified: trunk/darwinbuild/installXcode31 =================================================================== --- trunk/darwinbuild/installXcode31 2008-09-19 00:53:36 UTC (rev 386) +++ trunk/darwinbuild/installXcode31 2008-09-19 01:22:00 UTC (rev 387) @@ -18,6 +18,12 @@ /Developer/Platforms/MacOSX.platform \ /Developer/Makefiles/pbx_jamfiles) +BINSYMLINKS=( \ + gcc \ + gcc-3.3 \ + gcc-4.0 \ + strip) + JAMFILES="/Developer/Makefiles/pbx_jamfiles" XCODERESOURCES="/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Versions/A/Resources/" @@ -31,15 +37,20 @@ mkdir -p "$BUILDROOT" -SymlinkCompilers() { - echo "Creating compiler symlinks ..." - COMPILER_DIR="$BUILDROOT/XCD/loper/usr/bin/" - mkdir -p $COMPILER_DIR - pushd $COMPILER_DIR > /dev/null +### +### Symlink opensource binaries used by Xcode to /usr/bin +### so the opensource-built binary can be used instead +### of the one that ships with Xcode +### +SymlinkBinaries() { + echo "Creating symlinks for binaries ..." + BIN_DIR="$BUILDROOT/XCD/loper/usr/bin/" + mkdir -p $BIN_DIR + pushd $BIN_DIR > /dev/null - ln -s /usr/bin/gcc gcc - ln -s /usr/bin/gcc-3.3 gcc-3.3 - ln -s /usr/bin/gcc-4.0 gcc-4.0 + for B in "${BINSYMLINKS[@]}"; do + ln -s "/usr/bin/$B" "$B" + done popd > /dev/null } @@ -185,7 +196,7 @@ AppendExtraFiles GenerateFileNames CopyFiles -SymlinkCompilers +SymlinkBinaries popd > /dev/null

1 0

[386] trunk/darwinbuild
by source_changes＠macosforge.org 19 Sep '08

19 Sep '08

Revision: 386 http://trac.macosforge.org/projects/darwinbuild/changeset/386 Author: wsiegrist(a)apple.com Date: 2008-09-18 17:53:36 -0700 (Thu, 18 Sep 2008) Log Message: ----------- Fix assertion failure when using Xcode 3.1. Modified Paths: -------------- trunk/darwinbuild/installXcode3 trunk/darwinbuild/installXcode31 Modified: trunk/darwinbuild/installXcode3 =================================================================== --- trunk/darwinbuild/installXcode3 2008-09-18 06:42:57 UTC (rev 385) +++ trunk/darwinbuild/installXcode3 2008-09-19 00:53:36 UTC (rev 386) @@ -17,8 +17,8 @@ JAMFILES=/Developer/Makefiles/pbx_jamfiles -XCODESETTINGS="/System/Library/PrivateFrameworks/DevToolsCore.framework/Versions/A/Resources/BuildSettings-macosx.plist" -XCODECOMP="/System/Library/PrivateFrameworks/DevToolsCore.framework/Versions/A/Resources/Built-in compilers.pbcompspec" +XCODESETTINGS="/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Versions/A/Resources/BuildSettings-macosx.plist" +XCODECOMP="/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Versions/A/Resources/Built-in compilers.pbcompspec" RPATH=/Developer/Library/PrivateFrameworks @@ -46,6 +46,7 @@ RemoveTemps() { rm -f /tmp/installXcode.libs.$$ + rm -f /tmp/installXcode.outlibs.$$ rm -f /tmp/installXcode.seen.$$ rm -f /tmp/installXcode.tmplibs.$$ rm -f /tmp/installXcode.tmpfiles.$$ @@ -119,11 +120,11 @@ find ".$JAMFILES" ".$XCODECOMP" | cpio -o -c | \ sed -e 's,$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks,/XCD/SY///////Library/PrivateFrameworks,g' \ -e 's,/Developer/Makefiles/pbx_jamfiles,/XCD/loper/Makefiles/pbx_jamfiles,g' \ - -e 's,/System/Library/PrivateFrameworks/DevToolsCore.framework,/XCD/SY/Library/PrivateFrameworks/DevToolsCore.framework,g' | \ + -e 's,/Developer/Library/PrivateFrameworks/DevToolsCore.framework,/XCD/SY/Library/PrivateFrameworks/DevToolsCore.framework,g' | \ (cd "$BUILDROOT"; cpio -ium${VERBOSECPIO}d ) find ".$XCODESETTINGS" | cpio -o -c | \ - sed -e 's,/System/Library/PrivateFrameworks/DevToolsCore.framework,/XCD/SY/Library/PrivateFrameworks/DevToolsCore.framework,g' | \ + sed -e 's,/Developer/Library/PrivateFrameworks/DevToolsCore.framework,/XCD/SY/Library/PrivateFrameworks/DevToolsCore.framework,g' | \ (cd "$BUILDROOT"; cpio -ium${VERBOSECPIO}d ) echo "done" Modified: trunk/darwinbuild/installXcode31 =================================================================== --- trunk/darwinbuild/installXcode31 2008-09-18 06:42:57 UTC (rev 385) +++ trunk/darwinbuild/installXcode31 2008-09-19 00:53:36 UTC (rev 386) @@ -12,14 +12,15 @@ /Developer/Tools \ /usr/bin/xcodebuild \ /usr/bin/xcode-select \ + /Developer/Library/version.plist \ + /Developer/usr/bin/dsymutil \ /Developer/usr/bin/xcodebuild \ /Developer/Platforms/MacOSX.platform \ /Developer/Makefiles/pbx_jamfiles) -JAMFILES=/Developer/Makefiles/pbx_jamfiles -XCODESETTINGS="/System/Library/PrivateFrameworks/DevToolsCore.framework/Versions/A/Resources/BuildSettings-macosx.plist" -XCODECOMP="/System/Library/PrivateFrameworks/DevToolsCore.framework/Versions/A/Resources/Built-in compilers.pbcompspec" +JAMFILES="/Developer/Makefiles/pbx_jamfiles" +XCODERESOURCES="/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Versions/A/Resources/" RPATH=/Developer/Library/PrivateFrameworks @@ -30,6 +31,19 @@ mkdir -p "$BUILDROOT" +SymlinkCompilers() { + echo "Creating compiler symlinks ..." + COMPILER_DIR="$BUILDROOT/XCD/loper/usr/bin/" + mkdir -p $COMPILER_DIR + pushd $COMPILER_DIR > /dev/null + + ln -s /usr/bin/gcc gcc + ln -s /usr/bin/gcc-3.3 gcc-3.3 + ln -s /usr/bin/gcc-4.0 gcc-4.0 + + popd > /dev/null +} + ### ### Recurse through frameworks and libraries looking for dependencies ### @@ -47,6 +61,7 @@ RemoveTemps() { rm -f /tmp/installXcode.libs.$$ + rm -f /tmp/installXcode.outlibs.$$ rm -f /tmp/installXcode.seen.$$ rm -f /tmp/installXcode.tmplibs.$$ rm -f /tmp/installXcode.tmpfiles.$$ @@ -107,6 +122,8 @@ # The [^m] used for /Developer is to prevent matching Platform subdirectories cpio -o -c < /tmp/installXcode.files.$$ | \ sed -e 's,/System,/XCD/SY,g' \ + -e 's,CoreServices/XCD/SY,CoreServices/System,g' \ + -e 's,Resources/XCD/SY,Resources/System,g' \ -e 's,/usr/lib,/XCD/lib,g' \ -e 's,/usr/share/icu,/XCD/share/icu,g' \ -e 's,@rpath,/XCD/R,g' \ @@ -114,22 +131,42 @@ -e 's,platform/XCD/loper,platform/Developer,g' | \ (cd "$BUILDROOT"; cpio -ium${VERBOSECPIO}d ) + echo "Symlinking for RPATH ..." # symlink R to @rpath so we can replace uses of @rpath pushd "$BUILDROOT/XCD" > /dev/null ln -s loper/Library/PrivateFrameworks R popd > /dev/null - find ".$JAMFILES" ".$XCODECOMP" | cpio -o -c | \ - sed -e 's,$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks,/XCD/SY///////Library/PrivateFrameworks,g' \ - -e 's,/Developer/Makefiles/pbx_jamfiles,/XCD/loper/Makefiles/pbx_jamfiles,g' \ - -e 's,/System/Library/PrivateFrameworks/DevToolsCore.framework,/XCD/SY/Library/PrivateFrameworks/DevToolsCore.framework,g' | \ + echo "Copying Jamfiles, Xcode Resources, and CoreServices ..." + find ".$JAMFILES" ".$XCODERESOURCES" \ + ./System/Library/CoreServices/System*.{plist,bundle} \ + ./System/Library/CoreServices/CoreTypes.bundle/ \ + | cpio -o -c | \ + sed -e 's,/System,/XCD/SY,g' \ + -e 's,CoreServices/XCD/SY,CoreServices/System,g' \ + -e 's,Resources/XCD/SY,Resources/System,g' \ + -e 's,/usr/lib,/XCD/lib,g' \ + -e 's,/usr/share/icu,/XCD/share/icu,g' \ + -e 's,@rpath,/XCD/R,g' \ + -e 's,/Developer,/XCD/loper,g' \ + -e 's,platform/XCD/loper,platform/Developer,g' | \ (cd "$BUILDROOT"; cpio -ium${VERBOSECPIO}d ) - find ".$XCODESETTINGS" | cpio -o -c | \ - sed -e 's,/System/Library/PrivateFrameworks/DevToolsCore.framework,/XCD/SY/Library/PrivateFrameworks/DevToolsCore.framework,g' | \ - (cd "$BUILDROOT"; cpio -ium${VERBOSECPIO}d ) + # copy xcode support files such as plugins + # but do not copy svn plugins since they are unecessary + echo "Copying Xcode library support files ..." + find "./Developer/Library/Xcode/" \! -ipath '*subversion*' \ + | cpio -o -c | \ + sed -e 's,/System,/XCD/SY,g' \ + -e 's,CoreServices/XCD/SY,CoreServices/System,g' \ + -e 's,Resources/XCD/SY,Resources/System,g' \ + -e 's,/usr/lib,/XCD/lib,g' \ + -e 's,/usr/share/icu,/XCD/share/icu,g' \ + -e 's,@rpath,/XCD/R,g' \ + -e 's,/Developer,/XCD/loper,g' \ + -e 's,platform/XCD/loper,platform/Developer,g' | \ + (cd "$BUILDROOT"; cpio -ium${VERBOSECPIO}d ) - echo "done" } @@ -148,7 +185,10 @@ AppendExtraFiles GenerateFileNames CopyFiles +SymlinkCompilers popd > /dev/null RemoveTemps + +echo "Completed Xcode installation!"

1 0

[385] trunk/darwinup
by source_changes＠macosforge.org 18 Sep '08

18 Sep '08

Revision: 385 http://trac.macosforge.org/projects/darwinbuild/changeset/385 Author: kvv(a)apple.com Date: 2008-09-17 23:42:57 -0700 (Wed, 17 Sep 2008) Log Message: ----------- UNIX03 changes Modified Paths: -------------- trunk/darwinup/Archive.h trunk/darwinup/Depot.cpp trunk/darwinup/Makefile trunk/darwinup/SerialSet.h trunk/darwinup/Utils.h Modified: trunk/darwinup/Archive.h =================================================================== --- trunk/darwinup/Archive.h 2008-09-18 01:06:55 UTC (rev 384) +++ trunk/darwinup/Archive.h 2008-09-18 06:42:57 UTC (rev 385) @@ -21,6 +21,7 @@ * @APPLE_LICENSE_HEADER_END@ */ +#include <stdint.h> #include <stdio.h> #include <sys/types.h> #include <time.h> Modified: trunk/darwinup/Depot.cpp =================================================================== --- trunk/darwinup/Depot.cpp 2008-09-18 01:06:55 UTC (rev 384) +++ trunk/darwinup/Depot.cpp 2008-09-18 06:42:57 UTC (rev 385) @@ -335,8 +335,11 @@ // If we're going to need to squirrel away data, create // the directory hierarchy now. if (INFO_TEST(actual->info(), FILE_INFO_ROLLBACK_DATA)) { - const char* path = actual->path(); + char path[PATH_MAX]; char* backup_dirpath; + + size_t len = strlcpy(path, actual->path(), sizeof(path)); + assert(len <= sizeof(path)); const char* dir = dirname(path); assert(dir != NULL); Modified: trunk/darwinup/Makefile =================================================================== --- trunk/darwinup/Makefile 2008-09-18 01:06:55 UTC (rev 384) +++ trunk/darwinup/Makefile 2008-09-18 06:42:57 UTC (rev 385) @@ -11,8 +11,12 @@ # libredo.o is generated from cctools_ofiles +REDO=$(shell if [ -f /usr/local/lib/libredo_prebinding.a ]; then \ + echo /usr/local/lib/libredo_prebinding.a ; else \ + echo libredo.o ; fi) + darwinup: Archive.o Depot.o Digest.o File.o SerialSet.o Utils.o main.o \ - libredo.o + $(REDO) g++ -lcrypto -lsqlite3 -o $@ $^ clean: Modified: trunk/darwinup/SerialSet.h =================================================================== --- trunk/darwinup/SerialSet.h 2008-09-18 01:06:55 UTC (rev 384) +++ trunk/darwinup/SerialSet.h 2008-09-18 06:42:57 UTC (rev 385) @@ -21,6 +21,7 @@ * @APPLE_LICENSE_HEADER_END@ */ +#include <stdint.h> #include <sys/types.h> // a variably lengthed set of serial numbers from the database Modified: trunk/darwinup/Utils.h =================================================================== --- trunk/darwinup/Utils.h 2008-09-18 01:06:55 UTC (rev 384) +++ trunk/darwinup/Utils.h 2008-09-18 06:42:57 UTC (rev 385) @@ -21,6 +21,7 @@ * @APPLE_LICENSE_HEADER_END@ */ +#include <stdint.h> #include <sys/types.h> #include <fts.h>

1 0

[384] trunk/plists/9F33.plist
by source_changes＠macosforge.org 18 Sep '08

18 Sep '08

Revision: 384 http://trac.macosforge.org/projects/darwinbuild/changeset/384 Author: wsiegrist(a)apple.com Date: 2008-09-17 18:06:55 -0700 (Wed, 17 Sep 2008) Log Message: ----------- Adding plist for Darwin 9.5 (9F33) Added Paths: ----------- trunk/plists/9F33.plist Added: trunk/plists/9F33.plist =================================================================== --- trunk/plists/9F33.plist (rev 0) +++ trunk/plists/9F33.plist 2008-09-18 01:06:55 UTC (rev 384) @@ -0,0 +1,117 @@ +// !$*UTF8*$! +{ + build = 9F33; + inherits = 9E17; + projects = { + AppleUSBCDCDriver = { + version = 3310.4.1; + }; + BootCache = { + version = 43.5; + }; + CF = { + version = 476.15; + }; + ChatServer = { + version = 263.1; + }; + DirectoryService = { + target = DirectoryServiceFW; + version = 514.23; + }; + IOHIDFamily = { + version = 258.3; + }; + IOKitUser = { + version = 388.2.1; + }; + IOUSBMassStorageClass = { + version = 202.1.0; + }; + Kerberos = { + version = 75.10.5; + }; + OpenLDAP = { + version = 110; + }; + OpenSSH = { + version = 95.1.4; + }; + OpenSSL = { + version = 46.10; + }; + PowerManagement = { + version = 143.11; + }; + TimeZoneData = { + version = 13; + }; + X11apps = { + version = 14.1; + }; + X11fonts = { + version = 5.1; + }; + X11libs = { + version = 17.3; + }; + X11proto = { + version = 15.1; + }; + X11server = { + version = 48.4; + }; + apache_mod_php = { + version = 44.1; + }; + bind9 = { + version = 26.1.2; + }; + clamav = { + version = 116.4; + }; + cups = { + target = installfat; + version = 136.11; + }; + eap8021x = { + version = 49.7; + }; + ipsec = { + version = 34.0.2; + }; + launchd = { + version = 258.18; + }; + libresolv = { + version = 25.0.2; + }; + mDNSResponder = { + version = 176.2; + }; + objc4 = { + version = 371.2; + }; + rsync = { + version = 35.2; + }; + ruby = { + version = 67.4; + }; + samba = { + version = 187.8; + }; + security_certificates = { + version = 34618; + }; + smb = { + version = 348.5; + }; + xar = { + version = 30; + }; + xnu = { + version = 1228.7.58; + }; + }; +}

1 0

[383] trunk/darwinbuild
by source_changes＠macosforge.org 17 Sep '08

17 Sep '08

Revision: 383 http://trac.macosforge.org/projects/darwinbuild/changeset/383 Author: wsiegrist(a)apple.com Date: 2008-09-16 19:13:29 -0700 (Tue, 16 Sep 2008) Log Message: ----------- Initial work for Xcode 3.1+ using the dynamic dependency determination used for Xcode 2. There are still problems with Xcode 3.1 support so this is just a preview while we work out the problems. I also changed the Xcode 3.0 to be the same as 2 and 3.1. Modified Paths: -------------- trunk/darwinbuild/Makefile trunk/darwinbuild/darwinbuild trunk/darwinbuild/installXcode trunk/darwinbuild/installXcode3 Added Paths: ----------- trunk/darwinbuild/installXcode31 Removed Paths: ------------- trunk/darwinbuild/xcodefiles/ Modified: trunk/darwinbuild/Makefile =================================================================== --- trunk/darwinbuild/Makefile 2008-08-13 01:18:11 UTC (rev 382) +++ trunk/darwinbuild/Makefile 2008-09-17 02:13:29 UTC (rev 383) @@ -4,7 +4,6 @@ ### Variables for the 'install' phase ### DATDIR:=$(DATDIR)/darwinbuild -XCFILEDIR:=$(DATDIR)/xcodefiles all: manifest @@ -21,10 +20,8 @@ $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode $(DATDIR) $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode2 $(DATDIR) $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode3 $(DATDIR) + $(INSTALL) $(INSTALL_EXE_FLAGS) installXcode31 $(DATDIR) - [ -d $(XCFILEDIR) ] || $(INSTALL) -d $(INSTALL_DIR_FLAGS) $(XCFILEDIR) - $(INSTALL) $(INSTALL_DOC_FLAGS) xcodefiles/* $(XCFILEDIR) - $(INSTALL) $(INSTALL_EXE_FLAGS) createChroot $(DATDIR) $(INSTALL) $(INSTALL_EXE_FLAGS) $(OBJROOT)/manifest $(DATDIR) $(INSTALL) $(INSTALL_EXE_FLAGS) ditto.sh $(DATDIR)/ditto @@ -41,10 +38,9 @@ rm -f $(DATDIR)/installXcode rm -f $(DATDIR)/installXcode2 rm -f $(DATDIR)/installXcode3 + rm -f $(DATDIR)/installXcode31 rm -f $(DATDIR)/createChroot rm -f $(DATDIR)/manifest - rm -f $(XCFILEDIR)/* - -rmdir $(XCFILEDIR) -rmdir $(DATDIR) clean: Modified: trunk/darwinbuild/darwinbuild =================================================================== --- trunk/darwinbuild/darwinbuild 2008-08-13 01:18:11 UTC (rev 382) +++ trunk/darwinbuild/darwinbuild 2008-09-17 02:13:29 UTC (rev 383) @@ -170,7 +170,7 @@ usage: flags: [-headers] [-build=X] [-target=X] [-logdeps] [-nochroot] [-nopatch] [-noload | -loadonly] [-depsbuild=X [-depsbuild=Y]] - [-fetch] [-source] + [-fetch] [-source] [-load] EOF exit 1 } @@ -593,17 +593,15 @@ export CHROOTED export PATH=/bin:/sbin:/usr/bin:/usr/sbin/:/usr/local/bin:/usr/local/sbin + +# sets the install path to xcode tools +export DEVELOPER_DIR="/XCD/loper" + export SHELL="/bin/sh" export HOME="/var/root" export LOGNAME="root" export USER="root" export GROUP="wheel" -#export HOST=$(hostname) -#export HOSTTYPE="powermac" -#export MACHTYPE=$(uname -p) -#export OSTYPE="darwin" -#export UNAME_RELEASE -#export UNAME_SYSNAME build_string="" if [ "$buildtool" == "xcodebuild" -a "$target" != "" ]; then Modified: trunk/darwinbuild/installXcode =================================================================== --- trunk/darwinbuild/installXcode 2008-08-13 01:18:11 UTC (rev 382) +++ trunk/darwinbuild/installXcode 2008-09-17 02:13:29 UTC (rev 383) @@ -7,7 +7,14 @@ if [ "$VER" -gt "920" ]; then - "$BINDIR/installXcode3" "$BROOT"; + if [ "$VER" -gt "1000" ]; + then + "$BINDIR/installXcode31" "$BROOT"; + else + "$BINDIR/installXcode3" "$BROOT"; + fi else "$BINDIR/installXcode2" "$BROOT"; fi + + Modified: trunk/darwinbuild/installXcode3 =================================================================== --- trunk/darwinbuild/installXcode3 2008-08-13 01:18:11 UTC (rev 382) +++ trunk/darwinbuild/installXcode3 2008-09-17 02:13:29 UTC (rev 383) @@ -1,57 +1,151 @@ #!/bin/sh -XCFILEDIR=/usr/local/share/darwinbuild/xcodefiles -BROOT=$1 +FORCE="YES" -if [ "x$BROOT" == "x" ]; -then - echo "$0 <build root>"; - exit 1; +XCODEBUILD=/Developer/usr/bin/xcodebuild +BUILDROOT="$1" + +EXTRACOPY=( \ + /usr/lib/dyld \ + /usr/share/icu \ + /Developer/Private \ + /Developer/Tools \ + /usr/bin/xcodebuild \ + /usr/bin/xcode-select \ + /Developer/usr/bin/xcodebuild \ + /Developer/Makefiles/pbx_jamfiles) + + +JAMFILES=/Developer/Makefiles/pbx_jamfiles +XCODESETTINGS="/System/Library/PrivateFrameworks/DevToolsCore.framework/Versions/A/Resources/BuildSettings-macosx.plist" +XCODECOMP="/System/Library/PrivateFrameworks/DevToolsCore.framework/Versions/A/Resources/Built-in compilers.pbcompspec" + +RPATH=/Developer/Library/PrivateFrameworks + +if [ -z "$BUILDROOT" ]; then + echo "Usage: $0 <BuildRoot>" 1>&2 + exit 1 fi -echo "Installing xcodebuild into ${BROOT}"; +mkdir -p "$BUILDROOT" -# make initial buildroot and symlinks if needed -echo "Making initial build root..."; -mkdir -p "${BROOT}"; -pushd $BROOT >> /dev/null -for D in etc tmp var ; -do - if [ ! -L $D ] ; - then - echo "Symlinking $D"; - ln -s private/$D $D ; - fi -done; -popd >> /dev/null +### +### Recurse through frameworks and libraries looking for dependencies +### +RecurseLibs() { + echo $1 >> /tmp/installXcode.seen.$$ + otool -L $1 | tail -n +2 | awk '{ print $1 }' > /tmp/installXcode.tmplibs.$$ + sed -e s,@rpath,${RPATH}, < /tmp/installXcode.tmplibs.$$ > /tmp/installXcode.outlibs.$$ + cat /tmp/installXcode.outlibs.$$ >> /tmp/installXcode.libs.$$ + cat /tmp/installXcode.outlibs.$$ | while read X; do + if ! grep -q "^$X\$" /tmp/installXcode.seen.$$ ; then + RecurseLibs $X + fi + done +} +RemoveTemps() { + rm -f /tmp/installXcode.libs.$$ + rm -f /tmp/installXcode.seen.$$ + rm -f /tmp/installXcode.tmplibs.$$ + rm -f /tmp/installXcode.tmpfiles.$$ + rm -f /tmp/installXcode.files.$$ +} -# copy files we need -exec <$XCFILEDIR/Xcode_3.0.txt -while read line; -do - case "${line}" in - *".framework") - if [ -d ${BROOT}/${line} ] ; - then - echo "Deleting: ${BROOT}/${line}"; - rm -r "${BROOT}/${line}" ; - fi ;; - esac - parent=$(dirname $line); - echo "Copying: ${line}"; - mkdir -p "${BROOT}/${parent}" ; - cp -R "${line}" "${BROOT}/${parent}" ; -done; +AppendExtraFiles() { + for X in "${EXTRACOPY[@]}"; do + echo "$X" >> /tmp/installXcode.libs.$$ + done +} -# load roots -echo "Loading roots that Xcode needs..."; -darwinbuild -load objc4 -darwinbuild -load ICU -darwinbuild -load libxml2 -darwinbuild -load SQLite -darwinbuild -load libxslt -darwinbuild -load OpenSSL -darwinbuild -load DiskArbitration -darwinbuild -load pb_makefiles +TransformLibs() { +# set -x + while read X; do + NEWX=$(echo $X | sed -n 's/$.*\.framework$.*/\1/p') + if [ -n "$NEWX" ]; then + # if we're copying a framework binary, copy the entire bundle + echo "$NEWX" + continue + fi + NEWX=$(echo $X | sed -n 's/$[^.]*$\..*dylib$/\1/p') + if [ -n "$NEWX" ]; then + # if we're copying a dylib, copy associate symlinks and stuff + for Y in "$NEWX"*.dylib; do + echo "$Y" + done + continue + fi + + echo "$X" + done +# set +x +} + +GenerateFileNames() { + cat /tmp/installXcode.libs.$$ | sort -u | TransformLibs | sort -u | while read X; do + # echo adding children for "$X" + + # first mkdir parent directories + PARENT=$(dirname "$X") + while [ "$PARENT" != "/" -a "$PARENT" != "." ]; do + echo ".$PARENT" >> /tmp/installXcode.tmpfiles.$$ + PARENT=$(dirname "$PARENT") + done + find ".$X" \! $ -name \*_debug\* -o -name \*_profile\* -o -path \*/Headers\* -o -path \*/PrivateHeaders\* -o -path \*.dict\* $ >> /tmp/installXcode.tmpfiles.$$ + done + sort -u /tmp/installXcode.tmpfiles.$$ > /tmp/installXcode.files.$$ +} + +CopyFiles() { +# VERBOSECPIO="v" + VERBOSECPIO="" + echo "Copying Xcode and dependencies ..." + + # copy files and use sed to rewrite paths during copy + cpio -o -c < /tmp/installXcode.files.$$ | \ + sed -e 's,/System,/XCD/SY,g' \ + -e 's,/usr/lib,/XCD/lib,g' \ + -e 's,/usr/share/icu,/XCD/share/icu,g' \ + -e 's,@rpath,/XCD/R,g' \ + -e 's,/Developer,/XCD/loper,g' | \ + (cd "$BUILDROOT"; cpio -ium${VERBOSECPIO}d ) + + # symlink R to @rpath so we can replace uses of @rpath + pushd "$BUILDROOT/XCD" > /dev/null + ln -s loper/Library/PrivateFrameworks R + popd > /dev/null + + find ".$JAMFILES" ".$XCODECOMP" | cpio -o -c | \ + sed -e 's,$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks,/XCD/SY///////Library/PrivateFrameworks,g' \ + -e 's,/Developer/Makefiles/pbx_jamfiles,/XCD/loper/Makefiles/pbx_jamfiles,g' \ + -e 's,/System/Library/PrivateFrameworks/DevToolsCore.framework,/XCD/SY/Library/PrivateFrameworks/DevToolsCore.framework,g' | \ + (cd "$BUILDROOT"; cpio -ium${VERBOSECPIO}d ) + + find ".$XCODESETTINGS" | cpio -o -c | \ + sed -e 's,/System/Library/PrivateFrameworks/DevToolsCore.framework,/XCD/SY/Library/PrivateFrameworks/DevToolsCore.framework,g' | \ + (cd "$BUILDROOT"; cpio -ium${VERBOSECPIO}d ) + + echo "done" +} + + + +### +### Find all the framework and library dependencies of Xcode build +### For frameworks, copy over all supporting files. +### + +pushd / > /dev/null + +RemoveTemps +touch /tmp/installXcode.seen.$$ +echo Analyzing Xcode dependencies ... +RecurseLibs $XCODEBUILD +AppendExtraFiles +GenerateFileNames +CopyFiles + +popd > /dev/null + +RemoveTemps Added: trunk/darwinbuild/installXcode31 =================================================================== --- trunk/darwinbuild/installXcode31 (rev 0) +++ trunk/darwinbuild/installXcode31 2008-09-17 02:13:29 UTC (rev 383) @@ -0,0 +1,154 @@ +#!/bin/sh + +FORCE="YES" + +XCODEBUILD=/Developer/usr/bin/xcodebuild +BUILDROOT="$1" + +EXTRACOPY=( \ + /usr/lib/dyld \ + /usr/share/icu \ + /Developer/Private \ + /Developer/Tools \ + /usr/bin/xcodebuild \ + /usr/bin/xcode-select \ + /Developer/usr/bin/xcodebuild \ + /Developer/Platforms/MacOSX.platform \ + /Developer/Makefiles/pbx_jamfiles) + + +JAMFILES=/Developer/Makefiles/pbx_jamfiles +XCODESETTINGS="/System/Library/PrivateFrameworks/DevToolsCore.framework/Versions/A/Resources/BuildSettings-macosx.plist" +XCODECOMP="/System/Library/PrivateFrameworks/DevToolsCore.framework/Versions/A/Resources/Built-in compilers.pbcompspec" + +RPATH=/Developer/Library/PrivateFrameworks + +if [ -z "$BUILDROOT" ]; then + echo "Usage: $0 <BuildRoot>" 1>&2 + exit 1 +fi + +mkdir -p "$BUILDROOT" + +### +### Recurse through frameworks and libraries looking for dependencies +### +RecurseLibs() { + echo $1 >> /tmp/installXcode.seen.$$ + otool -L $1 | tail -n +2 | awk '{ print $1 }' > /tmp/installXcode.tmplibs.$$ + sed -e s,@rpath,${RPATH}, < /tmp/installXcode.tmplibs.$$ > /tmp/installXcode.outlibs.$$ + cat /tmp/installXcode.outlibs.$$ >> /tmp/installXcode.libs.$$ + cat /tmp/installXcode.outlibs.$$ | while read X; do + if ! grep -q "^$X\$" /tmp/installXcode.seen.$$ ; then + RecurseLibs $X + fi + done +} + +RemoveTemps() { + rm -f /tmp/installXcode.libs.$$ + rm -f /tmp/installXcode.seen.$$ + rm -f /tmp/installXcode.tmplibs.$$ + rm -f /tmp/installXcode.tmpfiles.$$ + rm -f /tmp/installXcode.files.$$ +} + +AppendExtraFiles() { + for X in "${EXTRACOPY[@]}"; do + echo "$X" >> /tmp/installXcode.libs.$$ + done +} + +TransformLibs() { +# set -x + while read X; do + NEWX=$(echo $X | sed -n 's/$.*\.framework$.*/\1/p') + if [ -n "$NEWX" ]; then + # if we're copying a framework binary, copy the entire bundle + echo "$NEWX" + continue + fi + + NEWX=$(echo $X | sed -n 's/$[^.]*$\..*dylib$/\1/p') + if [ -n "$NEWX" ]; then + # if we're copying a dylib, copy associate symlinks and stuff + for Y in "$NEWX"*.dylib; do + echo "$Y" + done + continue + fi + + echo "$X" + done +# set +x +} + +GenerateFileNames() { + cat /tmp/installXcode.libs.$$ | sort -u | TransformLibs | sort -u | while read X; do + # echo adding children for "$X" + + # first mkdir parent directories + PARENT=$(dirname "$X") + while [ "$PARENT" != "/" -a "$PARENT" != "." ]; do + echo ".$PARENT" >> /tmp/installXcode.tmpfiles.$$ + PARENT=$(dirname "$PARENT") + done + find ".$X" \! $ -name \*_debug\* -o -name \*_profile\* -o -path \*/Headers\* -o -path \*/PrivateHeaders\* -o -path \*.dict\* $ >> /tmp/installXcode.tmpfiles.$$ + done + sort -u /tmp/installXcode.tmpfiles.$$ > /tmp/installXcode.files.$$ +} + +CopyFiles() { +# VERBOSECPIO="v" + VERBOSECPIO="" + echo "Copying Xcode and dependencies ..." + + # copy files and use sed to rewrite paths during copy + # The [^m] used for /Developer is to prevent matching Platform subdirectories + cpio -o -c < /tmp/installXcode.files.$$ | \ + sed -e 's,/System,/XCD/SY,g' \ + -e 's,/usr/lib,/XCD/lib,g' \ + -e 's,/usr/share/icu,/XCD/share/icu,g' \ + -e 's,@rpath,/XCD/R,g' \ + -e 's,/Developer,/XCD/loper,g' \ + -e 's,platform/XCD/loper,platform/Developer,g' | \ + (cd "$BUILDROOT"; cpio -ium${VERBOSECPIO}d ) + + # symlink R to @rpath so we can replace uses of @rpath + pushd "$BUILDROOT/XCD" > /dev/null + ln -s loper/Library/PrivateFrameworks R + popd > /dev/null + + find ".$JAMFILES" ".$XCODECOMP" | cpio -o -c | \ + sed -e 's,$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks,/XCD/SY///////Library/PrivateFrameworks,g' \ + -e 's,/Developer/Makefiles/pbx_jamfiles,/XCD/loper/Makefiles/pbx_jamfiles,g' \ + -e 's,/System/Library/PrivateFrameworks/DevToolsCore.framework,/XCD/SY/Library/PrivateFrameworks/DevToolsCore.framework,g' | \ + (cd "$BUILDROOT"; cpio -ium${VERBOSECPIO}d ) + + find ".$XCODESETTINGS" | cpio -o -c | \ + sed -e 's,/System/Library/PrivateFrameworks/DevToolsCore.framework,/XCD/SY/Library/PrivateFrameworks/DevToolsCore.framework,g' | \ + (cd "$BUILDROOT"; cpio -ium${VERBOSECPIO}d ) + + echo "done" +} + + + +### +### Find all the framework and library dependencies of Xcode build +### For frameworks, copy over all supporting files. +### + +pushd / > /dev/null + +RemoveTemps +touch /tmp/installXcode.seen.$$ +echo Analyzing Xcode dependencies ... +RecurseLibs $XCODEBUILD +AppendExtraFiles +GenerateFileNames +CopyFiles + +popd > /dev/null + +RemoveTemps Property changes on: trunk/darwinbuild/installXcode31 ___________________________________________________________________ Added: svn:executable + *

1 0