summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-07-09 12:58:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:19:27 -0500
commitc222331d6d3785075bb0c961315aae9380101e47 (patch)
tree8c8d480b93c910cea56d4be3537652604d1a9e22
parentb4e53e6705064d889b343d90b0013e844cdb76f5 (diff)
downloadsamba-c222331d6d3785075bb0c961315aae9380101e47.tar.gz
samba-c222331d6d3785075bb0c961315aae9380101e47.tar.bz2
samba-c222331d6d3785075bb0c961315aae9380101e47.zip
r8263: Some small pidl fixes, start working towards supporting installation of pidl.
(This used to be commit c785677a14c958a518d5a9755d2b94e81b34bdb3)
-rw-r--r--source4/build/pidl/README4
-rw-r--r--source4/build/pidl/ejs.pm4
-rwxr-xr-xsource4/build/pidl/pidl (renamed from source4/build/pidl/pidl.pl)2
-rwxr-xr-xsource4/script/build_idl.sh2
4 files changed, 7 insertions, 5 deletions
diff --git a/source4/build/pidl/README b/source4/build/pidl/README
index 1214288724..62498a40c7 100644
--- a/source4/build/pidl/README
+++ b/source4/build/pidl/README
@@ -1,7 +1,7 @@
This directory contains the source code of the pidl (Perl IDL)
compiler.
-pidl.pl is the main file of pidl.
+pidl is the main file of pidl.
Pidl works by building a parse tree from a .pidl file (a simple
dump of it's internal parse tree) or a .idl file
@@ -27,6 +27,8 @@ ndr_header.pm - Generates a header file with structures
ndr_parser.pm - Generates pull/push functions for parsing NDR
server.pm - Generates server side implementation in C
template.pm - Generates stubs in C for server implementation
+ejs.pm - Generates bindings for Embedded JavaScript (EJS)
+ejs_header.pm - Generates headers for the EJS bindings
-- COM / DCOM --
odl.pm - Generates IDL structures from ODL structures for use in
diff --git a/source4/build/pidl/ejs.pm b/source4/build/pidl/ejs.pm
index 8420f8fa87..d86f73b5be 100644
--- a/source4/build/pidl/ejs.pm
+++ b/source4/build/pidl/ejs.pm
@@ -159,7 +159,7 @@ sub EjsPullString($$$$$)
###########################
-# pull an arrar element
+# pull an array element
sub EjsPullArray($$$$$)
{
my ($e, $l, $var, $name, $env) = @_;
@@ -410,7 +410,7 @@ sub EjsPushSwitch($$$$$)
###########################
-# push an arrar element
+# push an array element
sub EjsPushArray($$$$$)
{
my ($e, $l, $var, $name, $env) = @_;
diff --git a/source4/build/pidl/pidl.pl b/source4/build/pidl/pidl
index 9f37f7e795..5e2b11e91a 100755
--- a/source4/build/pidl/pidl.pl
+++ b/source4/build/pidl/pidl
@@ -66,7 +66,7 @@ sub ShowHelp()
print "perl IDL parser and code generator
Copyright (C) tridge\@samba.org
-Usage: pidl.pl [options] <idlfile>
+Usage: pidl [options] <idlfile>
Options:
--help this help page
diff --git a/source4/script/build_idl.sh b/source4/script/build_idl.sh
index 4aea2b9e3f..9ca20b4072 100755
--- a/source4/script/build_idl.sh
+++ b/source4/script/build_idl.sh
@@ -6,7 +6,7 @@ PIDL_EXTRA_ARGS="$*"
[ -d librpc/gen_ndr ] || mkdir -p librpc/gen_ndr || exit 1
-PIDL="$PERL ./build/pidl/pidl.pl --output librpc/gen_ndr/ndr_ --parse --header --parser --server --client --dcom-proxy --com-header --swig --odl --ejs -- $PIDL_EXTRA_ARGS"
+PIDL="$PERL ./build/pidl/pidl --output librpc/gen_ndr/ndr_ --parse --header --parser --server --client --dcom-proxy --com-header --swig --odl --ejs -- $PIDL_EXTRA_ARGS"
if [ x$FULLBUILD = xFULL ]; then
echo Rebuilding all idl files in librpc/idl