Revision: 293 http://trac.macosforge.org/projects/darwinbuild/changeset/293 Author: kevin Date: 2006-10-04 02:02:24 -0700 (Wed, 04 Oct 2006) Log Message: ----------- - consolidate manifest symlinks and digests in build log - added elapsed build time to build log Modified Paths: -------------- trunk/CHANGES trunk/darwinbuild/darwinbuild Modified: trunk/CHANGES =================================================================== --- trunk/CHANGES 2005-11-04 02:57:09 UTC (rev 292) +++ trunk/CHANGES 2006-10-04 09:02:24 UTC (rev 293) @@ -1,6 +1,10 @@ Darwin Build Scripts Change History ----------------------------------- +Release x.y.z [Now] + - darwinbuild: consolidate manifest symlinks and digests in build log + - darwinbuild: added elapsed build time to the build log + Release 0.7.2 [31-Oct-2005] - Added 8F46 plist (Mac OS X 10.4.3, Darwin 8.3) - darwinbuild: support -headers for -load, which loads the Headers root Modified: trunk/darwinbuild/darwinbuild =================================================================== --- trunk/darwinbuild/darwinbuild 2005-11-04 02:57:09 UTC (rev 292) +++ trunk/darwinbuild/darwinbuild 2006-10-04 09:02:24 UTC (rev 293) @@ -695,20 +695,25 @@ # Uses tail +3 to avoid getting . and .. RECEIPTS=$DARWIN_BUILDROOT/BuildRoot/usr/local/darwinbuild/receipts perl -e "opendir(DIR,\"$RECEIPTS\"); - @files = sort(readdir(DIR)); - foreach my \$x (@files) { - print \"echo \\\"\"; - if ( -l \"$RECEIPTS/\$x\" ) { - printf \"%-20s -> %s\", \"\$x\", - readlink(\"$RECEIPTS/\$x\"); - } else { - printf \"%-24s%s\", \"\", \"\$x\"; - } - print \"\\\"\n\"; + @files = sort(readdir(DIR)); + my %seen; + foreach my \$x (@files) { + if ( -l \"$RECEIPTS/\$x\" ) { + \$seen{readlink(\"$RECEIPTS/\$x\")} = 1; + } + } + foreach my \$x (@files) { + my \$str = undef; + if ( -l \"$RECEIPTS/\$x\" ) { + \$str = sprintf \"%-20s -> %s\", \"\$x\", readlink(\"$RECEIPTS/\$x\"); + } elsif (!exists(\$seen{\$x})) { + \$str = sprintf \"%-24s%s\", \"\", \"\$x\"; + } + print \"echo \\\"\$str\\\"\n\" if \$str; } closedir(DIR);" | tail +3 >> $SCRIPT cat <<-EOF >> $SCRIPT echo '++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++' - echo $buildtool $action '$build_string' < /dev/null + echo $buildtool $action '$build_string' \< /dev/null echo '++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++' echo '' echo 'Build log begins here:' @@ -716,9 +721,13 @@ cd '$SRCROOT' EOF cat <<-EOF >> $SCRIPT + START_DATE=\$(date "+%s") $buildtool $action $build_string < /dev/null EXIT_STATUS="\$?" + END_DATE=\$(date "+%s") + ELAPSED_TIME=\$((\$END_DATE - \$START_DATE)) echo '++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++' + echo " BUILD TIME: \$((\$ELAPSED_TIME / 3600))h \$((\$ELAPSED_TIME / 60))m \$((\$ELAPSED_TIME % 60))s" echo "EXIT STATUS: \$EXIT_STATUS" exit \$EXIT_STATUS EOF