r9460: - Move pidl to lib/. This fixes standalone installation of pidl.

- Update the README
- Allow building the docs stand-alone
(This used to be commit b56084ce251ab7a35dd1422f38de258e8e1e1477)

diff --git a/source4/pidl/Makefile.PL b/source4/pidl/Makefile.PL
index ae862bfdb59aa6a825eea7a719ff494cfbddcf2e..efa94dc06897eb456420849e7aab3664348f60e4 100755 (executable)
--- a/source4/pidl/Makefile.PL
+++ b/source4/pidl/Makefile.PL
@@ -1,10 +1,9 @@
 use ExtUtils::MakeMaker;
 WriteMakefile(
     'NAME'     => 'Parse::Pidl',
-    'VERSION_FROM' => 'Parse/Pidl.pm',
+    'VERSION_FROM' => 'lib/Parse/Pidl.pm',
        'EXE_FILES' => [ 'pidl' ],
-       'PMLIBDIRS' => [ 'Parse' ],
-       'C' => [],
+       'PMLIBDIRS' => [ 'lib' ],
        'test' => { 'TESTS' => 'tests/*.pl' }
 );
 
@@ -12,5 +11,15 @@ sub MY::postamble {
 <<'EOT';
 Parse/Pidl/IDL.pm :: idl.yp
        yapp -s -m 'Parse::Pidl::IDL' -o 'Parse/Pidl/IDL.pm' idl.yp
+
+doc: pidl.1 pidl.1.html
+
+XSLTPROC=xsltproc
+
+%.1: %.1.xml
+       test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+%.html: %.xml
+       test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
 EOT
 }

diff --git a/source4/pidl/README b/source4/pidl/README
index e6768b69407529656383e7f695ce5158d5606418..8c709e5ecd5fe53cf67ebfd550cd97236a860231 100644 (file)
--- a/source4/pidl/README
+++ b/source4/pidl/README
@@ -1,3 +1,5 @@
+Introduction:
+=============
 This directory contains the source code of the pidl (Perl IDL) 
 compiler. 
 
@@ -13,11 +15,26 @@ After a parse tree is present, pidl will call one of it's backends
 (which one depends on the options given on the command-line). Here is 
 a list of current backends:
 
+Standalone installation:
+========================
+Run Makefile.PL to generate the Makefile. 
+
+Then run "make install" (as root) to install.
+
+Documentation:
+==============
+Run 'make doc' to generate the manpage and a HTML version of the manpage.
+This requires the xsltproc utility to be installed.
+
+Internals overview:
+===================
+
 -- Generic --
 Parse::Pidl::Dump - Converts the parse tree back to an IDL file
 Parse::Pidl::Samba::Header - Generates header file with data structures defined in IDL file
 Parse::Pidl::NDR - Generates intermediate datastructures for use by NDR parses/generators
 Parse::Pidl::ODL - Generates IDL structures from ODL structures for use in the NDR parser generator
+Parse::Pidl::Test - Utility functions for use in pidl's testsuite
 
 -- Samba NDR --
 Parse::Pidl::Samba::NDR::Client - Generates client call functions in C using the NDR parser
@@ -25,6 +42,7 @@ Parse::Pidl::Samba::SWIG - Generates SWIG interface files (.i)
 Parse::Pidl::Samba::NDR::Header - Generates a header file with NDR-parser specific data
 Parse::Pidl::Samba::NDR::Parser - Generates pull/push functions for parsing NDR
 Parse::Pidl::Samba::NDR::Server - Generates server side implementation in C
+Parse::Pidl::Samba::TDR - Parser generator for the "Trivial Data Representation"
 Parse::Pidl::Samba::Template - Generates stubs in C for server implementation
 Parse::Pidl::Samba::EJS - Generates bindings for Embedded JavaScript (EJS)
 Parse::Pidl::Samba::EJSHeader - Generates headers for the EJS bindings

diff --git a/source4/pidl/Parse/Pidl.pm b/source4/pidl/lib/Parse/Pidl.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl.pm
rename to source4/pidl/lib/Parse/Pidl.pm

diff --git a/source4/pidl/Parse/Pidl/Compat.pm b/source4/pidl/lib/Parse/Pidl/Compat.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Compat.pm
rename to source4/pidl/lib/Parse/Pidl/Compat.pm

diff --git a/source4/pidl/Parse/Pidl/Dump.pm b/source4/pidl/lib/Parse/Pidl/Dump.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Dump.pm
rename to source4/pidl/lib/Parse/Pidl/Dump.pm

diff --git a/source4/pidl/Parse/Pidl/Ethereal/Conformance.pm b/source4/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Ethereal/Conformance.pm
rename to source4/pidl/lib/Parse/Pidl/Ethereal/Conformance.pm

diff --git a/source4/pidl/Parse/Pidl/Ethereal/NDR.pm b/source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Ethereal/NDR.pm
rename to source4/pidl/lib/Parse/Pidl/Ethereal/NDR.pm

diff --git a/source4/pidl/Parse/Pidl/IDL.pm b/source4/pidl/lib/Parse/Pidl/IDL.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/IDL.pm
rename to source4/pidl/lib/Parse/Pidl/IDL.pm

diff --git a/source4/pidl/Parse/Pidl/NDR.pm b/source4/pidl/lib/Parse/Pidl/NDR.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/NDR.pm
rename to source4/pidl/lib/Parse/Pidl/NDR.pm

diff --git a/source4/pidl/Parse/Pidl/ODL.pm b/source4/pidl/lib/Parse/Pidl/ODL.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/ODL.pm
rename to source4/pidl/lib/Parse/Pidl/ODL.pm

