[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Tue Apr 23 02:10:03 UTC 2019
The branch, master has been updated
via e24e344d0da waf: install: Remove installation of PIDL and manpages.
via c36d743fe31 selftest: Move simple-dc-steps.sh to correct folder
from 1c3731ccefb vfs_gpfs: Block punchhole calls for non-sparse files
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e24e344d0da58013fd5fa404529fe1d25ef403bf
Author: Lutz Justen <ljusten at google.com>
Date: Fri Apr 19 11:17:58 2019 -0700
waf: install: Remove installation of PIDL and manpages.
It's not used outside of Samba other than wireshark
who have their own vendor fork.
Signed-off-by: Lutz Justen <ljusten at google.com>
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Tue Apr 23 02:08:56 UTC 2019 on sn-devel-144
commit c36d743fe31361e17d73d01c1fbccf7d559c65c5
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat Apr 20 10:08:10 2019 +1200
selftest: Move simple-dc-steps.sh to correct folder
This script helps re-create the environment for the dbcheck-oldrelease.sh links test.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
pidl/lib/wscript_build | 37 ---------------------
pidl/wscript | 38 ----------------------
.../release-4-5-0-pre1/simple-dc-steps.sh | 0
3 files changed, 75 deletions(-)
delete mode 100644 pidl/lib/wscript_build
rename simple-dc-steps.sh => source4/selftest/provisions/release-4-5-0-pre1/simple-dc-steps.sh (100%)
Changeset truncated at 500 lines:
diff --git a/pidl/lib/wscript_build b/pidl/lib/wscript_build
deleted file mode 100644
index 54b3170c4e2..00000000000
--- a/pidl/lib/wscript_build
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env python
-
-# install the pidl modules
-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)
diff --git a/pidl/wscript b/pidl/wscript
index a2a15d36851..01b71bd8b27 100644
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -32,49 +32,11 @@ def configure(conf):
# Check if perl(Parse::Yapp::Driver) is available.
check_system_perl_module(conf, "Parse::Yapp::Driver", 1.05)
- # 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')
- conf.env.PERLMAN3EXT = conf.CHECK_PERL_MANPAGE(section='3')
- conf.DEFINE('HAVE_PERL_MAKEMAKER', 1)
-
# yapp is used for building the parser
conf.find_program('yapp', var='YAPP')
conf.find_program('pod2man', var='POD2MAN')
def build(bld):
- bld.INSTALL_FILES('${BINDIR}', 'pidl', chmod=MODE_755, perl_fixup=True)
-
- bld.RECURSE('lib')
-
- if not bld.CONFIG_SET('HAVE_PERL_MAKEMAKER'):
- return
-
- pidl_manpages = {
- 'pidl': 'man1/pidl.${PERLMAN1EXT}',
- 'lib/Parse/Pidl/NDR.pm': 'man3/Parse::Pidl::NDR.${PERLMAN3EXT}',
- 'lib/Parse/Pidl/Wireshark/Conformance.pm': 'man3/Parse::Pidl::Wireshark::Conformance.${PERLMAN3EXT}',
- 'lib/Parse/Pidl/Dump.pm': 'man3/Parse::Pidl::Dump.${PERLMAN3EXT}',
- 'lib/Parse/Pidl/Util.pm': 'man3/Parse::Pidl::Util.${PERLMAN3EXT}',
- 'lib/Parse/Pidl/Wireshark/NDR.pm': 'man3/Parse::Pidl::Wireshark::NDR.${PERLMAN3EXT}'
- }
-
- for k in pidl_manpages.keys():
- pidl_manpages[k] = bld.EXPAND_VARIABLES(pidl_manpages[k])
-
- # use perl to build the manpages
- bld.env.pidl_srcdir = os.path.join(bld.srcnode.abspath(), 'pidl')
-
- bld.SET_BUILD_GROUP('final')
- if 'POD2MAN' in bld.env and bld.env['POD2MAN'] != '':
- for src in pidl_manpages.keys():
- manpage = pidl_manpages[src]
- section = manpage.rsplit( ".", 1)[1]
- bld(rule='${POD2MAN} -c "Samba Documentation" -s %s ${SRC} ${TGT}' % section,
- shell=True,
- source=src,
- install_path=os.path.dirname(bld.EXPAND_VARIABLES('${MANDIR}/'+manpage)),
- target=os.path.basename(manpage))
# we want to prefer the git version of the parsers if we can.
# Only if the source has changed do we want to re-run yapp
diff --git a/simple-dc-steps.sh b/source4/selftest/provisions/release-4-5-0-pre1/simple-dc-steps.sh
similarity index 100%
rename from simple-dc-steps.sh
rename to source4/selftest/provisions/release-4-5-0-pre1/simple-dc-steps.sh
--
Samba Shared Repository
More information about the samba-cvs
mailing list