[SCM] Samba Shared Repository - branch master updated

Alexander Bokovoy ab at samba.org
Tue Sep 11 08:01:03 UTC 2018


The branch, master has been updated
       via  587bbd3 wafsamba: Drop unused, broken install_dir()
       via  b4fa3f9 wafsamba: Have INSTALL_DIR() log directory creation
       via  26ea0f5 wafsamba: Make INSTALL_DIR() respect $DESTDIR
       via  a122428 ctdb-build: Use wafsamba's INSTALL_DIR()
      from  ad04275 wafsamba: remove tru64cc.py as it's not compatible with waf 2

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 587bbd3eb17d41c4c78a068d16c7f4182f196f47
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Sep 11 14:35:38 2018 +1000

    wafsamba: Drop unused, broken install_dir()
    
    This is broken because it doesn't respect $DESTDIR.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Alexander Bokovoy <ab at samba.org>
    Autobuild-Date(master): Tue Sep 11 10:00:05 CEST 2018 on sn-devel-144

commit b4fa3f982a38bce10d471c5b309f4f0f631c300c
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Sep 11 14:35:02 2018 +1000

    wafsamba: Have INSTALL_DIR() log directory creation
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>

commit 26ea0f58daace4adef7c5bb17f19476083bf3b7b
Author: Martin Schwenke <martin at meltin.net>
Date:   Mon Sep 10 10:35:24 2018 +1000

    wafsamba: Make INSTALL_DIR() respect $DESTDIR
    
    INSTALL_DIR() currently ignores $DESTDIR and just installs directories
    into the final destination.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>

commit a122428a585281ebaf0135f11bd9377af9f6ab97
Author: Martin Schwenke <martin at meltin.net>
Date:   Sun Sep 9 20:34:31 2018 +1000

    ctdb-build: Use wafsamba's INSTALL_DIR()
    
    install_dir() doesn't work (doesn't respect $DESTDIR) and is only
    available for backward compatibilty.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/samba_waf18.py | 17 -----------------
 buildtools/wafsamba/wafsamba.py    |  4 +++-
 ctdb/wscript                       |  8 ++++----
 3 files changed, 7 insertions(+), 22 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_waf18.py b/buildtools/wafsamba/samba_waf18.py
index 8a4558d..2644130 100644
--- a/buildtools/wafsamba/samba_waf18.py
+++ b/buildtools/wafsamba/samba_waf18.py
@@ -133,23 +133,6 @@ def undefine(self, key, from_env=True, comment=None):
     if from_env:
         self.env[key] = ()
 
-def install_dir(self, path):
-        if not path:
-                return []
-
-        destpath = Utils.subst_vars(path, self.env)
-
-        if self.is_install > 0:
-                Logs.info('* creating %s', destpath)
-                Utils.check_dir(destpath)
-        elif self.is_install < 0:
-                Logs.info('* removing %s', destpath)
-                try:
-                        os.remove(destpath)
-                except OSError:
-                        pass
-Build.BuildContext.install_dir = install_dir
-
 class ConfigurationContext(Configure.ConfigurationContext):
     def init_dirs(self):
         self.setenv('default')
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index d6754e9..dbcfe12 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -897,11 +897,13 @@ def INSTALL_DIR(bld, path, chmod=0o755, env=None):
     if not path:
         return []
 
-    destpath = bld.EXPAND_VARIABLES(path)
+    destpath = os.path.join(Options.options.destdir,
+                            bld.EXPAND_VARIABLES(path).lstrip(os.sep))
 
     if bld.is_install > 0:
         if not os.path.isdir(destpath):
             try:
+                Logs.info('* create %s', destpath)
                 os.makedirs(destpath)
                 os.chmod(destpath, chmod)
             except OSError as e:
diff --git a/ctdb/wscript b/ctdb/wscript
index 59deb8c..06cc154 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -861,12 +861,12 @@ def build(bld):
                       'config/notification.README',
                       destname='README')
 
-    bld.install_dir(bld.env.CTDB_LOGDIR)
-    bld.install_dir(bld.env.CTDB_RUNDIR)
-    bld.install_dir(bld.env.CTDB_VARDIR)
+    bld.INSTALL_DIR(bld.env.CTDB_LOGDIR)
+    bld.INSTALL_DIR(bld.env.CTDB_RUNDIR)
+    bld.INSTALL_DIR(bld.env.CTDB_VARDIR)
 
     for d in ['volatile', 'persistent', 'state']:
-        bld.install_dir(os.path.join(bld.env.CTDB_VARDIR, d))
+        bld.INSTALL_DIR(os.path.join(bld.env.CTDB_VARDIR, d))
 
     bld.SAMBA_BINARY('errcode',
                      source='tests/src/errcode.c',


-- 
Samba Shared Repository



More information about the samba-cvs mailing list