summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-06 10:49:21 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:40 +1000
commit36e6d11dceb7af9cccdff3c631745427e31b8835 (patch)
treef244f1b9548f9d11c8966f7242cc204b906f3283
parent27090becab1d9bd31ee313a32f0d0b78572f99b2 (diff)
downloadsamba-36e6d11dceb7af9cccdff3c631745427e31b8835.tar.gz
samba-36e6d11dceb7af9cccdff3c631745427e31b8835.tar.bz2
samba-36e6d11dceb7af9cccdff3c631745427e31b8835.zip
build: add README to explain gen_ndr, and ensure directory exists
-rw-r--r--buildtools/wafsamba/samba_patterns.py6
-rw-r--r--librpc/gen_ndr/README1
-rw-r--r--source4/heimdal_build/wscript_build9
-rw-r--r--source4/librpc/gen_ndr/README1
4 files changed, 16 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_patterns.py b/buildtools/wafsamba/samba_patterns.py
index f706895586..ca19d8d09a 100644
--- a/buildtools/wafsamba/samba_patterns.py
+++ b/buildtools/wafsamba/samba_patterns.py
@@ -24,11 +24,17 @@ def process_et(self, node):
+# this was my (awful) attempt at a ASN1 rule, i plan on moving it to samba_asn1.py,
+# like I did for the PIDL rules, and conver to a make-like rule
################################################################################
# a asn1 task which calls out to asn1_compile_wrapper.sh to do the work
Task.simple_task_type('asn1',
'''
+# this is the rule for now - ie. an embedded shell script!! like
+# I showed you previously, the ASN1 compiler generates weird names,
+# we need to fix the names, and add config.h header
+
# shell script to convert ASN1 to C. This could be separated out if we want to
set -e
compiler=${TGT[0].compiler}
diff --git a/librpc/gen_ndr/README b/librpc/gen_ndr/README
new file mode 100644
index 0000000000..0c1fd160a5
--- /dev/null
+++ b/librpc/gen_ndr/README
@@ -0,0 +1 @@
+This contains the generated files from PIDL for the IDL files in ../idl/*.idl
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index faea19195e..a29a38b643 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -62,7 +62,14 @@ bld(rule="${PYTHON} ${SRC[0].abspath()} ${SRC[2].abspath()} ${SRC[2].parent.absp
name = 'HEIMDAL_MAP_TABLE'
)
-
+# look at the example below - the output dir is lib/gssapi, the source asn1 file is lib/gssapi/spnego/spnego.asn1
+# well ... hmm, it depens if any heimdal C file uses a #include that depends on the path. We can try a different location
+# but I'm guessing it will break the heimdal C files
+# too hard to use a different output dir from input?
+# the restriction is we can't modify the existing C source of heimdal.
+# ok, symlink hacks to solve? it should be similar to the gen_ndr hackery of PIDL
+# as that is also a different out dir from input file
+# ok, but is it OK for PIDL? pidl is putting output in ../gen_ndr/ndr_$NAME.[ch] etc
bld.SAMBA_ASN1('HEIMDAL_SPNEGO_ASN1',
'../heimdal/lib/gssapi/spnego/spnego.asn1',
options='--sequence=MechTypeList',
diff --git a/source4/librpc/gen_ndr/README b/source4/librpc/gen_ndr/README
new file mode 100644
index 0000000000..0c1fd160a5
--- /dev/null
+++ b/source4/librpc/gen_ndr/README
@@ -0,0 +1 @@
+This contains the generated files from PIDL for the IDL files in ../idl/*.idl