Skip to content

Commit 611a32c

Browse files
committed
configure.py: Fix the disabling of Java webservices (not affecting the webservices as such ever) if Java is explicitly disabled. bugref:11003
svn:sync-xref-src-repo-rev: r172592
1 parent 251622a commit 611a32c

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

configure.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
# $Id: configure.py 112857 2026-02-06 19:37:10Z klaus.espenlaub@oracle.com $
2+
# $Id: configure.py 112858 2026-02-06 20:04:09Z klaus.espenlaub@oracle.com $
33
"""
44
Configuration script for building VirtualBox.
55
@@ -61,7 +61,7 @@
6161
# External Python modules or other dependencies are not allowed!
6262
#
6363

64-
__revision__ = "$Revision: 112857 $"
64+
__revision__ = "$Revision: 112858 $"
6565

6666
import argparse
6767
import ctypes
@@ -3353,7 +3353,7 @@ def show_syntax_help():
33533353
ToolCheck("gsoap", asCmd = [ ], fnCallback = ToolCheck.checkCallback_GSOAP ),
33543354
ToolCheck("gsoapsources", asCmd = [ ], fnCallback = ToolCheck.checkCallback_GSOAPSources ),
33553355
ToolCheck("java", asCmd = [ ], fnCallback = ToolCheck.checkCallback_Java,
3356-
dictDefinesToSetIfFailed = { 'VBOX_WITH_JWS' : '', 'VBOX_WITH_JMSCOM': '', 'VBOX_WITH_JXPCOM' : '', 'VBOX_WITH_WEBSERVICES' : '' }),
3356+
dictDefinesToSetIfFailed = { 'VBOX_WITH_JWS' : '', 'VBOX_WITH_JMSCOM': '', 'VBOX_WITH_JXPCOM' : '' }),
33573357
ToolCheck("makeself", asCmd = [ ], fnCallback = ToolCheck.checkCallback_makeself, aeTargets = [ BuildTarget.LINUX ]),
33583358
# On Solaris nasm is not officially supported.
33593359
ToolCheck("nasm", asCmd = [ "nasm" ], fnCallback = ToolCheck.checkCallback_NASM, aeTargetsExcluded = [ BuildTarget.SOLARIS ]),
@@ -3900,6 +3900,10 @@ def main():
39003900
lambda env: { 'VBOX_WITH_GSOAP': '', \
39013901
'VBOX_WITH_WEBSERVICES': '' } if g_oEnv['config_tools_disable_gsoap'] \
39023902
or g_oEnv['config_libs_disable_libgsoapssl++'] else {},
3903+
# Disable building Java webservices if java is disabled.
3904+
lambda env: { 'VBOX_WITH_JWS' : '', \
3905+
'VBOX_WITH_JMSCOM': '', \
3906+
'VBOX_WITH_JXPCOM' : '' } if g_oEnv['config_tools_disable_java'] else {},
39033907
# Disable components which require COM.
39043908
lambda env: { 'VBOX_WITH_MAIN': '', \
39053909
'VBOX_WITH_QTGUI': '', \

0 commit comments

Comments
 (0)