[darwinbuild-changes] [82] trunk

[source_changes at macosforge.org]

Revision: 82
          http://trac.macosforge.org/projects/darwinbuild/changeset/82
Author:   kevin
Date:     2006-10-04 01:43:27 -0700 (Wed, 04 Oct 2006)

Log Message:
-----------
- added an exit handler to unmount devfs and volfs in the BuildRoot

Modified Paths:
--------------
    trunk/CHANGES
    trunk/darwinbuild/darwinbuild

Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES	2005-07-15 00:13:27 UTC (rev 81)
+++ trunk/CHANGES	2006-10-04 08:43:27 UTC (rev 82)
@@ -1,6 +1,7 @@
 Darwin Build Scripts Change History
 -----------------------------------
 
+	- added an exit handler to unmount devfs and volfs in the BuildRoot
 	- list header dependencies more conservatively (ssen)
 	- added common.mk for common makefile variables
 	- installXcodebuild correctly handles umbrella frameworks (ssen)

Modified: trunk/darwinbuild/darwinbuild
===================================================================
--- trunk/darwinbuild/darwinbuild	2005-07-15 00:13:27 UTC (rev 81)
+++ trunk/darwinbuild/darwinbuild	2006-10-04 08:43:27 UTC (rev 82)
@@ -588,6 +588,17 @@
 
 chmod ugo+x $SCRIPT
 
+
+ExitHandler() {
+	### Once for fdsec
+	[ "$(echo $BuildRoot/dev/*)" == "$BuildRoot/dev/*" ] || umount "$BuildRoot/dev"
+	### Twice for devfs
+	[ "$(echo $BuildRoot/dev/*)" == "$BuildRoot/dev/*" ] || umount "$BuildRoot/dev"
+	### Thrice for volfs
+	[ "$(echo $BuildRoot/.vol/*)" == "$BuildRoot/.vol/*" ] || umount "$BuildRoot/.vol"
+}
+
+
 if [ "$CHROOTED" == "YES" ] ; then
 	###
 	### Mount devfs in the chroot
@@ -598,6 +609,7 @@
 	### no way to unmount the filesystem except rebooting.
 	###
 	echo "*** Mounting special filesystems ..."
+	trap ExitHandler EXIT
 	if [ ! -c "$BuildRoot/dev/null" ]; then
 		echo "Mounting devfs ..."
 		mkdir -p "$BuildRoot/dev"
@@ -672,6 +684,7 @@
         		grep -vi  "^$TRACE_TYPES/dev/" | \
 			"$PREFIX/bin/darwinxref" loadDeps "$projnam"
 			"$PREFIX/bin/darwinxref" resolveDeps "$projnam"
+			cp "$TRACELOG" $DARWIN_BUILDROOT/Logs/$projnam/$project.trace~$build_version
 		fi
 	fi
 fi

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/darwinbuild-changes/attachments/20061004/3e780ede/attachment-0001.html