Update to reflect import of ACPI-CA 20051021 with includes fixups

1 files changed, 30 insertions, 27 deletions

diff --git a/sys/contrib/dev/acpica/acpica_prep.sh b/sys/contrib/dev/acpica/acpica_prep.sh
index 526865b..277fed6 100755
--- a/sys/contrib/dev/acpica/acpica_prep.sh
+++ b/sys/contrib/dev/acpica/acpica_prep.sh
@@ -17,9 +17,19 @@ dst=./acpi_ca_destination
 fulldirs="common compiler"
 # files to remove
 stripdirs="generate acpisrc"
-stripfiles="16bit.h Makefile README a16find.c a16utils.asm	\
-	a16utils.lst a16utils.obj adisasm.h acdos16.h acintel.h	\
-	aclinux.h acmsvc.h acnetbsd.h acwin.h acwin64.h readme.txt"
+stripfiles="16bit.h Makefile README a16find.c a16utils.asm		\
+	a16utils.lst a16utils.obj abcompare.c abmain.c acdos16.h	\
+	acintel.h aclinux.h acmsvc.h acnetbsd.h acpibin.h acwin.h	\
+	acwin64.h adisasm.h aemain.c osunixdir.c readme.txt"
+# 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	\
+	mlresrc.h"
+comp_headers="aslcompiler.h asldefine.h aslglobal.h asltypes.h"
 	
 # files to update paths in
 src_update_files="acpi.h acpiosxf.h"
@@ -31,12 +41,6 @@ rm -rf ${dst}
 mkdir -p ${wrk}
 mkdir -p ${dst}
 
-# fetch document
-echo fetch document
-fetch http://developer.intel.com/technology/iapc/acpi/downloads/CHANGES.txt
-tr -d '\r' < CHANGES.txt > CHANGES.txt.tmp
-mv CHANGES.txt.tmp CHANGES.txt
-
 # unpack
 echo unpack
 tar -x -z -f ${src} -C ${wrk}
@@ -44,10 +48,10 @@ tar -x -z -f ${src} -C ${wrk}
 # strip files
 echo strip
 for i in ${stripdirs}; do
-    find ${wrk} -name ${i} -type d | xargs rm -r
+	find ${wrk} -name ${i} -type d | xargs rm -r
 done
 for i in ${stripfiles}; do
-    find ${wrk} -name ${i} -type f -delete
+	find ${wrk} -name ${i} -type f -delete
 done
 
 echo copying full dirs
@@ -58,26 +62,24 @@ done
 # move files to destination
 echo copying flat dirs
 find ${wrk} -type f | xargs -J % mv % ${dst}
-mv CHANGES.txt ${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
+	i=${dst}/$i
+	sed -e 's/platform\///' $i > $i.new && mv $i.new $i
 done
 
 # canonify include paths
-#for H in \
-#acpi.h acdispat.h amlcode.h acnamesp.h acevents.h acdebug.h acresrc.h acdisasm.h acparser.h acinterp.h actables.h
-#do
-#	sed -i "" -e "s|\"$H\"|\<contrib/dev/acpica/$H\>|g" *.c
-#done
-#for H in \
-#acconfig.h acenv.h actypes.h acexcep.h acmacros.h actbl.h actbl1.h actbl2.h aclocal.h acoutput.h acpiosxf.h acpixf.h acobject.h acstruct.h acglobal.h achware.h acutils.h acfreebsd.h acgcc.h amlresrc.h
-#do
-#	sed -i "" -e "s|\"$H\"|\<contrib/dev/acpica/$H\>|g" *.h
-#done
+for H in ${src_headers}; do
+	find ${dst} -name "*.[chy]" -type f |	\
+	xargs sed -i "" -e "s|[\"<]$H[\">]|\<contrib/dev/acpica/$H\>|g"
+done
+for H in ${comp_headers}; do
+	find ${dst}/compiler -name "*.[chly]" -type f |	\
+	xargs sed -i "" -e "s|[\"<]$H[\">]|\<contrib/dev/acpica/compiler/$H\>|g"
+done
 
 # post-clean
 echo post-clean
@@ -85,6 +87,7 @@ rm -rf ${wrk}
 
 # assist the developer in generating a diff
 echo "Directories you may want to 'cvs diff':"
-echo "    src/sys/dev/acpica src/sys/i386/acpica src/sys/ia64/acpica \\"
-echo "    src/sys/modules/acpi src/sys/boot src/sys/i386/include \\"
-echo "    src/usr.sbin/acpi src/sys/contrib/dev/acpica"
+echo "    src/sys/contrib/dev/acpica src/sys/dev/acpica \\"
+echo "    src/sys/amd64/acpica src/sys/i386/acpica src/sys/ia64/acpica \\"
+echo "    src/sys/amd64/include src/sys/i386/include src/sys/ia64/include \\"
+echo "    src/sys/boot src/sys/conf src/sys/modules/acpi src/usr.sbin/acpi"