From 82ed0866182afa6b8a2285f46bdd8f326db9032f Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 6 Sep 2006 22:08:06 +0000 Subject: r18193: Not quite to autogenerated NDR but closer thanks to Jelmer's initial work. I'm including the librpc/gen_ndr directory in svn temporarily just to get some compile issues straightened out. (This used to be commit cf271aa433cfa606be5dbf3ed1d94fe3caf57653) --- source3/script/build_idl.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 source3/script/build_idl.sh (limited to 'source3/script/build_idl.sh') diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh new file mode 100644 index 0000000000..62941f4bc5 --- /dev/null +++ b/source3/script/build_idl.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +PIDL_ARGS="--outputdir ${srcdir}/librpc/gen_ndr --header --ndr-parser --" +PIDL_EXTRA_ARGS="$*" + +oldpwd=`pwd` +cd ${srcdir} + +[ -d librpc/gen_ndr ] || mkdir -p librpc/gen_ndr || exit 1 + +PIDL="$PERL pidl/pidl ${PIDL_ARGS} ${PIDL_EXTRA_ARGS}" + +list="" +for f in ${IDL_FILES}; do + basename=`basename $f .idl` + ndr="librpc/gen_ndr/ndr_$basename.c" + + if [ -f $ndr ]; then + if [ "x`find librpc/idl/$f -newer $ndr -print`" = "xlibrpc/idl/$f" ]; then + list="$list librpc/idl/$f" + fi + else + list="$list librpc/idl/$f" + fi +done + +if [ "x$list" != x ]; then + $PIDL $list || exit 1 +fi + +for f in librpc/gen_ndr/ndr_*.c; do + cat $f | sed 's/^static //g' | sed 's/^_PUBLIC_ //g' > $f.new + /bin/mv -f $f.new $f +done + +touch librpc/gen_ndr/ndr_dcerpc.h + +cd ${oldpwd} + +exit 0 -- cgit From cb78a0d24a9db799c07c26aa11ff42dbdf33d05e Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 7 Sep 2006 20:09:15 +0000 Subject: r18229: regenerated unixinfo files and add a few header stubs. Almost autogenerated now (This used to be commit b860685a8117c3876158ac7b8db63cda9b415239) --- source3/script/build_idl.sh | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'source3/script/build_idl.sh') diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh index 62941f4bc5..aeea78be36 100644 --- a/source3/script/build_idl.sh +++ b/source3/script/build_idl.sh @@ -1,6 +1,6 @@ #!/bin/sh -PIDL_ARGS="--outputdir ${srcdir}/librpc/gen_ndr --header --ndr-parser --" +PIDL_ARGS="--outputdir librpc/gen_ndr --header --ndr-parser --" PIDL_EXTRA_ARGS="$*" oldpwd=`pwd` @@ -10,12 +10,16 @@ cd ${srcdir} PIDL="$PERL pidl/pidl ${PIDL_ARGS} ${PIDL_EXTRA_ARGS}" +## +## Find newer files rather than rebuild all of them +## + list="" for f in ${IDL_FILES}; do basename=`basename $f .idl` ndr="librpc/gen_ndr/ndr_$basename.c" - if [ -f $ndr ]; then + if [ -f $ndr && 0 ]; then if [ "x`find librpc/idl/$f -newer $ndr -print`" = "xlibrpc/idl/$f" ]; then list="$list librpc/idl/$f" fi @@ -24,12 +28,24 @@ for f in ${IDL_FILES}; do fi done +## +## generate the ndr stubs +## + if [ "x$list" != x ]; then + echo "${PIDL} ${list}" $PIDL $list || exit 1 fi +## +## Do miscellaneous cleanup +## + for f in librpc/gen_ndr/ndr_*.c; do - cat $f | sed 's/^static //g' | sed 's/^_PUBLIC_ //g' > $f.new + cat $f | sed -e 's/^static //g' \ + -e 's/^_PUBLIC_ //g' \ + -e 's/#include //g' \ + -e 's/#include //g' > $f.new /bin/mv -f $f.new $f done @@ -38,3 +54,4 @@ touch librpc/gen_ndr/ndr_dcerpc.h cd ${oldpwd} exit 0 + -- cgit From c43047009b2f10da077965e36d1123ca818154c8 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 7 Sep 2006 20:13:10 +0000 Subject: r18230: Build Samba3 RPC client<->libndr glue code. (This used to be commit c77ddae4f0e30c821f54300f4485ab5d447b49ce) --- source3/script/build_idl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/build_idl.sh') diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh index aeea78be36..2b90d27436 100644 --- a/source3/script/build_idl.sh +++ b/source3/script/build_idl.sh @@ -1,6 +1,6 @@ #!/bin/sh -PIDL_ARGS="--outputdir librpc/gen_ndr --header --ndr-parser --" +PIDL_ARGS="--outputdir librpc/gen_ndr --header --ndr-parser --samba3-ndr-client --" PIDL_EXTRA_ARGS="$*" oldpwd=`pwd` -- cgit From 6ed67b003efb4482d2543314bbc4e9d5e3128d1f Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 7 Sep 2006 20:29:03 +0000 Subject: r18232: - Trim number of regexes applied to generated files - Fix syntax error in shell script (refused by dash) - Regenerate output (This used to be commit 4dba965f9aa30eb2a54dc68e1bd5137ec6f5e6be) --- source3/script/build_idl.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'source3/script/build_idl.sh') diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh index 2b90d27436..00f03359d4 100644 --- a/source3/script/build_idl.sh +++ b/source3/script/build_idl.sh @@ -19,7 +19,7 @@ for f in ${IDL_FILES}; do basename=`basename $f .idl` ndr="librpc/gen_ndr/ndr_$basename.c" - if [ -f $ndr && 0 ]; then + if [ -f $ndr ] && false; then if [ "x`find librpc/idl/$f -newer $ndr -print`" = "xlibrpc/idl/$f" ]; then list="$list librpc/idl/$f" fi @@ -42,10 +42,7 @@ fi ## for f in librpc/gen_ndr/ndr_*.c; do - cat $f | sed -e 's/^static //g' \ - -e 's/^_PUBLIC_ //g' \ - -e 's/#include //g' \ - -e 's/#include //g' > $f.new + cat $f | sed -e 's/^static //g' > $f.new /bin/mv -f $f.new $f done -- cgit From 5c14584d21d786792212bc4eca63605a16f3488d Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 11 Sep 2006 15:55:44 +0000 Subject: r18387: remove echo of pidl command line (was used for debugging) (This used to be commit 848edce91288750881f538e1dd8ed4220047af6f) --- source3/script/build_idl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/build_idl.sh') diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh index 00f03359d4..29c1d5f436 100644 --- a/source3/script/build_idl.sh +++ b/source3/script/build_idl.sh @@ -33,7 +33,7 @@ done ## if [ "x$list" != x ]; then - echo "${PIDL} ${list}" + # echo "${PIDL} ${list}" $PIDL $list || exit 1 fi -- cgit From 48e2a2bfb75cdc914345b498012e82331546f0c0 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 13 Sep 2006 16:28:25 +0000 Subject: r18481: Use pidl-generated server side code for dfs. (This used to be commit 3f337c104d42321595161d0283b39357df252a8e) --- source3/script/build_idl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/build_idl.sh') diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh index 29c1d5f436..627ab8c8be 100644 --- a/source3/script/build_idl.sh +++ b/source3/script/build_idl.sh @@ -1,6 +1,6 @@ #!/bin/sh -PIDL_ARGS="--outputdir librpc/gen_ndr --header --ndr-parser --samba3-ndr-client --" +PIDL_ARGS="--outputdir librpc/gen_ndr --header --ndr-parser --samba3-ndr-server --samba3-ndr-client --" PIDL_EXTRA_ARGS="$*" oldpwd=`pwd` -- cgit From 8dd826f50026f29cf1175ce56111c4832f2d4809 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 18 Sep 2006 19:02:06 +0000 Subject: r18618: * remove svn:externals * 'make idl' now requires pidl in the current PATH * regenerate winreg ndr files (This used to be commit e936d39e00f07d942ce977b9a725ebe7b9e57625) --- source3/script/build_idl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/script/build_idl.sh') diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh index 627ab8c8be..d24f7601df 100644 --- a/source3/script/build_idl.sh +++ b/source3/script/build_idl.sh @@ -8,7 +8,7 @@ cd ${srcdir} [ -d librpc/gen_ndr ] || mkdir -p librpc/gen_ndr || exit 1 -PIDL="$PERL pidl/pidl ${PIDL_ARGS} ${PIDL_EXTRA_ARGS}" +PIDL="pidl ${PIDL_ARGS} ${PIDL_EXTRA_ARGS}" ## ## Find newer files rather than rebuild all of them -- cgit From f779904af5db7b649a756585b5343c5536e57bed Mon Sep 17 00:00:00 2001 From: James Peach Date: Fri, 26 Jan 2007 22:52:55 +0000 Subject: r21034: Don't force user to have pidl in their PATH. (This used to be commit 9e2118969d444d2ffd1e9818cbbb155238fab719) --- source3/script/build_idl.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source3/script/build_idl.sh') diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh index d24f7601df..8ec5f4de24 100644 --- a/source3/script/build_idl.sh +++ b/source3/script/build_idl.sh @@ -8,7 +8,11 @@ cd ${srcdir} [ -d librpc/gen_ndr ] || mkdir -p librpc/gen_ndr || exit 1 -PIDL="pidl ${PIDL_ARGS} ${PIDL_EXTRA_ARGS}" +if [ -z "$PIDL" ] ; then + PIDL=pidl +fi + +PIDL="$PIDL ${PIDL_ARGS} ${PIDL_EXTRA_ARGS}" ## ## Find newer files rather than rebuild all of them -- cgit From 2b5d317af191256abea65328ce8d8a8833dcae69 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 27 Feb 2007 18:52:38 +0000 Subject: r21565: Import ndrdump (doesn't compile yet, needs table support functions). (This used to be commit 9a9b9421673ed1c455658d8ae79d7a1522a1baa7) --- source3/script/build_idl.sh | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/script/build_idl.sh') diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh index 8ec5f4de24..77f37d8e75 100644 --- a/source3/script/build_idl.sh +++ b/source3/script/build_idl.sh @@ -52,6 +52,9 @@ done touch librpc/gen_ndr/ndr_dcerpc.h +echo Generating librpc/gen_ndr/tables.c +./librpc/tables.pl --output=librpc/gen_ndr/tables.c librpc/gen_ndr/*.h > librpc/gen_ndr/tables.c + cd ${oldpwd} exit 0 -- cgit From e273187811f4745fa67181e01de042d3a6a2df10 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 21 Aug 2007 19:23:05 +0000 Subject: r24605: remove some stuff samba3 doesn't need any more metze (This used to be commit 5514e8487fee453b730a966ebc6fcdcd56da047a) --- source3/script/build_idl.sh | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'source3/script/build_idl.sh') diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh index 77f37d8e75..7aaddc70c7 100644 --- a/source3/script/build_idl.sh +++ b/source3/script/build_idl.sh @@ -41,20 +41,6 @@ if [ "x$list" != x ]; then $PIDL $list || exit 1 fi -## -## Do miscellaneous cleanup -## - -for f in librpc/gen_ndr/ndr_*.c; do - cat $f | sed -e 's/^static //g' > $f.new - /bin/mv -f $f.new $f -done - -touch librpc/gen_ndr/ndr_dcerpc.h - -echo Generating librpc/gen_ndr/tables.c -./librpc/tables.pl --output=librpc/gen_ndr/tables.c librpc/gen_ndr/*.h > librpc/gen_ndr/tables.c - cd ${oldpwd} exit 0 -- cgit From e5a951325a6cac8567af3a66de6d2df577508ae4 Mon Sep 17 00:00:00 2001 From: "Gerald (Jerry) Carter" Date: Wed, 10 Oct 2007 15:34:30 -0500 Subject: [GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch. (This used to be commit 5c6c8e1fe93f340005110a7833946191659d88ab) --- source3/script/build_idl.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 source3/script/build_idl.sh (limited to 'source3/script/build_idl.sh') diff --git a/source3/script/build_idl.sh b/source3/script/build_idl.sh old mode 100644 new mode 100755 -- cgit