Subversion Repositories DevTools

Rev

Rev 351 | Rev 3347 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 351 Rev 359
Line 131... Line 131...
131 
    my $result = 1;
 131 
    my $result = 1;
132 
 
 132 
 
133 
    if ( $opt =~ m/^--ScanDependencies/ ) {
 133 
    if ( $opt =~ m/^--ScanDependencies/ ) {
134 
        $self->{scandeps} = 1;
 134 
        $self->{scandeps} = 1;
135 
 
 135 
 
- 
 
 136 
    } elsif ( $opt =~ m/^--ScanExactDependencies/ ) {
- 
 
 137 
        $self->{scandeps} = 2;
- 
 
 138 
 
136 
    } elsif ( $opt =~ m/^--LocateAll/ ) {
 139 
    } elsif ( $opt =~ m/^--LocateAll/ ) {
137 
        $self->{locateAll} = 1;
 140 
        $self->{locateAll} = 1;
138 
 
 141 
 
139 
    } else {
 142 
    } else {
140 
        $result = 0;
 143 
        $result = 0;
Line 183... Line 186...
183 
                    push @{$ff_datap}, BuildEntry( $File::Find::dir, $_, 2);
 186 
                    push @{$ff_datap}, BuildEntry( $File::Find::dir, $_, 2);
184 
                }
 187 
                }
185 
            }
 188 
            }
186 
            else
 189 
            else
187 
            {
 190 
            {
- 
 
 191 
                $_ = 'auto.pl' if ( $ff_self->{scandeps} && -f 'auto.pl' );
188 
                Verbose ("find_file_wanted: FOUND $File::Find::dir, $_");
 192 
                Verbose ("find_file_wanted: FOUND $File::Find::dir, $_");
189 
                push @{$ff_datap}, BuildEntry( $File::Find::dir, $_, 1);
 193 
                push @{$ff_datap}, BuildEntry( $File::Find::dir, $_, 1);
190 
            }
 194 
            }
191 
            return;
195 
            return;
192 
        }
 196 
        }
Line 247... Line 251...
247 
    foreach my $be ( @{$self->{info}} )
 251 
    foreach my $be ( @{$self->{info}} )
248 
    {
 252 
    {
249 
        if ( $be->{type} == 2 ) {
 253 
        if ( $be->{type} == 2 ) {
250 
            scan_ant ( $be, $self->{scandeps} );
 254 
            scan_ant ( $be, $self->{scandeps} );
251 
        } else {
 255 
        } else {
252 
            scan_jats ( $be, $self->{scandeps} );
 256 
            scan_jats( $be, $self->{scandeps} );
253 
        }
 257 
        }
254 
 
 258 
 
255 
        #
 259 
        #
256 
        #   Skip invalid build files
 260 
        #   Skip invalid build files
257 
        #
 261 
        #
258 
        next unless ( $be->{name} &&  $be->{version}  );
 262 
        next unless ( $be->{name} &&  $be->{version}  );
259 
 
 263 
 
260 
        #
 264 
        #
261 
        #   Calculate internal information from the basic information
 265 
        #   Calculate internal information from the basic information
- 
 
 266 
        #   To be used as a Display Name (Display to user)
262 
        #   full  - Full package version and extension
 267 
        #   full    - Full package version and extension
263 
        #   mname - name and extension
 268 
        #   mname   - name and extension
- 
 
 269 
        #
- 
 
 270 
        #   To be used for data processing (Hash key into data)
- 
 
 271 
        #   fullTag - Full package version and extension $; joiner
264 
        #   package - name and extension with a $; joiner
 272 
        #   package - name and extension with a $; joiner
265 
        #
 273 
        #
- 
 
 274 
        #
- 
 
 275 
        $be->{fullTag} = join $;, $be->{name}, $be->{version}, $be->{prj};
- 
 
 276 
        $be->{package} = join $;, $be->{name}, $be->{prj};
- 
 
 277
266 
        $be->{version} .= '.' . $be->{prj} if ( $be->{prj} );
 278 
        $be->{version} .= '.' . $be->{prj} if ( $be->{prj} );
- 
 
 279 
 
267 
        $be->{full} = $be->{name} . '.' . $be->{version};
 280 
        $be->{full} = $be->{name} . ' ' . $be->{version};
268 
        $be->{mname} = $be->{name};
 281 
        $be->{mname} = $be->{name};
269 
        $be->{mname} .= '.' . $be->{prj} if ( $be->{prj} );
 282 
        $be->{mname} .= '.' . $be->{prj} if ( $be->{prj} );
270 
 
 283 
 
271 
        $be->{package} = join $;, $be->{name}, $be->{prj};
 - 
 
272 
        Verbose2( "Buildfile: $be->{dir}, $be->{file},$be->{name}");
 284 
        Verbose2( "Buildfile: $be->{dir}, $be->{file},$be->{name}");
273 
    }
 285 
    }
274 
    $self->{scan_done} = 1;
 286 
    $self->{scan_done} = 1;
275 
}
 287 
}
276 
 
 288 
 
Line 316... Line 328...
316 
        if ( $scanDeps && ( m/^LinkPkgArchive/ or m/^BuildPkgArchive/ ))
 328 
        if ( $scanDeps && ( m/^LinkPkgArchive/ or m/^BuildPkgArchive/ ))
317 
        {
 329 
        {
318 
            m/['"](.*?)['"][^'"]*['"](.*?)['"]/;
 330 
            m/['"](.*?)['"][^'"]*['"](.*?)['"]/;
319 
 
 331 
 
320 
            my ( $package, $rel, $suf, $full ) = SplitPackage( $1, $2 );
 332 
            my ( $package, $rel, $suf, $full ) = SplitPackage( $1, $2 );
- 
 
 333 
            if ( $scanDeps > 1 ) {
- 
 
 334 
                $be->{depends}{$package,$rel,$suf} = join ($;, $1, $2);
- 
 
 335 
            } else {
321 
            $be->{depends}{$package,$suf} = $rel;
 336 
                $be->{depends}{$package,$suf} = join ($;, $1, $2);
- 
 
 337 
            }
322 
        }
 338 
        }
323 
    }
 339 
    }
324 
    close INFILE;
 340 
    close INFILE;
325 
}
 341 
}
326 
 
 342 
 
Line 377... Line 393...
377 
                } elsif ( $name eq 'releasemanager.projectname' ) {
 393 
                } elsif ( $name eq 'releasemanager.projectname' ) {
378 
                    next;
 394 
                    next;
379
395
380 
                } elsif ( $scanDeps ) {
 396 
                } elsif ( $scanDeps ) {
381 
                    my ( $package, $rel, $suf, $full ) = SplitPackage( $name, $value );
 397 
                    my ( $package, $rel, $suf, $full ) = SplitPackage( $name, $value );
- 
 
 398 
                    if ( $scanDeps > 1 ) {
- 
 
 399 
                        $be->{depends}{$package,$rel,$suf} = join ($;, $1, $2);
- 
 
 400 
                    } else {
382 
                    $be->{depends}{$package,$suf} = $rel;
 401 
                        $be->{depends}{$package,$suf} = join ($;, $1, $2);
- 
 
 402 
                    }
383 
                }
 403 
                }
384 
            }
 404 
            }
385 
        }
 405 
        }
386 
    }
 406 
    }
387 
    close INFILE;
 407 
    close INFILE;