svn commit: samba r18229 - in branches/SAMBA_3_0/source:
librpc/gen_ndr script
jerry at samba.org
jerry at samba.org
Thu Sep 7 20:09:15 GMT 2006
Author: jerry
Date: 2006-09-07 20:09:15 +0000 (Thu, 07 Sep 2006)
New Revision: 18229
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18229
Log:
regenerated unixinfo files and add a few header stubs. Almost autogenerated now
Added:
branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_misc.h
branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_security.h
branches/SAMBA_3_0/source/librpc/gen_ndr/security.h
Modified:
branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.c
branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.h
branches/SAMBA_3_0/source/librpc/gen_ndr/unixinfo.h
branches/SAMBA_3_0/source/script/build_idl.sh
Changeset:
Added: branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_misc.h
===================================================================
--- branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_misc.h 2006-09-07 20:01:17 UTC (rev 18228)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_misc.h 2006-09-07 20:09:15 UTC (rev 18229)
@@ -0,0 +1 @@
+#include "ndr/ndr_misc.h"
Added: branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_security.h
===================================================================
Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.c
===================================================================
--- branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.c 2006-09-07 20:01:17 UTC (rev 18228)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.c 2006-09-07 20:09:15 UTC (rev 18229)
@@ -6,15 +6,16 @@
#include <stdlib.h>
#include <stdio.h>
+
#include <stdarg.h>
#include <string.h>
#include <core/nterr.h>
-#include <ndr/ndr_misc.h>
-#include <ndr/ndr_dcerpc.h>
-#include "gen_ndr/ndr_unixinfo.h"
+#include <gen_ndr/ndr_misc.h>
+#include <gen_ndr/ndr_dcerpc.h>
+#include "librpc/gen_ndr/ndr_unixinfo.h"
#include <dcerpc.h>
-#include <ndr/ndr_security.h>
+#include <gen_ndr/ndr_security.h>
NTSTATUS ndr_push_unixinfo_GetPWUidInfo(struct ndr_push *ndr, int ndr_flags, const struct unixinfo_GetPWUidInfo *r)
{
if (ndr_flags & NDR_SCALARS) {
@@ -514,4 +515,3 @@
ndr->depth--;
}
-
Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.h
===================================================================
--- branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.h 2006-09-07 20:01:17 UTC (rev 18228)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/ndr_unixinfo.h 2006-09-07 20:09:15 UTC (rev 18229)
@@ -1,6 +1,6 @@
/* header auto-generated by pidl */
-#include "gen_ndr/unixinfo.h"
+#include "librpc/gen_ndr/unixinfo.h"
#ifndef _HEADER_NDR_unixinfo
#define _HEADER_NDR_unixinfo
Added: branches/SAMBA_3_0/source/librpc/gen_ndr/security.h
===================================================================
--- branches/SAMBA_3_0/source/librpc/gen_ndr/security.h 2006-09-07 20:01:17 UTC (rev 18228)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/security.h 2006-09-07 20:09:15 UTC (rev 18229)
@@ -0,0 +1 @@
+#include "ndr/security.h"
Modified: branches/SAMBA_3_0/source/librpc/gen_ndr/unixinfo.h
===================================================================
--- branches/SAMBA_3_0/source/librpc/gen_ndr/unixinfo.h 2006-09-07 20:01:17 UTC (rev 18228)
+++ branches/SAMBA_3_0/source/librpc/gen_ndr/unixinfo.h 2006-09-07 20:09:15 UTC (rev 18229)
@@ -5,7 +5,7 @@
#ifndef _HEADER_unixinfo
#define _HEADER_unixinfo
-#include "librpc/ndr/security.h"
+#include "librpc/gen_ndr/security.h"
struct unixinfo_GetPWUidInfo {
NTSTATUS status;/* [keepref] */
const char *homedir;/* [unique,keepref,charset(UTF8)] */
Modified: branches/SAMBA_3_0/source/script/build_idl.sh
===================================================================
--- branches/SAMBA_3_0/source/script/build_idl.sh 2006-09-07 20:01:17 UTC (rev 18228)
+++ branches/SAMBA_3_0/source/script/build_idl.sh 2006-09-07 20:09:15 UTC (rev 18229)
@@ -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 @@
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 @@
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 <stdint.h>//g' \
+ -e 's/#include <stdbool.h>//g' > $f.new
/bin/mv -f $f.new $f
done
@@ -38,3 +54,4 @@
cd ${oldpwd}
exit 0
+
More information about the samba-cvs
mailing list