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

[269] trunk/darwinbuild/buildlist.sh
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 269 http://trac.macosforge.org/projects/darwinbuild/changeset/269 Author: ssen Date: 2006-10-04 02:02:08 -0700 (Wed, 04 Oct 2006) Log Message: ----------- Helper script to take a list of projects and build them. It keeps the BuildRoot/ clean, and verifies the projects against the "nobuild" group Added Paths: ----------- trunk/darwinbuild/buildlist.sh Added: trunk/darwinbuild/buildlist.sh =================================================================== --- trunk/darwinbuild/buildlist.sh (rev 0) +++ trunk/darwinbuild/buildlist.sh 2006-10-04 09:02:08 UTC (rev 269) @@ -0,0 +1,37 @@ +#!/bin/sh + +if [ $# -ne 1 ]; then + echo "Usage: $0 projects.txt" 1>&2 + exit 1 +fi + +PROJECTS="$1" + +function SkipBuild() { + local project="$1" + for exclude in `darwinxref group nobuild`; do + if [ "$project" = "$exclude" ]; then + return 0 + fi + done + return 1 +} + +cat "$PROJECTS" | while read proj; do + SkipBuild $proj + if [ $? -eq 0 ]; then + continue + fi + echo -n "Building $proj..." + mkdir -p WholeLogs + darwinbuild -noload $proj > WholeLogs/$proj 2>&1 + if [ $? -eq 0 ]; then + echo " done" + else + echo " FAILED" + fi + + rm -rf BuildRoot/SourceCache + rm -rf BuildRoot/var/tmp/$proj + +done Property changes on: trunk/darwinbuild/buildlist.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:eol-style + native

1 0

[267] trunk/darwinbuild/packageRoots.sh
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 267 http://trac.macosforge.org/projects/darwinbuild/changeset/267 Author: ssen Date: 2006-10-04 02:02:07 -0700 (Wed, 04 Oct 2006) Log Message: ----------- let's just use . for xar. You need xar CVS (post-1.0) for it to not crash Modified Paths: -------------- trunk/darwinbuild/packageRoots.sh Modified: trunk/darwinbuild/packageRoots.sh =================================================================== --- trunk/darwinbuild/packageRoots.sh 2005-09-18 07:03:52 UTC (rev 266) +++ trunk/darwinbuild/packageRoots.sh 2006-10-04 09:02:07 UTC (rev 267) @@ -119,7 +119,7 @@ xar) FILE="$DARWIN_BUILDROOT/Packages/$PROJ$SFX.xar" ARGS="-c -f" - SRCARG="$SOURCEDIR" + SRCARG="." ;; *) FILE="$DARWIN_BUILDROOT/Packages/$PROJ$SFX.$TOOL"

1 0

[266] trunk/darwinbuild/darwinbuild.common
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 266 http://trac.macosforge.org/projects/darwinbuild/changeset/266 Author: ssen Date: 2006-10-04 02:02:06 -0700 (Wed, 04 Oct 2006) Log Message: ----------- remove temp files when creating receipts Modified Paths: -------------- trunk/darwinbuild/darwinbuild.common Modified: trunk/darwinbuild/darwinbuild.common =================================================================== --- trunk/darwinbuild/darwinbuild.common 2005-09-18 06:57:50 UTC (rev 265) +++ trunk/darwinbuild/darwinbuild.common 2006-10-04 09:02:06 UTC (rev 266) @@ -498,6 +498,7 @@ cp "$TmpFile" "$receipts/$Hash" ln -sf "$Hash" "$receipts/$Project$RootType" + rm "$TmpFile" return 0 }

1 0

