diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-03-23 14:20:24 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-03-23 16:51:38 +0000 |
| commit | a5e67b5aeccc5ef483719bac8690c4983582a53c (patch) | |
| tree | c42a351d70c9d827889706a0445e4e78983cc6b6 /bin/qt5_tool | |
| parent | ee37f809130f6a55aad2e52e8a93a718f20ccc07 (diff) | |
| download | qtrepotools-a5e67b5aeccc5ef483719bac8690c4983582a53c.tar.gz | |
qt5_tool: Remove some cruft.
Remove broken option to rebuild configure.exe and unused
$optModuleBranchArgument.
Change-Id: I7a66e5ac72acde3a3f9f8d55f367ae90417d3b1e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'bin/qt5_tool')
| -rwxr-xr-x | bin/qt5_tool | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/bin/qt5_tool b/bin/qt5_tool index 1088d62..205aac5 100755 --- a/bin/qt5_tool +++ b/bin/qt5_tool @@ -39,9 +39,7 @@ my $BOOTSTRAP=0; my $STATUS=0; my $UPDATE=0; my $TEST=0; -my $REBUILD_CONFIGURE=0; my $BUILD_WEBKIT = 0; -my $optModuleBranchArgument; my $optGerritModule; my $optGitHooks; my $optDesiredBranch; @@ -539,12 +537,11 @@ $Getopt::ignoreCase = 0; if (!GetOptions('clean' => \$CLEAN, 'pull' => \$PULL, 'Branch=s' => \$optDesiredBranch, 'update' => \$UPDATE, 'reset' => \$RESET, 'diff' => \$DIFF, 's' => \$STATUS, 'build' => \$BUILD, 'make' => \$MAKE, 'test' => \$TEST, - 'acking=s' => \$optModuleBranchArgument, 'gerrit=s' => \$optGerritModule, 'hooks' => \$optGitHooks, - 'quick-bootstrap' => \$BOOTSTRAP, - 'webkit' => \$BUILD_WEBKIT, 'x' => \$REBUILD_CONFIGURE) + 'gerrit=s' => \$optGerritModule, 'hooks' => \$optGitHooks, + 'quick-bootstrap' => \$BOOTSTRAP, 'webkit' => \$BUILD_WEBKIT) || ($CLEAN + $PULL + $UPDATE + $BUILD + $MAKE + $RESET + $DIFF + $BOOTSTRAP + $STATUS - + $REBUILD_CONFIGURE + $TEST + $BUILD_WEBKIT== 0 - && ! defined $optModuleBranchArgument && !defined $optGerritModule && !defined $optGitHooks)) { + + $TEST + $BUILD_WEBKIT== 0 + && !defined $optGerritModule && !defined $optGitHooks)) { print $USAGE; exit (1); } @@ -822,11 +819,6 @@ if ( $PULL != 0 ) { } # foreach } # pull -# --------------- Rebuild configure.exe -if ( $REBUILD_CONFIGURE != 0 ) { - rebuildConfigure($rootDir); -} - # ---- Update if ( $UPDATE != 0 ) { |