[Pkg-mol-commits] r135 - scripts/trunk

[gaudenz at alioth.debian.org]

Author: gaudenz
Date: 2007-08-03 21:36:53 +0000 (Fri, 03 Aug 2007)
New Revision: 135

Modified:
   scripts/trunk/make_orig_tarballs
   scripts/trunk/mol-drivers-macos.list
   scripts/trunk/mol-drivers-macosx.list
Log:
change fileformat of filelist to allow copying files into another tarball


Modified: scripts/trunk/make_orig_tarballs
===================================================================
--- scripts/trunk/make_orig_tarballs	2007-07-25 22:23:50 UTC (rev 134)
+++ scripts/trunk/make_orig_tarballs	2007-08-03 21:36:53 UTC (rev 135)
@@ -27,16 +27,30 @@
 # and create orig.tar.gz
 
 for package in mol-drivers-macos mol-drivers-macosx ; do 
-	dir=${package}-$version.orig
-	mkdir -p ${dir}/mollib/drivers
+	destdir=${package}-$version.orig
 
-	for i in `grep -v "^ *#" < ${package}.list` ; do
-		mv ${ORIG_DIR}/${i} ${dir}/${i}
+	# move files marked for moving
+	for i in $(grep -v "^ *#" < $(dirname $0)/${package}.list) ; do
+		action=$(echo "${i}" | cut -f 1 -d ":")
+		file=$(echo "${i}" | cut -f 2 -d ":")
+		# create destination directory if it does not exist
+		dir=$(dirname ${file})
+		if [ ! -d ${destdir}/${dir} ] ; then
+			mkdir -p ${destdir}/${dir}
+		fi
+		case ${action} in
+			M)
+				mv ${ORIG_DIR}/${file} ${destdir}/${file}
+				;;
+			C)
+				cp -r ${ORIG_DIR}/${file} ${destdir}/${file}
+				;;
+		esac
 	done
-	tar -czf ${package}_${version}.orig.tar.gz ${dir}
+	tar -czf ${package}_${version}.orig.tar.gz ${destdir}
 
 	# clean up
-	rm -rf ${dir}
+	rm -rf ${destdir}
 done
 
 # prune remaining non-free files from mol source

Modified: scripts/trunk/mol-drivers-macos.list
===================================================================
--- scripts/trunk/mol-drivers-macos.list	2007-07-25 22:23:50 UTC (rev 134)
+++ scripts/trunk/mol-drivers-macos.list	2007-08-03 21:36:53 UTC (rev 135)
@@ -1,16 +1,17 @@
 # These files are precompiled
 # They go into the mol-drivers-macos package in non-free
 
-mollib/drivers/blk.nw
-mollib/drivers/blk.ow
-mollib/drivers/enet.nw
-mollib/drivers/enet.ow
-mollib/drivers/irqtest.nw
-mollib/drivers/irqtest.ow
-mollib/drivers/misc.nw
-mollib/drivers/misc.ow
-mollib/drivers/sound.ow
-mollib/drivers/video.nw
-mollib/drivers/video.ow
-mollib/drivers/scsi.nw
-mollib/drivers/tty.ow
+M:mollib/drivers/blk.nw
+M:mollib/drivers/blk.ow
+M:mollib/drivers/enet.nw
+M:mollib/drivers/enet.ow
+M:mollib/drivers/irqtest.nw
+M:mollib/drivers/irqtest.ow
+M:mollib/drivers/misc.nw
+M:mollib/drivers/misc.ow
+M:mollib/drivers/sound.ow
+M:mollib/drivers/video.nw
+M:mollib/drivers/video.ow
+M:mollib/drivers/scsi.nw
+M:mollib/drivers/tty.ow
+M:mollib/images/moldisk.dmg

Modified: scripts/trunk/mol-drivers-macosx.list
===================================================================
--- scripts/trunk/mol-drivers-macosx.list	2007-07-25 22:23:50 UTC (rev 134)
+++ scripts/trunk/mol-drivers-macosx.list	2007-08-03 21:36:53 UTC (rev 135)
@@ -1,4 +1,33 @@
-mollib/drivers/bootx
-mollib/drivers/mods1.mkext
-mollib/drivers/mods2.mkext
-mollib/drivers/video.x
+# File format:
+# M: move file or directory
+# C: copy file or directory
+# Non free contents of the upstream tarball
+M:bootx
+M:mollib/drivers/mods1.mkext
+M:mollib/drivers/mods2.mkext
+M:mollib/drivers/video.x
+M:mollib/images/moldiskX.dmg
+# Some parts of the build system and source are needed to build bootx from source
+C:scripts/archname
+C:scripts/reldir
+C:autogen.sh
+C:config
+C:configure
+C:Makefile
+C:Makefile.dist
+C:src/main/main.c
+C:src/netdriver/Kconfig
+C:src/shared/osi_calls.h
+C:src/shared/osi.h
+C:src/shared/mac_registers.h
+C:src/shared/emuaccel_sh.h
+C:src/shared/processor.h
+C:src/shared/mmutypes.h
+C:src/shared/asmdefs.h
+C:src/shared/asm.m4
+C:src/include/boothelper_sh.h
+C:src/include/pseudofs_sh.h
+C:src/include/video_sh.h
+C:src/drivers/disk/include/ablk_sh.h
+C:src/drivers/disk/include/scsi_sh.h
+C:src/drivers/include/partition_table.h