[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  630a2eb... waf: make the error msg when gen_ndr directory is missing clearer
       via  a709e42... waf-idl: put the gen_ndr/README file for source3 back
      from  5cefbfe... s3-rpc_server: Added callbacks for init and shutdown of a rpc service.

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


- Log -----------------------------------------------------------------
commit 630a2eb68af0d523a1bb4451bbaa75d2ba47d252
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Jul 19 14:26:20 2010 +1000

    waf: make the error msg when gen_ndr directory is missing clearer
    
    the next time someone removes gen_ndr/README the fix should be more
    obvious.

commit a709e423d2940a7c71099ff11383a5f0ef3b1d7e
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Jul 19 14:20:33 2010 +1000

    waf-idl: put the gen_ndr/README file for source3 back
    
    This was removed by 100d37fc4624690423f6a932709b3f9046d05c64, probably
    accidentially.

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

Summary of changes:
 buildtools/wafsamba/samba_pidl.py |    7 +++++++
 librpc/gen_ndr/README             |    3 +++
 source3/librpc/gen_ndr/README     |    4 ++++
 source4/librpc/gen_ndr/README     |    3 +++
 4 files changed, 17 insertions(+), 0 deletions(-)
 create mode 100644 source3/librpc/gen_ndr/README


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_pidl.py b/buildtools/wafsamba/samba_pidl.py
index b932f59..521222d 100644
--- a/buildtools/wafsamba/samba_pidl.py
+++ b/buildtools/wafsamba/samba_pidl.py
@@ -79,6 +79,13 @@ def SAMBA_PIDL(bld, pname, source,
     # gen_ndr directory we end up generating identical output in gen_ndr for the old
     # build system and the new one. That makes keeping things in sync much easier.
     # eventually we should drop the gen_ndr files in git, but in the meanwhile this works
+
+    found_dir = bld.path.find_dir(output_dir)
+    if not 'abspath' in dir(found_dir):
+        Logs.error('Unable to find pidl output directory %s' %
+                   os.path.normpath(os.path.join(bld.curdir, output_dir)))
+        sys.exit(1)
+
     outdir = bld.path.find_dir(output_dir).abspath(t.env)
 
     if symlink and not os.path.lexists(outdir):
diff --git a/librpc/gen_ndr/README b/librpc/gen_ndr/README
index 0c1fd16..5ccb89d 100644
--- a/librpc/gen_ndr/README
+++ b/librpc/gen_ndr/README
@@ -1 +1,4 @@
 This contains the generated files from PIDL for the IDL files in ../idl/*.idl
+
+DO NOT REMOVE THIS FILE. The waf 1.5 build relies on this directory
+existing in the source tree.
diff --git a/source3/librpc/gen_ndr/README b/source3/librpc/gen_ndr/README
new file mode 100644
index 0000000..5ccb89d
--- /dev/null
+++ b/source3/librpc/gen_ndr/README
@@ -0,0 +1,4 @@
+This contains the generated files from PIDL for the IDL files in ../idl/*.idl
+
+DO NOT REMOVE THIS FILE. The waf 1.5 build relies on this directory
+existing in the source tree.
diff --git a/source4/librpc/gen_ndr/README b/source4/librpc/gen_ndr/README
index 0c1fd16..5ccb89d 100644
--- a/source4/librpc/gen_ndr/README
+++ b/source4/librpc/gen_ndr/README
@@ -1 +1,4 @@
 This contains the generated files from PIDL for the IDL files in ../idl/*.idl
+
+DO NOT REMOVE THIS FILE. The waf 1.5 build relies on this directory
+existing in the source tree.


-- 
Samba Shared Repository