[265] trunk/darwinbuild/packageRoots.sh
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 265 http://trac.macosforge.org/projects/darwinbuild/changeset/265 Author: ssen Date: 2006-10-04 02:02:06 -0700 (Wed, 04 Oct 2006) Log Message: ----------- Redo a bit. Now supports -x to create xar packages. This currently doesn't work because of a bug in xar 1.0. But it should be more flexible for the future. Modified Paths: -------------- trunk/darwinbuild/packageRoots.sh Modified: trunk/darwinbuild/packageRoots.sh =================================================================== --- trunk/darwinbuild/packageRoots.sh 2005-09-17 21:06:33 UTC (rev 264) +++ trunk/darwinbuild/packageRoots.sh 2006-10-04 09:02:06 UTC (rev 265) @@ -32,6 +32,8 @@ # # Kevin Van Vechten <kevin(a)opendarwin.org> +set -e + PREFIX=/usr/local XREFDB=.build/xref.db DARWINXREF=$PREFIX/bin/darwinxref @@ -39,28 +41,44 @@ COMMONFILE=$DATADIR/darwinbuild.common NORUN="" +VERBOSE="true" +TOOL="tar" ### ### Interpret our arguments: ### -n Don't actually package anything, just say what we would do. function PrintUsage() { - echo "usage: $(basename $0) [-n]" 1>&2 + echo "usage: $(basename $0) [-n] [-x]" 1>&2 exit } -for ARG in "$@"; do - if [ "$NORUN" == "" ]; then - if [ "$ARG" == "-n" ]; then - NORUN="YES" - else - PrintUsage "$0" - fi - else - PrintUsage "$0" - fi +args=`getopt nxv $*` +if [ $? -ne 0 ]; then + PrintUsage +fi + +set -- $args + +for i; do + case "$i" in + -n) + NORUN="true" + shift + ;; + -x) + TOOL="xar" + shift + ;; + -v) + VERBOSE="echo" + shift + ;; + --) + shift + ;; + esac done - ### ### Include some common subroutines ### @@ -73,31 +91,51 @@ ### CheckDarwinBuildRoot - -if [ "$NORUN" == "YES" ]; then - CMD="echo SKIPPING tar czf" -else - CMD="tar czf" -fi - if [ ! -d "$DARWIN_BUILDROOT/Packages" ]; then - mkdir "$DARWIN_BUILDROOT/Packages" + mkdir "$DARWIN_BUILDROOT/Packages" fi +$TOOL --version > /dev/null +echo "Archive tool: $($TOOL --version | head -1)" + function PackageThem() { - local DIR="$1" - local SFX="$2" - echo "*** Packaging $DIR" - "$DARWINXREF" version '*' | while read X; do - Y="${X/-*/}" - build_version=$(GetBuildVersion $DARWIN_BUILDROOT/$DIR/$Y/$X*) - if [ "$build_version" != "0" -a \ - "$DARWIN_BUILDROOT/$DIR/$Y/$X$SFX~$build_version" -nt \ - "$DARWIN_BUILDROOT/Packages/$X$SFX.tar.gz" ]; then - echo "$X$SFX~$build_version" - cd "$DARWIN_BUILDROOT/$DIR/$Y/$X$SFX~$build_version" - eval $CMD "$DARWIN_BUILDROOT/Packages/$Y$SFX.tar.gz" . - fi + local DIR="$1" + local SFX="$2" + echo "*** Packaging $DIR" + "$DARWINXREF" version '*' | while read PROJVERS; do + local PROJ="${PROJVERS/-*/}" + local FILE="" + local ARGS="" + local SRCARG="" + local build_version=$(GetBuildVersion $DARWIN_BUILDROOT/$DIR/$PROJ/$PROJVERS*) + local SOURCEDIR="$DARWIN_BUILDROOT/$DIR/$PROJ/$PROJVERS$SFX~$build_version" + + case "$TOOL" in + tar) + FILE="$DARWIN_BUILDROOT/Packages/$PROJ$SFX.tar.gz" + ARGS="zcf" + SRCARG="." + ;; + xar) + FILE="$DARWIN_BUILDROOT/Packages/$PROJ$SFX.xar" + ARGS="-c -f" + SRCARG="$SOURCEDIR" + ;; + *) + FILE="$DARWIN_BUILDROOT/Packages/$PROJ$SFX.$TOOL" + ARGS="" + SRCARG="." + ;; + esac + + if [ -n "$build_version" -a \ + "$SOURCEDIR" -nt "$FILE" ]; then + echo "$PROJVERS~$build_version" + $VERBOSE cd "$SOURCEDIR" + cd "$SOURCEDIR" + $VERBOSE $TOOL $ARGS "$FILE" "$SRCARG" + $NORUN $TOOL $ARGS "$FILE" "$SRCARG" + fi done } PackageThem Headers .hdrs

1 0

