diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-03-12 15:01:36 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-03-12 15:17:33 +0100 |
| commit | a78a059475e297aaddbea24146736365a958b4aa (patch) | |
| tree | d5b59f509a19e1586bab21e54524f4f1e0e2cd2c /bin/qt5_tool | |
| parent | a0efecf7a21060fd25a4834008866078ad01cdc3 (diff) | |
| download | qtrepotools-a78a059475e297aaddbea24146736365a958b4aa.tar.gz | |
qt5_tool: Disambiguate build/branch options by uppercasing --Branch.
Change-Id: I635f50881c9ef146b6154016105dfe0ccebf1ed4
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'bin/qt5_tool')
| -rwxr-xr-x | bin/qt5_tool | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bin/qt5_tool b/bin/qt5_tool index 528ad78..0520b33 100755 --- a/bin/qt5_tool +++ b/bin/qt5_tool @@ -20,7 +20,7 @@ use strict; -use Getopt::Long; +use Getopt::Long qw(:config no_ignore_case); use File::Basename; use File::Spec; use File::Copy; @@ -63,7 +63,7 @@ Options: -c Clean -u Update -p Pull (for development only) - --branch (dev/stable) to select which branches to check out when pulling + --Branch (dev/stable) to select which branches to check out when pulling -b Build (configure + build) -m Make -t Test: Builds and runs tests located in tests/auto for each module, @@ -76,7 +76,7 @@ Example use cases: qt5_tool -c -u -b Clean, update and build for nightly builds qt5_tool -d Generate modules diff relative to root directory qt5_tool -r Reset --hard of repo. - qt5_tool -p --branch stable Check out all repos to the stable branches + qt5_tool -p --Branch stable Check out all repos to the stable branches qt_tool can be configured by creating a configuration file "%CONFIGFILE%" @@ -88,7 +88,7 @@ Supported keys: developerBuild: Developer build (Boolean) initArguments: Arguments to init-repository for -q. codeReviewUser: User name for code review (Gerrit) -branch: 'dev', 'stable' or other +Branch: 'dev', 'stable' or other configureArguments: Arguments to configure shadowBuildPostfix: Postfix to use for shadow build directory. @@ -551,8 +551,9 @@ sub buildWebKit # --------------- MAIN: Parse arguments +$Getopt::ignoreCase = 0; if (!GetOptions('clean' => \$CLEAN, - 'pull' => \$PULL, 'branch=s' => \$optDesiredBranch, 'update' => \$UPDATE, 'reset' => \$RESET, 'diff' => \$DIFF, 's' => \$STATUS, + '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, |