[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  d25e1e1... build: update waf from svn
       via  db0eb2f... s4-waf: install some missing empty directories
       via  d2b35c3... build: make compare_install.sh also check for missing directories
      from  0b2e5de... s3-smb2: fix some c++ warnings.

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


- Log -----------------------------------------------------------------
commit d25e1e15d387d24fe045fbb162de57963c7b15a6
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Apr 19 21:00:51 2010 +1000

    build: update waf from svn
    
    this adds bld.install_dir()

commit db0eb2f239c9bbd3aeff06eee31102830eb42f11
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Apr 19 21:00:36 2010 +1000

    s4-waf: install some missing empty directories

commit d2b35c3a24b9bae88b996f8bc70e6a6012fd16f5
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Apr 19 21:00:16 2010 +1000

    build: make compare_install.sh also check for missing directories
    
    Thanks to Nadya for pointing this out

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

Summary of changes:
 buildtools/bin/waf-svn          |  Bin 107202 -> 107837 bytes
 buildtools/compare_install.sh   |    4 ++--
 buildtools/wafsamba/wafsamba.py |    7 +++++++
 source4/wscript_build           |    3 +++
 4 files changed, 12 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/bin/waf-svn b/buildtools/bin/waf-svn
index 3c707e9..774fb71 100755
Binary files a/buildtools/bin/waf-svn and b/buildtools/bin/waf-svn differ
diff --git a/buildtools/compare_install.sh b/buildtools/compare_install.sh
index c3a1c23..5ddbffb 100755
--- a/buildtools/compare_install.sh
+++ b/buildtools/compare_install.sh
@@ -3,6 +3,6 @@
 prefix1="$1"
 prefix2="$2"
 
-(cd $prefix1 && find . -type f) | sort > p1.txt
-(cd $prefix2 && find . -type f) | sort > p2.txt
+(cd $prefix1 && find . ) | sort > p1.txt
+(cd $prefix2 && find . ) | sort > p2.txt
 diff -u p[12].txt
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index a750a16..c3dd32c 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -598,6 +598,13 @@ def INSTALL_WILDCARD(bld, destdir, pattern, chmod=O644, flat=False,
 Build.BuildContext.INSTALL_WILDCARD = INSTALL_WILDCARD
 
 
+def INSTALL_DIRS(bld, destdir, dirs):
+    '''install a set of directories'''
+    for d in TO_LIST(dirs):
+        bld.install_dir(os.path.join(destdir, d))
+Build.BuildContext.INSTALL_DIRS = INSTALL_DIRS
+
+
 def PUBLIC_HEADERS(bld, public_headers, header_path=None):
     '''install some headers
 
diff --git a/source4/wscript_build b/source4/wscript_build
index 0fbd059..788fdba 100644
--- a/source4/wscript_build
+++ b/source4/wscript_build
@@ -116,3 +116,6 @@ bld.RECURSE('setup')
 bld.RECURSE('scripting')
 bld.RECURSE('../pidl')
 bld.RECURSE('../lib')
+
+# install some extra empty directories
+bld.INSTALL_DIRS("${PREFIX}", "etc var/lib var/locks var/run")


-- 
Samba Shared Repository