Skip to content

Commit

Permalink
Disable Java wrapper build by default.
Browse files Browse the repository at this point in the history
- Java wrapper build isn't necessary for all Python builds.
- Java wrapper build can now be enabled with ``ENABLE_JAVA`` environment
  variable.
  • Loading branch information
Ted Strzalkowski committed Aug 2, 2020
1 parent 914404d commit 674cf71
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 0 deletions.
37 changes: 37 additions & 0 deletions .travis.yml
Expand Up @@ -66,6 +66,18 @@ jobs:
- SDIST=1
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- ENABLE_JAVA=0
python: "3.8"
language: python
dist: xenial
- os: linux
stage: s1
script: skip
env:
- SDIST=1
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- ENABLE_JAVA=1
python: "3.8"
language: python
dist: xenial
Expand All @@ -76,6 +88,18 @@ jobs:
- SDIST=1
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- ENABLE_JAVA=0
python: "3.8"
language: python
dist: xenial
- os: linux
stage: s1
script: skip
env:
- SDIST=1
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- ENABLE_JAVA=0
python: "3.8"
language: python
dist: xenial
Expand All @@ -86,6 +110,18 @@ jobs:
- SDIST=1
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- ENABLE_JAVA=1
python: "3.8"
language: python
dist: xenial
- os: linux
stage: s1
script: skip
env:
- SDIST=1
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- ENABLE_JAVA=1
python: "3.8"
language: python
dist: xenial
Expand All @@ -96,6 +132,7 @@ jobs:
- SDIST=1
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- ENABLE_JAVA=1
python: "3.8"
language: python
dist: xenial
Expand Down
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -113,6 +113,7 @@ The build can be customized with environment variables. In addition to any varia

- ``CI_BUILD``. Set to ``1`` to emulate the CI environment build behaviour. Used only in CI builds to force certain build flags on in ``setup.py``. Do not use this unless you know what you are doing.
- ``ENABLE_CONTRIB`` and ``ENABLE_HEADLESS``. Set to ``1`` to build the contrib and/or headless version
- ``ENABLE_JAVA``, Set to ``1`` to enable the Java client build. This is disabled by default.
- ``CMAKE_ARGS``. Additional arguments for OpenCV's CMake invocation. You can use this to make a custom build.

See the next section for more info about manual builds outside the CI environment.
Expand Down
3 changes: 3 additions & 0 deletions setup.py
Expand Up @@ -19,6 +19,7 @@ def main():
minimum_supported_numpy = "1.13.1"
build_contrib = get_build_env_var_by_name("contrib")
build_headless = get_build_env_var_by_name("headless")
build_java = get_build_env_var_by_name("java")

if sys.version_info[:2] >= (3, 6):
minimum_supported_numpy = "1.13.3"
Expand Down Expand Up @@ -121,6 +122,8 @@ def main():
"-DPYTHON3_LIBRARY=%s" % python_lib_path,
"-DBUILD_opencv_python3=ON",
"-DBUILD_opencv_python2=OFF",
# Disable the Java build by default as it is not needed
"-DBUILD_opencv_java=%s" % build_java,
# When off, adds __init__.py and a few more helper .py's. We use our own helper files with a different structure.
"-DOPENCV_SKIP_PYTHON_LOADER=ON",
# Relative dir to install the built module to in the build tree.
Expand Down

0 comments on commit 674cf71

Please sign in to comment.