[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Fri Dec 16 07:42:01 UTC 2022
The branch, master has been updated
via 9189bd9c9c1 build: Convert winexe to use enabled= in wscript
from ddbb8f1999e lib: Move 448 bytes from R/W data segment to R/O text
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9189bd9c9c126b8983781a8de075efc9fe7fdfa5
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Dec 5 22:18:45 2022 +1300
build: Convert winexe to use enabled= in wscript
This also allows --without-winexe to stop building the .exe files even if
the compilers are present on the system.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15264
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Fri Dec 16 07:41:38 UTC 2022 on sn-devel-184
-----------------------------------------------------------------------
Summary of changes:
examples/winexe/wscript_build | 60 ++++++++++++++++++++++++-------------------
1 file changed, 34 insertions(+), 26 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/winexe/wscript_build b/examples/winexe/wscript_build
index 143739f3de0..364683405c2 100644
--- a/examples/winexe/wscript_build
+++ b/examples/winexe/wscript_build
@@ -65,36 +65,44 @@ const DATA_BLOB *%s(void)
winexesvc_binaries = ''
+bld.SAMBA_GENERATOR(
+ 'winexesvc32_exe',
+ source='winexesvc.c',
+ target='winexesvc32.exe',
+ rule='${WINEXE_CC_WIN32} ${SRC} -o ${TGT} ${WINEXE_LDFLAGS}',
+ enabled=bld.env.build_winexe and bld.env.WINEXE_CC_WIN32)
+
+vars = {"WINEXE_FN": "winexesvc32_exe_binary"}
+bld.SAMBA_GENERATOR(
+ 'winexesvc32_exe_binary',
+ source='winexesvc32.exe',
+ target='winexesvc32_exe_binary.c',
+ group='build_source',
+ vars=vars,
+ rule=generate_winexesvc_c_from_exe,
+ enabled=bld.env.build_winexe and bld.env.WINEXE_CC_WIN32)
+
if bld.env.WINEXE_CC_WIN32:
- bld.SAMBA_GENERATOR(
- 'winexesvc32_exe',
- source='winexesvc.c',
- target='winexesvc32.exe',
- rule='${WINEXE_CC_WIN32} ${SRC} -o ${TGT} ${WINEXE_LDFLAGS}')
- vars = {"WINEXE_FN": "winexesvc32_exe_binary"}
- bld.SAMBA_GENERATOR(
- 'winexesvc32_exe_binary',
- source='winexesvc32.exe',
- target='winexesvc32_exe_binary.c',
- group='build_source',
- vars=vars,
- rule=generate_winexesvc_c_from_exe)
winexesvc_binaries += ' winexesvc32_exe_binary.c'
+bld.SAMBA_GENERATOR(
+ 'winexesvc64_exe',
+ source='winexesvc.c',
+ target='winexesvc64.exe',
+ rule='${WINEXE_CC_WIN64} ${SRC} -o ${TGT} ${WINEXE_LDFLAGS}',
+ enabled=bld.env.build_winexe and bld.env.WINEXE_CC_WIN64)
+
+vars = {"WINEXE_FN": "winexesvc64_exe_binary"}
+bld.SAMBA_GENERATOR(
+ 'winexesvc64_exe_binary',
+ source='winexesvc64.exe',
+ target='winexesvc64_exe_binary.c',
+ group='build_source',
+ vars=vars,
+ rule=generate_winexesvc_c_from_exe,
+ enabled=bld.env.build_winexe and bld.env.WINEXE_CC_WIN64)
+
if bld.env.WINEXE_CC_WIN64:
- bld.SAMBA_GENERATOR(
- 'winexesvc64_exe',
- source='winexesvc.c',
- target='winexesvc64.exe',
- rule='${WINEXE_CC_WIN64} ${SRC} -o ${TGT} ${WINEXE_LDFLAGS}')
- vars = {"WINEXE_FN": "winexesvc64_exe_binary"}
- bld.SAMBA_GENERATOR(
- 'winexesvc64_exe_binary',
- source='winexesvc64.exe',
- target='winexesvc64_exe_binary.c',
- group='build_source',
- vars=vars,
- rule=generate_winexesvc_c_from_exe)
winexesvc_binaries += ' winexesvc64_exe_binary.c'
if winexesvc_binaries != '':
--
Samba Shared Repository
More information about the samba-cvs
mailing list