From Sho Amano via bug 7914:

If the source codes are checked out using TortoiseSVN on Windows,
"nmake -f Makefile.nmake packaging_papps" fails in the middle.

This is because the line end of packaging\nsis\wireshark.nsi is CRLF in
this case, and ws-manifest.pl cannot handle such case.

svn path=/trunk/; revision=45798

1 files changed, 8 insertions, 7 deletions

diff --git a/packaging/ws-manifest.pl b/packaging/ws-manifest.pl
index 0df2584a02..fadcb995ba 100755
--- a/packaging/ws-manifest.pl
+++ b/packaging/ws-manifest.pl
@@ -1,5 +1,5 @@
 #
-# ws-manifest.pl - create a generic manifest file (including u3 information) from the wireshark.nsi 
+# ws-manifest.pl - create a generic manifest file (including u3 information) from the wireshark.nsi
 # $Id$
 #
 
@@ -27,7 +27,8 @@ my @dirs; # the directories in the manifest
 my @defines; # stack of defines
 
 while ($line = <>) {
-    if($line =~ /^SetOutPath (.+)$/) {
+    $line =~ s/\r//g; # remove CR on Windows
+	if($line =~ /^SetOutPath (.+)$/) {
 	$outpath = $1;
 	$outpath =~ s/^'(.*)'$/$1/;
 	if($outpath ne '$PROFILE') { # ignore the PROFILE
@@ -68,8 +69,8 @@ foreach $dir(sort @dirs) {
     print STDERR "looking for $dir\n";
 	$loc = $u3locs{$dir};
 
-	if(defined $loc) { 
-	    
+	if(defined $loc) {
+
 	    print "[". $dir . " u3loc=" . $loc . "]\n";
 
 	    foreach $file(sort @$dir) {
@@ -88,9 +89,9 @@ foreach $dir(sort @dirs) {
 		print "\n";
 	    }
 	} else {
-	    
+
 	    push(@ignored, $dir);
-	    
+
 	}
     }
     $prev = $dir;
@@ -103,7 +104,7 @@ if(defined @ignored) {
     foreach $dir(sort @ignored) {
 	print STDERR "\t" . $dir . " ";
     }
-    
+
     print STDERR "\n";
 
     exit -1;