[Libreoffice-commits] .: Branch 'libreoffice-3-4' - bin/lo-set-version

[Petr Mladek]

 bin/lo-set-version |   19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

New commits:
commit b1df9d6b86ba521cc5df6fc45b85fa9058b0fb12
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Apr 21 21:04:58 2011 +0200

    lo-set-version: fix to work from bootstrap repo

diff --git a/bin/lo-set-version b/bin/lo-set-version
index 3cb7116..1946e9c 100755
--- a/bin/lo-set-version
+++ b/bin/lo-set-version
@@ -118,7 +118,7 @@ sub usage()
 
           "Usage:\n".
           "\tlo-pack-sources [--help] [--show] [--inc] [--force-build=<ver>]\n" .
-          "\t                [--force-prod-micro=<ver>] build_dir\n" .
+          "\t                [--force-prod-micro=<ver>] bootstrap_dir\n" .
 
           "Options:\n\n" .
           "\t--help: print this help\n" .
@@ -127,13 +127,13 @@ sub usage()
           "\t        micro version)\n" .
           "\t--force-build: force windows build version, e.g. 4567\n" .
           "\t--force-prod-micro: force product micro version, .e.g. beta1\n" .
-          "\tbuild_dir: path to the clone of libreoffice/build; it expects\n" .
+          "\tbootstrap_dir: path to the clone of libreoffice/bootstrap; it expects\n" .
           "\t           that other pieces are cloned in the clone subdirectory\n";
 }
 
 my $show;
 my $inc;
-my $build_dir;
+my $bootstrap_dir;
 my $build_ver_force;
 my $prod_micro_ver_force;
 my %versions;
@@ -158,8 +158,8 @@ for my $arg (@ARGV) {
     } elsif ($arg =~ /^-/ ) {
         die "Error: unknown option: $arg\n";
     } else {
-        if (! defined $build_dir) {
-            $build_dir = $arg;
+        if (! defined $bootstrap_dir) {
+            $bootstrap_dir = $arg;
         } else {
             die "Error: Too many arguments $arg\n";
         }
@@ -170,15 +170,10 @@ for my $arg (@ARGV) {
 # Initial checks
 ###################
 
-unless ( defined $build_dir ) {
-    die "Error: undefined directory with build repo, try --help\n";
+unless ( defined $bootstrap_dir ) {
+    die "Error: undefined directory with bootstrap repo, try --help\n";
 }
 
-unless ( -d "$build_dir" ) {
-    die "Error: not a directory: $build_dir\n";
-}
-
-my $bootstrap_dir = "$build_dir/clone/bootstrap";
 unless ( -d "$bootstrap_dir" ) {
     die "Error: not a directory: $bootstrap_dir\n";
 }