[263] trunk
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 263 http://trac.macosforge.org/projects/darwinbuild/changeset/263 Author: ssen Date: 2006-10-04 02:02:05 -0700 (Wed, 04 Oct 2006) Log Message: ----------- Add support for patch overlay files Modified Paths: -------------- trunk/CHANGES trunk/darwinbuild/darwinbuild Modified: trunk/CHANGES =================================================================== --- trunk/CHANGES 2005-09-16 23:44:01 UTC (rev 262) +++ trunk/CHANGES 2006-10-04 09:02:05 UTC (rev 263) @@ -2,6 +2,7 @@ ----------------------------------- Release 0.X.Y [now] + - darwinbuild: Add support for "src_foo.c.add" patches as overlays - updated Makfile to honor DSTROOT - darwinxref: Added additive and subtractive dependencies - darwintrace: prevent the log file descriptor from being closed Modified: trunk/darwinbuild/darwinbuild =================================================================== --- trunk/darwinbuild/darwinbuild 2005-09-16 23:44:01 UTC (rev 262) +++ trunk/darwinbuild/darwinbuild 2006-10-04 09:02:05 UTC (rev 263) @@ -465,6 +465,10 @@ *.patch*) $catprog "$SourceCache/$patchfile" | patch -l -f -p0 ;; + *.add*) + newfile=`echo $patchfile | sed -e 's/\.add.*$//' -e 's,_,/,g'` + $catprog "$SourceCache/$patchfile" > "./$newfile" + ;; *) echo "Don't know how to apply $patchfile" ;;

1 0

[264] trunk/darwinbuild/darwinbuild
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 264 http://trac.macosforge.org/projects/darwinbuild/changeset/264 Author: ssen Date: 2006-10-04 02:02:05 -0700 (Wed, 04 Oct 2006) Log Message: ----------- Make patch naming for overlays more flexible. Anything Before the last hyphen is discarded. After the last hyphen, "_" means "/" Modified Paths: -------------- trunk/darwinbuild/darwinbuild Modified: trunk/darwinbuild/darwinbuild =================================================================== --- trunk/darwinbuild/darwinbuild 2005-09-17 20:49:08 UTC (rev 263) +++ trunk/darwinbuild/darwinbuild 2006-10-04 09:02:05 UTC (rev 264) @@ -466,7 +466,7 @@ $catprog "$SourceCache/$patchfile" | patch -l -f -p0 ;; *.add*) - newfile=`echo $patchfile | sed -e 's/\.add.*$//' -e 's,_,/,g'` + newfile=`echo $patchfile | sed -e 's/^.*-$[^-]*$\.add.*/\1/' -e 's,_,/,g'` $catprog "$SourceCache/$patchfile" > "./$newfile" ;; *)

1 0

[262] trunk/CHANGES
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 262 http://trac.macosforge.org/projects/darwinbuild/changeset/262 Author: ssen Date: 2006-10-04 02:02:04 -0700 (Wed, 04 Oct 2006) Log Message: ----------- clarify ICU in /XCD Modified Paths: -------------- trunk/CHANGES Modified: trunk/CHANGES =================================================================== --- trunk/CHANGES 2005-09-16 23:37:27 UTC (rev 261) +++ trunk/CHANGES 2006-10-04 09:02:04 UTC (rev 262) @@ -10,7 +10,7 @@ - darwinxref: version '*' now prints all inherited project versions - darwinbuild: always enable volfs when building - darwinbuild: enable darwintrace earlier so that xcodebuild is logged - - installXcodebuild: install ICU into the BuildRoot + - installXcodebuild: install ICU into the private BuildRoot/XCD/ - darwinbuild: receipts are now created for pre-built roots only when necessary - darwinbuild: create receipts for -headers mode

1 0

