--- a/sbsv1_os/e32toolp/group/setupprj.bat Tue Oct 26 16:13:43 2010 +0100
+++ b/sbsv1_os/e32toolp/group/setupprj.bat Wed Oct 27 10:17:32 2010 +0100
@@ -116,13 +116,15 @@
@ConfigFiles = grep /\.(mk|make)/i, readdir CONFIGDIR;
closedir CONFIGDIR;
-my @Docs ;
-if(-d "..\\Docs") {
+
+my @Docs;
+if (-d "..\\Docs") {
opendir SUBDIR, "..\\Docs" or die "ERROR: Can't open dir \"..\\Docs\"\n";
@Docs = map lc $_, readdir SUBDIR;
- @Docs = grep /^[^\.].+\.(rtf|doc|changes|txt|html|htm)$/o, @Docs;
- closedir SUBDIR;
+ @Docs = grep /^[^\.].+\.(rtf|doc|changes|txt|html|htm)$/o, @Docs;
+ closedir SUBDIR;
}
+
open TEMPLATEFILESUBDIR, "\"dir \/s \/b \/a-d ..\\..\\..\\toolsandutils\\buildsystem\\extension\" |";
my @TemplateFiles=();
@@ -241,16 +243,17 @@
"\n"
);
}
-if(scalar @Docs) {
+
+if (scalar @Docs) {
&Output(
- "$DocsPath :\n",
- "\t\@perl -w ..\\genutil\\emkdir.pl $DocsPath\n",
- "\n"
+ "$DocsPath :\n",
+ "\t\@perl -w ..\\genutil\\emkdir.pl $DocsPath\n",
+ "\n"
);
+} else {
+ $DocsPath = ""; # suppresses $DocsPath as a dependency in the main rules
}
-else {
- $DocsPath = ""; # suppresses $DocsPath as a dependency in the main rules
-}
+
&Output(
"$ShellFilePath :\n",
"\t\@perl -w ..\\genutil\\emkdir.pl $ShellFilePath\n",
@@ -509,7 +512,7 @@
sysread MRPFILE, $OldMRPText, 100000; # assumes MRP file is less than 100,000 bytes
close MRPFILE or die "\nERROR: Can't close MRP file \"$MRPFILE\"\n";
-if ( lc($OldMRPText) ne lc($NewMRPText)) {
+if ($OldMRPText ne $NewMRPText) {
print "REMARK: MRP file \"$MRPFILE\" differs from setupprj.bat generated content\n";
print "Creating suggested new MRP file \"$MRPFILE.new\"\n";
open MRPFILE,">$MRPFILE.new" or die "\nERROR: Can't open or create MRP file \"$MRPFILE.new\"\n";