Changeset 20606


Ignore:
Timestamp:
2009-09-16T11:53:20+12:00 (15 years ago)
Author:
davidb
Message:

Testing for Windows directory characters as well as Unix one. Also more careful filtering of minus options to script to -manifest isn't passed on to buildcol.pl

Location:
gsdl/trunk/bin/script
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/bin/script/incremental-buildcol.pl

    r20098 r20606  
    5050
    5151    if (($argc==0)  || (($argc==1) && ($argv[0] =~ m/^--?h(elp)?$/))) {
    52     my ($progname) = ($0 =~ m/^.*\/(.*?)$/);
     52    my ($progname) = ($0 =~ m/^.*[\/|\\](.*?)$/);
    5353
    5454

  • gsdl/trunk/bin/script/incremental-import.pl

    r20571 r20606  
    4949
    5050    if (($argc==0)  || (($argc==1) && ($argv[0] =~ m/^--?h(elp)?$/))) {
    51     my ($progname) = ($0 =~ m/^.*\/(.*?)$/);
     51    my ($progname) = ($0 =~ m/^.*[\/|\\](.*?)$/);
    5252
    5353

  • gsdl/trunk/bin/script/incremental-rebuild.pl

    r19620 r20606  
    4949
    5050    if (($argc==0)  || (($argc==1) && ($argv[0] =~ m/^--?h(elp)?$/))) {
    51     my ($progname) = ($0 =~ m/^.*\/(.*?)$/);
     51    my ($progname) = ($0 =~ m/^.*[\/|\\](.*?)$/);
    5252
    5353    print STDERR "\n";
    … …  
    6161    my $collect = pop @argv;
    6262
    63     my $quoted_argv = join(" ", map { "\"$_\"" } @argv);
     63    my @import_argv = ();
     64    my @buildcol_argv = ();
     65
     66    my $a;
     67    while ($a = shift @argv) {
     68    if ($a eq "-manifest") {
     69        push(@import_argv,$a);
     70
     71        my $af = shift(@argv);
     72        push(@import_argv,$af);
     73    }
     74    else {
     75        push(@import_argv,$a);
     76        push(@buildcol_argv,$a);
     77    }
     78
     79    }
     80
     81    my $quoted_import_argv = join(" ", map { "\"$_\"" } @import_argv);
     82    my $quoted_buildcol_argv = join(" ", map { "\"$_\"" } @buildcol_argv);
    6483   
    6584    my $final_status = 0;
    … …  
    8099    print "************************\n";
    81100   
    82     my $import_cmd = $launch_cmd . "incremental-import.pl $quoted_argv \"$collect\"";
     101    my $import_cmd = $launch_cmd . "incremental-import.pl $quoted_import_argv \"$collect\"";
    83102   
    84103    my $import_status = system($import_cmd)/256;
    … …  
    91110   
    92111
    93     my $buildcol_cmd = $launch_cmd . "incremental-buildcol.pl $quoted_argv \"$collect\"";
     112    my $buildcol_cmd = $launch_cmd . "incremental-buildcol.pl $quoted_buildcol_argv \"$collect\"";
    94113    my $buildcol_status = system($buildcol_cmd)/256;
    95114    if ($buildcol_status != 0) {
Note: See TracChangeset for help on using the changeset viewer.