* scripts/ptxdist_vars.sh, scripts/libptxdist.sh, bin/ptxdist:

	added marks to logfile to identify the individual ptxdist calls
	thanks to Enrik Berkhan for the implementation and inspiration


git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@8065 33e552b5-05e3-0310-8538-816dae2090ed

1 files changed, 23 insertions, 11 deletions

diff --git a/bin/ptxdist b/bin/ptxdist
index 5eb390947..1688fde58 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -4,6 +4,7 @@ export LANG=C
 export LC_ALL=POSIX
 export LC_CTYPE=POSIX
 
+PTXDIST_FULLARGS=("${@}")
 PROMPT="ptxdist: "
 DEBUG=
 
@@ -924,21 +925,18 @@ toolchain() {
 # this is where the ptxdist installation lives
 #
 # out: PTXDIST
-#      PTXDIST_WORKSPACE
 #      PTXDIST_TOPDIR
+#      PTXDIST_WORKSPACE
 #
 setup_topdir() {
-	local topdir
+	local ptxdist topdir
 
-	PTXDIST="${0}"
-	PTXDIST_WORKSPACE="$(pwd)"
+	ptxdist="${0}"
 
-	if [ -L "${PTXDIST}" ]; then
-		topdir="$(readlink -f "${PTXDIST}")"
-	else
-		topdir="${PTXDIST}"
+	if [ -L "${ptxdist}" ]; then
+		ptxdist="$(readlink -f "${ptxdist}")"
 	fi
-	topdir="$(cd "$(dirname "${topdir}")"/.. && pwd)"
+	topdir="$(cd "$(dirname "${ptxdist}")"/.. && pwd)"
 
 	#
 	# sanity check: is PTXdist already configured?
@@ -950,7 +948,9 @@ setup_topdir() {
 		exit 1
 	fi
 
+	PTXDIST="${ptxdist}"
 	PTXDIST_TOPDIR="${topdir}"
+	PTXDIST_WORKSPACE="$(pwd)"
 }
 
 
@@ -959,10 +959,13 @@ setup_topdir() {
 #
 # in: PTXDIST_TEMPDIR
 #
-ptxdist_deltemp() {
+ptxdist_trap_handler() {
 	if [ -n "${PTXDIST_TEMPDIR}" -a -d "${PTXDIST_TEMPDIR}" ]; then
 		rm -rf "${PTXDIST_TEMPDIR}"
 	fi
+	if [ -e "${PTX_LOGFILE}" ]; then
+		echo -e "}}} $(date '+%FT%T%z') ${PTXDIST} ${PTXDIST_FULLARGS[@]}\n\n\n" >> "${PTX_LOGFILE}"
+	fi
 }
 
 
@@ -970,7 +973,7 @@ ptxdist_deltemp() {
 # setups trap, to delete temporary storage
 #
 setup_traps() {
-	trap 'ptxdist_deltemp' 0 1 15
+	trap 'ptxdist_trap_handler' 0 1 15
 }
 
 
@@ -1135,6 +1138,14 @@ setup_path() {
 }
 
 
+#
+#
+#
+setup_logfile()
+{
+	echo "{{{ $(date '+%FT%T%z') ${PTXDIST} ${PTXDIST_FULLARGS[@]}" >> "${PTX_LOGFILE}"
+}
+
 ########################################################################
 # main()
 ########################################################################
@@ -1149,6 +1160,7 @@ setup_config
 # --- all variables are defined now ---
 setup_path
 # --- path is now set ---
+setup_logfile
 
 export PROJECT FULLVERSION VERSION PATCHLEVEL SUBLEVEL EXTRAVERSION		# FIXME: review these
 export \