Changeset 34767 in webkit for trunk/JavaScriptCore/pcre/dftables

Timestamp:

Jun 24, 2008, 7:33:32 AM (17 years ago)

Author:

Simon Hausmann

Message:

2008-06-24 Joerg Bornemann <​[email protected]>

Reviewed by Simon.

For the Qt build on Windows don't depend on the presence of GNU CPP
but use MSVC's preprocessor instead.
dftables accepts a --preprocessor option which is set in pcre.pri for MSVC platforms.

File:

• trunk/JavaScriptCore/pcre/dftables (modified) (4 diffs)

trunk/JavaScriptCore/pcre/dftables

@@ -48 +48 @@
 use File::Spec;
 use File::Temp;
+use Getopt::Long;
 
 sub readHeaderValues();
@@ -53 +54 @@
 my %pcre_internal;
 
-if (scalar(@ARGV) != 1) {
-    print STDERR "Usage: ", basename($0), " output-file\n";
+if (scalar(@ARGV) < 1) {
+    print STDERR "Usage: ", basename($0), " [--preprocessor=program] output-file\n";
     exit 1;
 }
 
-my $outputFile = shift @ARGV;
+my $outputFile;
+my $preprocessor;
+GetOptions('preprocessor=s' => \$preprocessor);
+if (not $preprocessor) {
+    $preprocessor = "cpp";
+}
+
+$outputFile = $ARGV[0];
+die('Must specify output file.') unless defined($outputFile);
 
 readHeaderValues();
@@ -233 +242 @@
 
     my $headerPath = File::Spec->catfile(dirname($0), "pcre_internal.h");
-
+ 
     my $fh = new File::Temp(
         DIR => ($ENV{'TMPDIR'} || "/tmp"),
@@ -256 +265 @@
     close($fh);
 
-    open(CPP, "cpp \"$tempFile\" |") or die "$!";
+    open(CPP, "$preprocessor \"$tempFile\" |") or die "$!";
     my $content = <CPP>;
     close(CPP);
-
+    
     eval $content;
     die "$@" if $@;