ppcrcd/trunk: Makefile conf.dir/usr/lib/ppcrcd/xmltar.pl

[sparky]

Author: sparky
Date: Mon Mar 20 10:49:37 2006
New Revision: 7247

Modified:
   ppcrcd/trunk/Makefile
   ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/xmltar.pl
Log:
- xmltar: generate better vim folds


Modified: ppcrcd/trunk/Makefile
==============================================================================
--- ppcrcd/trunk/Makefile	(original)
+++ ppcrcd/trunk/Makefile	Mon Mar 20 10:49:37 2006
@@ -292,7 +292,7 @@
 	@LANGUAGE= LANG= LC_ALL=C rpm --root=$(PWD)/$(root_inst) -qa \
 		--queryformat="<b>%{NAME}</b>(%{EPOCH}:%{VERSION}-%{RELEASE})ľ\t<i>%{SUMMARY}</i>\n" | sort | tr "ľ" "\n"
 
-page:	out/ppcrcd.iso $(DOCS) doc/page_head.html
+page:	out/ppcrcd.iso doc/page_head.html
 	rm -rf $@{,.work}
 	mkdir -p $@.work/$(DATE)
 	cp out/ppcrcd.iso $@.work/$(DATE)/

Modified: ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/xmltar.pl
==============================================================================
--- ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/xmltar.pl	(original)
+++ ppcrcd/trunk/conf.dir/usr/lib/ppcrcd/xmltar.pl	Mon Mar 20 10:49:37 2006
@@ -105,6 +105,7 @@
 	print '" name="'.lastname($file)."\">\n";
 	print $file_content;
 	print "</xmltar:file:$uuid>\n";
+	print $step."<!-- $level}}} -->\n" if $comment;
 	close F_IN;
 }
 
@@ -116,6 +117,7 @@
 	print $step.'<xmltar:symlink name="'.lastname($link).'">';
 	print readlink $link;
 	print "</xmltar:symlink>\n";
+	print $step."<!-- $level}}} -->\n" if $comment;
 }
 
 sub packdir {
@@ -128,8 +130,9 @@
 	print $step . '<xmltar:dir mode="';
 	printf "%04o",  ((stat $dir)[2]) & 07777;
 	print '" name="'.lastname($dir)."\">\n";
-	opendir DIR, $dir or warn "Can't open dir '$dir': $!\n";
-	foreach my $file ( sort readdir DIR ) {
+	my $DIR;
+	opendir $DIR, $dir or warn "Can't open dir '$dir': $!\n";
+	foreach my $file ( sort readdir $DIR ) {
 		next if $file =~ /^\.{1,2}$/;
 		$file = $dir ."/". $file;
 		if (-d $file) {
@@ -146,8 +149,10 @@
 		}
 		warn "Unknown type or no file: $file\n";
 	}
-	closedir DIR;
+	closedir $DIR;
 	print $step . "</xmltar:dir>\n";
+	$level--;
+	print $step . "<!-- $level}}} -->\n" if $comment;
 }
 
 unless ( @filelist ) {
@@ -188,6 +193,7 @@
 			$step =~ s/$stepadd$//;
 			$level--;
 			print $step . "</xmltar:dir>\n";
+			print $step . "<!-- $level}}} -->\n" if $comment;
 		}
 		( my $filename = $file ) =~ s/^$dir//;
 		while ( $filename =~ s#^(.*?)/## ) {
@@ -213,6 +219,7 @@
 			unless (-e $file) {
 				print $step."<!--R $dir".lastname($file)." {{{$level -->\n" if $comment;
 				print $step.'<xmltar:removed name="'.lastname($file).'" />\n';
+				print $step."<!-- $level}}} -->\n" if $comment;
 				next;
 			}
 		}
@@ -224,6 +231,7 @@
 		$step =~ s/$stepadd$//;
 		$level--;
 		print $step . "</xmltar:dir>\n";
+		print $step . "<!-- $level}}} -->\n" if $comment;
 	}
 
 }