vasabi: use --bin-dir-suffix instead of --bin-dir

As preparation for using the suffix also for the .lock-wscript file

Signed-off-by: Michael Adam <obnox@samba.org>

diff --git a/script/samba-build.py b/script/samba-build.py
index d698cc4b15b044c79834e75949bd3b70b6478b05..890ce879e54e8f07995feb0df525ffa9556eb21a 100755 (executable)
--- a/script/samba-build.py
+++ b/script/samba-build.py
@@ -24,7 +24,8 @@ uname = subprocess.Popen(['uname', '-n'],
 if not uname:
     uname = "samba-build-oot"
 
-default_bindir = "bin.%s" % uname
+default_bindir_suffix = "%s" % uname
+bindir = None
 
 default_srcdir = "."
 homedir = os.path.expanduser("~")
@@ -74,6 +75,7 @@ def determine_make():
 
 def process_args():
     global options
+    global bin_dir
     global src_dir_bin
     global bld_dir_bin
     global rsync_verbose_opt
@@ -165,13 +167,14 @@ def process_args():
                       default = default_blddir,
                       action = "store")
 
-    parser.add_option("-B", "--bin-dir",
-                      help = "the directory for storing the build results, "
-                             "relative to src/bld dir "
-                             "(linked to ./bin for the build)",
+    parser.add_option("-B", "--bin-dir-suffix",
+                      help = "The suffix for the bin directory for storing "
+                             "the build results, relative to src/bld dir "
+                             "(./bin will be a link to ./bin.BUILD_SUFFIX for "
+                             "the build)",
                       type = "str",
-                      dest = "bindir",
-                      default = default_bindir,
+                      dest = "bindir_suffix",
+                      default = default_bindir_suffix,
                       action = "store")
 
     #
@@ -208,8 +211,10 @@ def process_args():
     if do_out_of_tree and options.srcdir == options.blddir:
         parser.error("srcdir may not be equal to blddir")
 
-    src_dir_bin = "%s/%s" % ( options.srcdir, options.bindir )
-    bld_dir_bin = "%s/%s" % ( options.blddir, options.bindir )
+    bin_dir = "bin.%s" % options.bindir_suffix
+
+    src_dir_bin = "%s/%s" % ( options.srcdir, bin_dir )
+    bld_dir_bin = "%s/%s" % ( options.blddir, bin_dir )
 
     if options.verbose:
         rsync_verbose_opt = "-i"
@@ -227,7 +232,7 @@ def process_args():
     print ""
     print "src-dir:           '%s'" % options.srcdir
     print "bld-dir:           '%s'" % options.blddir
-    print "bin-dir:           '%s'" % options.bindir
+    print "bin-dir:           '%s'" % bin_dir
     print "do_copy_bindir:    %s"   % options.do_copy_bindir
     print "do_reuse_bindir:   %s"   % options.do_reuse_bindir
     print "="*78
@@ -283,7 +288,7 @@ def setup_env():
             options.blddir,
             "-maxdepth", "1",
             "-mindepth", "1",
-            "-not", "-name", options.bindir,
+            "-not", "-name", bin_dir,
             "-exec", "rm", "-rf", "{}", ";" ]
     if options.verbose:
         print "cmd: '%s'" % ' '.join(cmd)
@@ -334,9 +339,7 @@ def setup_env():
         subprocess.check_call(cmd)
 
     rm_rf("%s/bin" % options.blddir)
-
-    cmd = [ "ln", "-sf", options.bindir, "%s/bin" % options.blddir ]
-    subprocess.check_call(cmd)
+    os.symlink(bin_dir, "%s/bin" % options.blddir)
 
 
 def do_build():

diff --git a/script/vasabi.py b/script/vasabi.py
index 891d010131765dc8bd29a8eb6cba56628434cee7..bafbf67eaf5e211a4d18aea90075d04c9115f4c1 100755 (executable)
--- a/script/vasabi.py
+++ b/script/vasabi.py
@@ -19,7 +19,7 @@ default_src_dir_host = "."
 bld_dir_guest = "/home/vagrant/vasabi-build"
 src_dir_guest = "/vasabi/src"
 script_dir = "/vagrant/script"
-bin_dir = ""
+bin_dir_suffix = ""
 
 default_build_wrapper = "%s/samba-build.py" % script_dir
 
@@ -42,7 +42,7 @@ os.chdir(vasabi_basedir)
 def process_args():
     global options
     global args
-    global bin_dir
+    global bin_dir_suffix
 
     parser = optparse.OptionParser()
 
@@ -105,12 +105,12 @@ def process_args():
     #if len(args) != 0:
     #    parser.error("too many arguments")
 
-    bin_dir = "bin.%s" % options.target
+    bin_dir_suffix = options.target
 
     additional_args = [
         "--src-dir", src_dir_guest,
         "--bld-dir", bld_dir_guest,
-        "--bin-dir", bin_dir,
+        "--bin-dir-suffix", bin_dir_suffix,
         ]
 
     args.extend(additional_args)