Module Name:    src
Committed By:   jmmv
Date:           Fri Jun 18 15:39:17 UTC 2010

Added Files:
        src/external/bsd/atf: prepare-import.sh

Log Message:
Add a script to help with the import of new atf releases: it extracts a
distfile, places it in dist and cleans up any unnecessary files.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/prepare-import.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/external/bsd/atf/prepare-import.sh
diff -u /dev/null src/external/bsd/atf/prepare-import.sh:1.1
--- /dev/null	Fri Jun 18 15:39:17 2010
+++ src/external/bsd/atf/prepare-import.sh	Fri Jun 18 15:39:17 2010
@@ -0,0 +1,108 @@
+#!/bin/sh
+# $NetBSD: prepare-import.sh,v 1.1 2010/06/18 15:39:17 jmmv Exp $
+#
+# Use this script to recreate the 'dist' subdirectory from a newly released
+# distfile.  The script takes care of unpacking the distfile, removing any
+# files that are not relevant to NetBSD and checking if there are any new
+# files in the new release that need to be addressed.
+#
+
+set -e
+
+ProgName=${0##*/}
+
+CLEAN_PATTERNS=
+CLEAN_PATTERNS="${CLEAN_PATTERNS} *.m4"
+CLEAN_PATTERNS="${CLEAN_PATTERNS} INSTALL"
+CLEAN_PATTERNS="${CLEAN_PATTERNS} Makefile*"
+CLEAN_PATTERNS="${CLEAN_PATTERNS} admin/[a-qsz]*"
+CLEAN_PATTERNS="${CLEAN_PATTERNS} bconfig.h.in"
+CLEAN_PATTERNS="${CLEAN_PATTERNS} configure*"
+CLEAN_PATTERNS="${CLEAN_PATTERNS} doc/*.sh"
+CLEAN_PATTERNS="${CLEAN_PATTERNS} doc/*.xml"
+CLEAN_PATTERNS="${CLEAN_PATTERNS} doc/standalone"
+CLEAN_PATTERNS="${CLEAN_PATTERNS} doc/text"
+CLEAN_PATTERNS="${CLEAN_PATTERNS} m4"
+
+err() {
+	echo "${ProgName}:" "$...@}" 1>&2
+	exit 1
+}
+
+log() {
+	echo "${ProgName}:" "$...@}"
+}
+
+backup_dist() {
+	if [ -d dist.old ]; then
+		log "Removing dist; dist.old exists"
+		rm -rf dist
+	else
+		log "Backing up dist as dist.old"
+		mv dist dist.old
+	fi
+}
+
+extract_distfile() {
+	local distfile="${1}"; shift
+	local distname="${1}"; shift
+
+	log "Extracting ${distfile}"
+	tar -xzf "${distfile}"
+	[ -d "${distname}" ] || err "Distfile did not create ${distname}"
+	log "Renaming ${distname} to dist"
+	mv "${distname}" dist
+}
+
+get_distname() {
+	local distfile="${1}"; shift
+	basename "${distfile}" | sed -e 's,\.tar.*,,'
+}
+
+cleanup_dist() {
+	log "Removing unnecessary files from dist"
+	( cd dist && rm -rf ${CLEAN_PATTERNS} )
+}
+
+diff_dirs() {
+	local old_dir="${1}"; shift
+	local new_dir="${1}"; shift
+
+	local old_list=$(mktemp -t atf-import.XXXXXX)
+	local new_list=$(mktemp -t atf-import.XXXXXX)
+	local diff=$(mktemp -t atf-import.XXXXXX)
+	trap "rm -f '${old_list}' '${new_list}' '${diff}'; exit 1" \
+	    HUP INT QUIT TERM
+
+	( cd "${old_dir}" && find . | sort >>"${old_list}" )
+	( cd "${new_dir}" && find . | sort >>"${new_list}" )
+
+	diff -u "${old_list}" "${new_list}" | grep '^+\.' >>"${diff}" || true
+	if [ -s "${diff}" ]; then
+		log "New files found"
+		diff -u "${old_list}" "${new_list}" | grep '^+\.'
+		log "Check if any files have to be cleaned up and update" \
+		    "the prepare-import.sh script accordingly"
+	else
+		log "No new files; all good!"
+	fi
+
+	rm -f "${old_list}" "${new_list}" "${diff}"
+}
+
+main() {
+	[ ${#} -eq 1 ] || err "Must provide a distfile name"
+	local distfile="${1}"; shift
+
+	[ -f Makefile -a -f prepare-import.sh ] || \
+	    err "Must be run from the src/external/bsd/atf subdirectory"
+
+	local distname="$(get_distname ${distfile})"
+
+	backup_dist
+	extract_distfile "${distfile}" "${distname}"
+	cleanup_dist
+	diff_dirs dist.old dist
+}
+
+main "$...@}"

Reply via email to