MFV: ACPICA 20090521

1 files changed, 23 insertions, 31 deletions

diff --git a/sys/contrib/dev/acpica/acpica_prep.sh b/sys/contrib/dev/acpica/acpica_prep.sh
index 353975e..8969150 100755
--- a/sys/contrib/dev/acpica/acpica_prep.sh
+++ b/sys/contrib/dev/acpica/acpica_prep.sh
@@ -10,33 +10,34 @@ if [ ! $# -eq 1 ]; then
 fi
 
 src=$1
-wrk=./_acpi_ca_unpack
-dst=./acpi_ca_destination
+wrk=`realpath ./_acpi_ca_unpack`
+dst=`realpath ./acpi_ca_destination`
 
 # files that should keep their full directory path
-fulldirs="common compiler"
+fulldirs="common compiler debugger disassembler dispatcher events	\
+	executer hardware include namespace parser resources tables	\
+	tools utilities"
+
 # files to remove
-stripdirs="generate acpisrc"
-stripfiles="16bit.h Makefile README a16find.c a16utils.asm a16utils.obj	\
-	acdos16.h acintel.h aclinux.h acmsvc.h acnetbsd.h acpixtract.c	\
-	acwin.h acwin64.h aeexec.c aemain.c osdosxf.c osunixdir.c	\
-	oswindir.c oswinxf.c readme.txt"
+stripdirs="acpisrc generate os_specific"
+stripfiles="Makefile README acintel.h aclinux.h acmsvc.h acnetbsd.h	\
+	acos2.h acpixtract.c accygwin.h acefi.h acwin.h acwin64.h	\
+	aeexec.c aehandlers.c aemain.c aetables.c examples.c		\
+	osunixdir.c oswindir.c oswintbl.c oswinxf.c readme.txt utclib.c"
+
 # include files to canonify
-src_headers="acapps.h acconfig.h acdebug.h acdisasm.h acdispat.h	\
-	acenv.h	acevents.h acexcep.h acfreebsd.h acgcc.h acglobal.h	\
-	achware.h acinterp.h aclocal.h acmacros.h acnames.h acnamesp.h	\
-	acobject.h acopcode.h acoutput.h acparser.h acpi.h acpiosxf.h	\
-	acpixf.h acresrc.h acstruct.h actables.h actbl.h actbl1.h	\
-	actbl2.h actypes.h acutils.h aecommon.h amlcode.h amlresrc.h"
+src_headers="acapps.h accommon.h acconfig.h acdebug.h acdisasm.h	\
+	acdispat.h acevents.h acexcep.h acglobal.h achware.h acinterp.h	\
+	aclocal.h acmacros.h acnames.h acnamesp.h acobject.h acopcode.h	\
+	acoutput.h acparser.h acpi.h acpiosxf.h acpixf.h acpredef.h	\
+	acresrc.h acrestyp.h acstruct.h	actables.h actbl.h actbl1.h	\
+	actypes.h acutils.h amlcode.h amlresrc.h platform/acenv.h	\
+	platform/acfreebsd.h platform/acgcc.h"
 comp_headers="aslcompiler.h asldefine.h aslglobal.h asltypes.h"
-	
-# files to update paths in
-src_update_files="acpi.h acpiosxf.h"
 
 # pre-clean
 echo pre-clean
-rm -rf ${wrk}
-rm -rf ${dst}
+rm -rf ${wrk} ${dst}
 mkdir -p ${wrk}
 mkdir -p ${dst}
 
@@ -53,27 +54,18 @@ for i in ${stripfiles}; do
 	find ${wrk} -name ${i} -type f -delete
 done
 
+# copy files
 echo copying full dirs
 for i in ${fulldirs}; do
 	find ${wrk} -name ${i} -type d | xargs -J % mv % ${dst}
 done
-
-# move files to destination
-echo copying flat dirs
+echo copying remaining files
 find ${wrk} -type f | xargs -J % mv % ${dst}
-mv ${dst}/changes.txt ${dst}/CHANGES.txt
-
-# update src/headers for appropriate paths
-echo updating paths
-for i in ${src_update_files}; do
-	i=${dst}/$i
-	sed -e 's/platform\///' $i > $i.new && mv $i.new $i
-done
 
 # canonify include paths
 for H in ${src_headers}; do
 	find ${dst} -name "*.[chy]" -type f |	\
-	xargs sed -i "" -e "s|[\"<]$H[\">]|\<contrib/dev/acpica/$H\>|g"
+	xargs sed -i "" -e "s|[\"<]$H[\">]|\<contrib/dev/acpica/include/$H\>|g"
 done
 for H in ${comp_headers}; do
 	find ${dst}/compiler -name "*.[chly]" -type f |	\