[261] trunk
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 261 http://trac.macosforge.org/projects/darwinbuild/changeset/261 Author: kevin Date: 2006-10-04 02:02:04 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - updated Makfile to honor DSTROOT Modified Paths: -------------- trunk/CHANGES trunk/common.mk trunk/darwinxref/Makefile Modified: trunk/CHANGES =================================================================== --- trunk/CHANGES 2005-09-16 23:37:08 UTC (rev 260) +++ trunk/CHANGES 2006-10-04 09:02:04 UTC (rev 261) @@ -2,6 +2,19 @@ ----------------------------------- Release 0.X.Y [now] + - updated Makfile to honor DSTROOT + - darwinxref: Added additive and subtractive dependencies + - darwintrace: prevent the log file descriptor from being closed + - darwinxref: exportIndex now quotes dictionary keys when necessary + - darwinxref: Added APIs for accessing properties without inheritance + - darwinxref: version '*' now prints all inherited project versions + - darwinbuild: always enable volfs when building + - darwinbuild: enable darwintrace earlier so that xcodebuild is logged + - installXcodebuild: install ICU into the BuildRoot + - darwinbuild: receipts are now created for pre-built roots only when + necessary + - darwinbuild: create receipts for -headers mode + - darwintrace: calls to readlink(2) are now logged - darwinbuild: added -nopatch option to build without applying patches Release 0.7.1 [6-Sep-2005] Modified: trunk/common.mk =================================================================== --- trunk/common.mk 2005-09-16 23:37:08 UTC (rev 260) +++ trunk/common.mk 2006-10-04 09:02:04 UTC (rev 261) @@ -2,7 +2,7 @@ ### Common makefile variables potentially set by autoconf ### PREFIX?=/usr/local -DESTDIR?= +DESTDIR?=$(DSTROOT) ### ### Modified: trunk/darwinxref/Makefile =================================================================== --- trunk/darwinxref/Makefile 2005-09-16 23:37:08 UTC (rev 260) +++ trunk/darwinxref/Makefile 2006-10-04 09:02:04 UTC (rev 261) @@ -19,7 +19,7 @@ ### todo: --with-plugin-path configuration CFLAGS+= \ -DDEFAULT_DB_FILE=\".build/xref.db\" \ - -DDEFAULT_PLUGIN_PATH=\"$(DATDIR)/plugins\" + -DDEFAULT_PLUGIN_PATH=\"$(subst $(DESTDIR),,$(DATDIR))/plugins\" ### todo: --with-tcl-plugins configuration TCL_CFLAGS=-DHAVE_TCL_PLUGINS=1

1 0

[260] trunk/darwinbuild/packageRoots.sh
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 260 http://trac.macosforge.org/projects/darwinbuild/changeset/260 Author: ssen Date: 2006-10-04 02:02:03 -0700 (Wed, 04 Oct 2006) Log Message: ----------- Don't do IFS munging. It was breaking for me if I had both Headers/ and Roots/. This way is cleaner Modified Paths: -------------- trunk/darwinbuild/packageRoots.sh Modified: trunk/darwinbuild/packageRoots.sh =================================================================== --- trunk/darwinbuild/packageRoots.sh 2005-09-16 20:59:31 UTC (rev 259) +++ trunk/darwinbuild/packageRoots.sh 2006-10-04 09:02:03 UTC (rev 260) @@ -88,9 +88,7 @@ local DIR="$1" local SFX="$2" echo "*** Packaging $DIR" - OLDIFS="$IFS" - IFS=$'\n' - for X in $("$DARWINXREF" version '*') ; do + "$DARWINXREF" version '*' | while read X; do Y="${X/-*/}" build_version=$(GetBuildVersion $DARWIN_BUILDROOT/$DIR/$Y/$X*) if [ "$build_version" != "0" -a \ @@ -101,7 +99,6 @@ eval $CMD "$DARWIN_BUILDROOT/Packages/$Y$SFX.tar.gz" . fi done - IFS="$OLDIFS" } PackageThem Headers .hdrs PackageThem Roots .root

1 0

[259] trunk/plists/8A428.plist
by source_changes＠macosforge.org 04 Oct '06

04 Oct '06

Revision: 259 http://trac.macosforge.org/projects/darwinbuild/changeset/259 Author: ssen Date: 2006-10-04 02:02:03 -0700 (Wed, 04 Oct 2006) Log Message: ----------- use CarbonHeaders-2 Modified Paths: -------------- trunk/plists/8A428.plist Modified: trunk/plists/8A428.plist =================================================================== --- trunk/plists/8A428.plist 2005-09-16 18:47:28 UTC (rev 258) +++ trunk/plists/8A428.plist 2006-10-04 09:02:03 UTC (rev 259) @@ -2098,7 +2098,7 @@ gnumake, ); }; - version = 8A428; + version = 2; }; ChatServer = { version = 37.1;

1 0