Skip to main content

Browse the archive

Revision 4553f9de23f8d451bf801b566247bf987570626a authored by Johannes Schindelin on 29 July 2019, 20:08:11 UTC, committed by Junio C Hamano on 29 July 2019, 21:51:43 UTC 
contrib/buildsystems: handle options starting with a slash
 
With the recent changes to allow building with MSVC=1, we now pass the
/OPT:REF option to the compiler. This confuses the parser that wants to
turn the output of a dry run into project definitions for QMake and Visual
Studio:

	Unhandled link option @ line 213: /OPT:REF at [...]

Let's just extend the code that passes through options that start with a
dash, so that it passes through options that start with a slash, too.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 6e50021
Raw File
build-docdep.perl 
#!/usr/bin/perl

my %include = ();
my %included = ();

for my $text (<*.txt>) {
    open I, '<', $text || die "cannot read: $text";
    while (<I>) {
	if (/^include::/) {
	    chomp;
	    s/^include::\s*//;
	    s/\[\]//;
	    $include{$text}{$_} = 1;
	    $included{$_} = 1;
	}
    }
    close I;
}

# Do we care about chained includes???
my $changed = 1;
while ($changed) {
    $changed = 0;
    while (my ($text, $included) = each %include) {
	for my $i (keys %$included) {
	    # $text has include::$i; if $i includes $j
	    # $text indirectly includes $j.
	    if (exists $include{$i}) {
		for my $j (keys %{$include{$i}}) {
		    if (!exists $include{$text}{$j}) {
			$include{$text}{$j} = 1;
			$included{$j} = 1;
			$changed = 1;
		    }
		}
	    }
	}
    }
}

while (my ($text, $included) = each %include) {
    if (! exists $included{$text} &&
	(my $base = $text) =~ s/\.txt$//) {
	print "$base.html $base.xml : ", join(" ", keys %$included), "\n";
    }
}
back to top