[PATCH] build: Get rid of hardcoded 'bin/default' in includes and docs building

[Alexander Bokovoy]

On ke, 06 helmi 2019, Karaliou, Aliaksei via samba-technical wrote:
> Hi,
> 
> Please, review and accept these two patches that removes a few left 'bin/default' hardcoded paths.
RB+. Need another reviewer.


> 
> Best regards,
>   Aliaksei

> From c63a5b61671e236c326ee2ac7e507662bdc581ec Mon Sep 17 00:00:00 2001
> From: Aliaksei Karaliou <akaraliou at panasas.com>
> Date: Mon, 28 Jan 2019 05:51:49 -0500
> Subject: [PATCH 1/2] build: Get rid of hardcoded 'bin/default' in includes
> 
> Removed occurrences of bin/default used in #include directive for
> auto-generated headers residing in build directory.
> Build system is capable of resolving path to such headers by itself
> without extra hardcoded path to build directory.
> 
> Signed-off-by: Aliaksei Karaliou <akaraliou at panasas.com>
> ---
>  librpc/ndr/ndr_negoex.h                          | 2 +-
>  source3/rpc_server/spoolss/srv_iremotewinspool.c | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/librpc/ndr/ndr_negoex.h b/librpc/ndr/ndr_negoex.h
> index 1be07d8..d3c39b2 100644
> --- a/librpc/ndr/ndr_negoex.h
> +++ b/librpc/ndr/ndr_negoex.h
> @@ -20,7 +20,7 @@
>  */
>  
>  #include "librpc/ndr/libndr.h"
> -#include "bin/default/librpc/gen_ndr/negoex.h"
> +#include "librpc/gen_ndr/negoex.h"
>  
>  _PUBLIC_ void ndr_print_negoex_BYTE_VECTOR(struct ndr_print *ndr, const char *name, const struct negoex_BYTE_VECTOR *r);
>  _PUBLIC_ enum ndr_err_code ndr_push_negoex_BYTE_VECTOR(struct ndr_push *ndr, int ndr_flags, const struct negoex_BYTE_VECTOR *r);
> diff --git a/source3/rpc_server/spoolss/srv_iremotewinspool.c b/source3/rpc_server/spoolss/srv_iremotewinspool.c
> index ea52348..afab021 100644
> --- a/source3/rpc_server/spoolss/srv_iremotewinspool.c
> +++ b/source3/rpc_server/spoolss/srv_iremotewinspool.c
> @@ -5,8 +5,8 @@
>  
>  #include "includes.h"
>  #include "ntdomain.h"
> -#include "bin/default/librpc/gen_ndr/srv_winspool.h"
> -#include "bin/default/librpc/gen_ndr/srv_spoolss.c"
> +#include "librpc/gen_ndr/srv_winspool.h"
> +#include "librpc/gen_ndr/srv_spoolss.c"
>  
>  static bool api_winspool_SyncRegisterForRemoteNotifications(struct pipes_struct *p)
>  {
> -- 
> 1.8.3.1
> 

> From 4a6f93fbad1b9e72a9781a65ac42c1507959590a Mon Sep 17 00:00:00 2001
> From: Aliaksei Karaliou <akaraliou at panasas.com>
> Date: Tue, 29 Jan 2019 08:45:26 -0500
> Subject: [PATCH 2/2] build:docs: Get rid of hardcoded 'bin/default'
> 
> Build scripts for documentation still contain hardcoded path to build
> destination rather than use proper final build path variables.
> 
> Signed-off-by: Aliaksei Karaliou <akaraliou at panasas.com>
> ---
>  buildtools/wafsamba/wafsamba.py | 2 +-
>  wscript_build                   | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
> index a077026..9d8251d 100644
> --- a/buildtools/wafsamba/wafsamba.py
> +++ b/buildtools/wafsamba/wafsamba.py
> @@ -920,7 +920,7 @@ def SAMBAMANPAGES(bld, manpages, extra_source=None):
>      '''build and install manual pages'''
>      bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl'
>      bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl'
> -    bld.env.SAMBA_CATALOG = bld.srcnode.abspath() + '/bin/default/docs-xml/build/catalog.xml'
> +    bld.env.SAMBA_CATALOG = bld.bldnode.abspath() + '/docs-xml/build/catalog.xml'
>      bld.env.SAMBA_CATALOGS = 'file:///etc/xml/catalog file:///usr/local/share/xml/catalog file://' + bld.env.SAMBA_CATALOG
>  
>      for m in manpages.split():
> diff --git a/wscript_build b/wscript_build
> index a0563bf..3ee0565 100644
> --- a/wscript_build
> +++ b/wscript_build
> @@ -29,7 +29,7 @@ bld.SAMBA_MKVERSION('version.h')
>  # bld.ENABLE_MAGIC_ORDERING()
>  
>  bld.env.ABS_TOP_SRCDIR = bld.srcnode.abspath() + '/docs-xml'
> -bld.env.ABS_TOP_BUILDDIR = bld.srcnode.abspath() + '/bin/default/docs-xml'
> +bld.env.ABS_TOP_BUILDDIR = bld.bldnode.abspath() + '/docs-xml'
>  bld.CONFIGURE_FILE('docs-xml/build/catalog.xml',
>                     ABS_TOP_BUILDDIR = bld.env.ABS_TOP_BUILDDIR,
>                     ABS_TOP_SRCDIR=bld.env.ABS_TOP_SRCDIR)
> -- 
> 1.8.3.1
> 


-- 
/ Alexander Bokovoy