diff --git a/source4/pidl/Parse/Pidl/Samba/COM/Header.pm b/source4/pidl/lib/Parse/Pidl/Samba/COM/Header.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Samba/COM/Header.pm
rename to source4/pidl/lib/Parse/Pidl/Samba/COM/Header.pm

diff --git a/source4/pidl/Parse/Pidl/Samba/COM/Proxy.pm b/source4/pidl/lib/Parse/Pidl/Samba/COM/Proxy.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Samba/COM/Proxy.pm
rename to source4/pidl/lib/Parse/Pidl/Samba/COM/Proxy.pm

diff --git a/source4/pidl/Parse/Pidl/Samba/COM/Stub.pm b/source4/pidl/lib/Parse/Pidl/Samba/COM/Stub.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Samba/COM/Stub.pm
rename to source4/pidl/lib/Parse/Pidl/Samba/COM/Stub.pm

diff --git a/source4/pidl/Parse/Pidl/Samba/EJS.pm b/source4/pidl/lib/Parse/Pidl/Samba/EJS.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Samba/EJS.pm
rename to source4/pidl/lib/Parse/Pidl/Samba/EJS.pm

diff --git a/source4/pidl/Parse/Pidl/Samba/EJSHeader.pm b/source4/pidl/lib/Parse/Pidl/Samba/EJSHeader.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Samba/EJSHeader.pm
rename to source4/pidl/lib/Parse/Pidl/Samba/EJSHeader.pm

diff --git a/source4/pidl/Parse/Pidl/Samba/Header.pm b/source4/pidl/lib/Parse/Pidl/Samba/Header.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Samba/Header.pm
rename to source4/pidl/lib/Parse/Pidl/Samba/Header.pm

diff --git a/source4/pidl/Parse/Pidl/Samba/NDR/Client.pm b/source4/pidl/lib/Parse/Pidl/Samba/NDR/Client.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Samba/NDR/Client.pm
rename to source4/pidl/lib/Parse/Pidl/Samba/NDR/Client.pm

diff --git a/source4/pidl/Parse/Pidl/Samba/NDR/Header.pm b/source4/pidl/lib/Parse/Pidl/Samba/NDR/Header.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Samba/NDR/Header.pm
rename to source4/pidl/lib/Parse/Pidl/Samba/NDR/Header.pm

diff --git a/source4/pidl/Parse/Pidl/Samba/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Samba/NDR/Parser.pm
rename to source4/pidl/lib/Parse/Pidl/Samba/NDR/Parser.pm

diff --git a/source4/pidl/Parse/Pidl/Samba/NDR/Server.pm b/source4/pidl/lib/Parse/Pidl/Samba/NDR/Server.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Samba/NDR/Server.pm
rename to source4/pidl/lib/Parse/Pidl/Samba/NDR/Server.pm

diff --git a/source4/pidl/Parse/Pidl/Samba/SWIG.pm b/source4/pidl/lib/Parse/Pidl/Samba/SWIG.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Samba/SWIG.pm
rename to source4/pidl/lib/Parse/Pidl/Samba/SWIG.pm

diff --git a/source4/pidl/Parse/Pidl/Samba/TDR.pm b/source4/pidl/lib/Parse/Pidl/Samba/TDR.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Samba/TDR.pm
rename to source4/pidl/lib/Parse/Pidl/Samba/TDR.pm

diff --git a/source4/pidl/Parse/Pidl/Samba/Template.pm b/source4/pidl/lib/Parse/Pidl/Samba/Template.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Samba/Template.pm
rename to source4/pidl/lib/Parse/Pidl/Samba/Template.pm

diff --git a/source4/pidl/Parse/Pidl/Test.pm b/source4/pidl/lib/Parse/Pidl/Test.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Test.pm
rename to source4/pidl/lib/Parse/Pidl/Test.pm

diff --git a/source4/pidl/Parse/Pidl/Typelist.pm b/source4/pidl/lib/Parse/Pidl/Typelist.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Typelist.pm
rename to source4/pidl/lib/Parse/Pidl/Typelist.pm

diff --git a/source4/pidl/Parse/Pidl/Util.pm b/source4/pidl/lib/Parse/Pidl/Util.pm
similarity index 100%
rename from source4/pidl/Parse/Pidl/Util.pm
rename to source4/pidl/lib/Parse/Pidl/Util.pm

diff --git a/source4/pidl/pidl b/source4/pidl/pidl
index ead70b1fad52f58d1e1b02a223cd87a430ac7b90..9daf60eff47977547246ea6fc472476065aa4c90 100755 (executable)
--- a/source4/pidl/pidl
+++ b/source4/pidl/pidl
@@ -9,6 +9,7 @@
 
 use strict;
 
+use lib "lib";
 use Getopt::Long;
 use File::Basename;
 use Parse::Pidl;

diff --git a/source4/script/build_idl.sh b/source4/script/build_idl.sh
index 13d1178c4ad4837ec95cd1a758d0f7b190e98713..a9bc752857e981f39b532a4773857168c2d5374c 100755 (executable)
--- 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 -Ipidl ./pidl/pidl --outputdir librpc/gen_ndr --parse --ndr-header --header --ndr-parser --server --client --dcom-proxy --com-header --swig --odl --ejs $PIDL_EXTRA_ARGS"
+PIDL="$PERL ./pidl/pidl --outputdir librpc/gen_ndr --parse --ndr-header --header --ndr-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