From 44551d39b8e3df9b5d40df8cc5e0c93cc397f399 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Fri, 26 Sep 2014 12:21:19 -0700 Subject: Update to latest version from Samba Git repository. Changes from Samba Git log: commit cf75ef9f73f2cdbf2a039bbc9468f5da6a14834e Author: Stefan Metzmacher Date: Fri May 9 11:49:10 2014 +0200 pidl/lib/wscript_build: make use of PERL_LIB_INSTALL_DIR Bug: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Sat May 10 01:37:33 CEST 2014 on sn-devel-104 commit ee8f98f26a3d6f02a0d10ceeac1194675d505246 Author: Andreas Schneider Date: Fri Feb 28 16:00:54 2014 +0100 pidl-waf: Only install Yapp::Driver if it is not available. Signed-off-by: Andreas Schneider Reviewed-by: Stefan Metzmacher Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Thu Mar 6 23:30:47 CET 2014 on sn-devel-104 commit b7b0ca1ba9067362bb8a4b901f3a7f2f3bcbd6a1 Author: Andreas Schneider Date: Fri Feb 28 15:55:46 2014 +0100 pidl-waf: Do not glob to install pidl modules. Signed-off-by: Andreas Schneider Reviewed-by: Stefan Metzmacher commit 17244ef750f699b30ff7ff3a71264f4c76adad6d Author: Andreas Schneider Date: Fri Feb 28 15:53:10 2014 +0100 pidl-waf: Install pidl modules to the perl vendorlib directory. Signed-off-by: Andreas Schneider Reviewed-by: Stefan Metzmacher commit 87976b4e45bd71b086e9201f0d0a563b9071ca4a Author: Andreas Schneider Date: Fri Feb 28 15:46:01 2014 +0100 Revert "pidl: Install pidl files corrently." This reverts commit cee11cfa4544425099268cd32393169afb4bb107. Reviewed-by: Andreas Schneider Reviewed-by: Stefan Metzmacher commit c2d58c3c2059ef3d43f876df547cbc7256235563 Author: Andreas Schneider Date: Fri Feb 28 15:45:51 2014 +0100 Revert "waf: Add option to specify perl vendor dir." This reverts commit 9b200555fec2e33da9521db388d1839375aa8d83. Reviewed-by: Andreas Schneider Reviewed-by: Stefan Metzmacher commit c46aaf1102da5e8ba53e9f89f2f756fe8dce83c5 Author: Andreas Schneider Date: Fri Feb 28 15:45:35 2014 +0100 Revert "pidl: Make perl(Parse:Yapp:Driver) installation optional." This reverts commit f0030c619bcf22dbe9eed54b2c0dc9c61f564838. Reviewed-by: Andreas Schneider Reviewed-by: Stefan Metzmacher commit f0030c619bcf22dbe9eed54b2c0dc9c61f564838 Author: Andreas Schneider Date: Thu Feb 27 13:14:56 2014 +0100 pidl: Make perl(Parse:Yapp:Driver) installation optional. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Andreas Schneider Reviewed-by: Jelmer Vernooij Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Thu Feb 27 18:47:03 CET 2014 on sn-devel-104 commit 9b200555fec2e33da9521db388d1839375aa8d83 Author: Andreas Schneider Date: Tue Feb 25 17:16:37 2014 +0100 waf: Add option to specify perl vendor dir. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Andreas Schneider Reviewed-by: Kai Blin Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Thu Feb 27 11:48:54 CET 2014 on sn-devel-104 commit cee11cfa4544425099268cd32393169afb4bb107 Author: Andreas Schneider Date: Tue Feb 25 16:04:24 2014 +0100 pidl: Install pidl files corrently. Globbing is a really bad idea in installtion system. One of them is if you use patch -b to create a backup, you will end up installing the backup file too! BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472 Signed-off-by: Andreas Schneider Reviewed-by: Kai Blin Change-Id: I4372f2c0854743a0339c7d85ace9e67ce9f8bd02 Reviewed-on: https://code.wireshark.org/review/4316 Reviewed-by: Guy Harris --- tools/pidl/lib/wscript_build | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/pidl/lib/wscript_build b/tools/pidl/lib/wscript_build index eb5f1e0c37..54b3170c4e 100755 --- a/tools/pidl/lib/wscript_build +++ b/tools/pidl/lib/wscript_build @@ -1,4 +1,37 @@ #!/usr/bin/env python # install the pidl modules -bld.INSTALL_WILDCARD('${DATAROOTDIR}/perl5', '**/*.pm', flat=False) +bld.INSTALL_FILES(bld.env.PERL_LIB_INSTALL_DIR, + ''' + Parse/Pidl.pm + Parse/Pidl/Samba4.pm + Parse/Pidl/CUtil.pm + Parse/Pidl/Expr.pm + Parse/Pidl/Wireshark/Conformance.pm + Parse/Pidl/Wireshark/NDR.pm + Parse/Pidl/ODL.pm + Parse/Pidl/Dump.pm + Parse/Pidl/Util.pm + Parse/Pidl/Samba4/Header.pm + Parse/Pidl/Samba4/COM/Header.pm + Parse/Pidl/Samba4/COM/Proxy.pm + Parse/Pidl/Samba4/COM/Stub.pm + Parse/Pidl/Samba4/TDR.pm + Parse/Pidl/Samba4/NDR/Server.pm + Parse/Pidl/Samba4/NDR/Client.pm + Parse/Pidl/Samba4/NDR/Parser.pm + Parse/Pidl/Samba4/Python.pm + Parse/Pidl/Samba4/Template.pm + Parse/Pidl/IDL.pm + Parse/Pidl/Typelist.pm + Parse/Pidl/Samba3/ClientNDR.pm + Parse/Pidl/Samba3/ServerNDR.pm + Parse/Pidl/Compat.pm + Parse/Pidl/NDR.pm + ''', + flat=False) + +if not bld.CONFIG_SET('USING_SYSTEM_PARSE_YAPP_DRIVER'): + bld.INSTALL_FILES(bld.env.PERL_LIB_INSTALL_DIR, + 'Parse/Yapp/Driver.pm', + flat=False) -- cgit v1.2.1