mktables executes seven time per build sigh

Message-ID: <9b18b3110609100852q2cfc2497ufceda5ff5d0875e3@mail.gmail.com>

(Fix for Windows)

p4raw-id: //depot/perl@28832

diff --git a/lib/unicore/mktables b/lib/unicore/mktables
index 4200366..006b9ef 100644 (file)
--- a/lib/unicore/mktables
+++ b/lib/unicore/mktables
@@ -45,6 +45,13 @@ while (@ARGV)
     } elsif ($arg eq '-w') {
         $AlwaysWrite = 1;      # update the files even if they havent changed
         $FileList = "";
+    } elsif ($arg eq '-check') {
+        my $this = shift @ARGV;
+        my $ok = shift @ARGV;
+        if ($this ne $ok) {
+            print "Skipping as check params are not the same.\n";
+            exit(0);
+        }
     } elsif ($arg eq '-maketest') {
         $MakeTestScript = 1;
     } elsif ($arg eq '-makelist') {
@@ -61,7 +68,8 @@ while (@ARGV)
             "  -maketest   : Make test script\n",
             "  -makelist   : Rewrite the file list based on current setup\n",
             "  -L filelist : Use this file list, (defaults to $0)\n",
-            "  -C dir      : Change to this directory before proceding\n";   
+            "  -C dir      : Change to this directory before proceeding\n",
+            "  -check A B  : Executes only if A and B are the same\n";   
     }
 }
 

diff --git a/win32/Makefile b/win32/Makefile
index 2ab3254..ce65ba6 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -513,6 +513,7 @@ GLOBEXEBUILD         =
 !ENDIF
 
 # Unicode data files generated by mktables
+FIRSTUNIFILE     = ..\lib\unicore\Canonical.pl
 UNIDATAFILES    = ..\lib\unicore\Canonical.pl ..\lib\unicore\Exact.pl \
                   ..\lib\unicore\Properties ..\lib\unicore\Decomposition.pl \
                   ..\lib\unicore\CombiningClass.pl ..\lib\unicore\Name.pl \
@@ -1272,7 +1273,7 @@ inst_lib : $(CONFIGPM)
 
 $(UNIDATAFILES) : $(MINIPERL) $(CONFIGPM) ..\lib\unicore\mktables
        cd ..\lib\unicore && \
-       ..\$(MINIPERL) -I.. mktables
+       ..\$(MINIPERL) -I.. mktables -check $@ $(FIRSTUNIFILE)
 
 minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) utils $(UNIDATAFILES)
        $(XCOPY) $(MINIPERL) ..\t\$(NULL)
@@ -1293,6 +1294,14 @@ test : test-prep
        $(PERLEXE) -I..\lib harness $(TEST_SWITCHES) $(TEST_FILES)
        cd ..\win32
 
+test-reonly : reonly utils
+       $(XCOPY) $(PERLEXE) ..\t\$(NULL)
+       $(XCOPY) $(PERLDLL) ..\t\$(NULL)
+       $(XCOPY) $(GLOBEXE) ..\t\$(NULL)
+       cd ..\t
+       $(PERLEXE) -I..\lib harness $(OPT) -re \bpat\b \breg
+       cd ..\win32
+       
 test-notty : test-prep
        set PERL_SKIP_TTY_TEST=1
        cd ..\t