Attachment 9730 Details for Bug 10472 – v4-0-test and v4-1-test patch

[patch] v4-0-test and v4-1-test patch

look (text/plain), 5.11 KB, created by Andreas Schneider on 2014-02-27 11:29:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2014-02-27 11:29:54 UTC

Size: 5.11 KB

patch

obsolete

>From 1124387625c3e24a4e8a100d2db83dec502bfa13 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 25 Feb 2014 16:04:24 +0100
>Subject: [PATCH 1/2] 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 <asn@samba.org>
>Reviewed-by: Kai Blin <kai@samba.org>
>(cherry picked from commit cee11cfa4544425099268cd32393169afb4bb107)
>---
> pidl/lib/wscript_build | 31 ++++++++++++++++++++++++++++++-
> pidl/wscript           |  3 ---
> 2 files changed, 30 insertions(+), 4 deletions(-)
>
>diff --git a/pidl/lib/wscript_build b/pidl/lib/wscript_build
>index eb5f1e0..9bddf3f 100644
>--- a/pidl/lib/wscript_build
>+++ b/pidl/lib/wscript_build
>@@ -1,4 +1,33 @@
> #!/usr/bin/env python
> 
> # install the pidl modules
>-bld.INSTALL_WILDCARD('${DATAROOTDIR}/perl5', '**/*.pm', flat=False)
>+bld.INSTALL_FILES('${DATAROOTDIR}/perl5',
>+                  '''
>+                  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
>+                  Parse/Yapp/Driver.pm
>+                  ''',
>+                  flat=False)
>diff --git a/pidl/wscript b/pidl/wscript
>index 7a25734..05d9982 100644
>--- a/pidl/wscript
>+++ b/pidl/wscript
>@@ -26,9 +26,6 @@ def build(bld):
>     if not bld.CONFIG_SET('HAVE_PERL_MAKEMAKER'):
>         return
> 
>-    pidl_src = ['pidl']
>-    pidl_src.extend(bld.path.ant_glob('lib/**/*.pm').split())
>-
>     pidl_manpages = {
>         'pidl': 'man1/pidl.${PERLMAN1EXT}',
>         'lib/Parse/Pidl/NDR.pm': 'man3/Parse::Pidl::NDR.${PERLMAN3EXT}',
>-- 
>1.8.5.2
>
>
>From b929788024a2d051f0ef5d94b566346147151062 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 25 Feb 2014 17:16:37 +0100
>Subject: [PATCH 2/2] waf: Add option to specify perl vendor dir.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=10472
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>Reviewed-by: Kai Blin <kai@samba.org>
>
>Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
>Autobuild-Date(master): Thu Feb 27 11:48:54 CET 2014 on sn-devel-104
>
>(cherry picked from commit 9b200555fec2e33da9521db388d1839375aa8d83)
>---
> buildtools/wafadmin/Tools/perl.py | 7 +++++++
> pidl/lib/wscript_build            | 2 +-
> pidl/wscript                      | 2 ++
> 3 files changed, 10 insertions(+), 1 deletion(-)
>
>diff --git a/buildtools/wafadmin/Tools/perl.py b/buildtools/wafadmin/Tools/perl.py
>index a6787a8..90be8d8 100644
>--- a/buildtools/wafadmin/Tools/perl.py
>+++ b/buildtools/wafadmin/Tools/perl.py
>@@ -103,7 +103,14 @@ def check_perl_ext_devel(conf):
> 	else:
> 		conf.env.ARCHDIR_PERL = read_out('print $Config{sitearch}')[0]
> 
>+	conf.env.VENDORDIR_PERL = Options.options.perlvendordir
>+
> def set_options(opt):
> 	opt.add_option("--with-perl-binary", type="string", dest="perlbinary", help = 'Specify alternate perl binary', default=None)
> 	opt.add_option("--with-perl-archdir", type="string", dest="perlarchdir", help = 'Specify directory where to install arch specific files', default=None)
> 
>+	opt.add_option("--with-perl-vendordir",
>+		       type="string",
>+		       dest="perlvendordir",
>+		       help="Specify directory where to install perl vendor files",
>+		       default='${DATAROOTDIR}/perl5/vendor_perl')
>diff --git a/pidl/lib/wscript_build b/pidl/lib/wscript_build
>index 9bddf3f..29632d4 100644
>--- a/pidl/lib/wscript_build
>+++ b/pidl/lib/wscript_build
>@@ -1,7 +1,7 @@
> #!/usr/bin/env python
> 
> # install the pidl modules
>-bld.INSTALL_FILES('${DATAROOTDIR}/perl5',
>+bld.INSTALL_FILES(bld.env.VENDORDIR_PERL,
>                   '''
>                   Parse/Pidl.pm
>                   Parse/Pidl/Samba4.pm
>diff --git a/pidl/wscript b/pidl/wscript
>index 05d9982..77abb01 100644
>--- a/pidl/wscript
>+++ b/pidl/wscript
>@@ -8,6 +8,8 @@ def set_options(opt):
> 
> def configure(conf):
>     conf.check_tool('perl')
>+    conf.check_perl_ext_devel()
>+
>     # we need a recent version of MakeMaker to get the right man page names
>     if conf.CHECK_PERL_MANPAGE():
>         conf.env.PERLMAN1EXT = conf.CHECK_PERL_MANPAGE(section='1')
>-- 
>1.8.5.2
>

Actions: View

Attachments on bug 10472: 9730 | 9731 | 9753 | 9754 | 9933 | 9934 | 10423 | 10427 | 10428