Skip to content

Change modules settings#15608

Merged
alalek merged 14 commits intoopencv:3.4from
SimpleVlad:3.4
Oct 31, 2019
Merged

Change modules settings#15608
alalek merged 14 commits intoopencv:3.4from
SimpleVlad:3.4

Conversation

@SimpleVlad
Copy link
Copy Markdown
Contributor

@SimpleVlad SimpleVlad commented Sep 28, 2019

This pullrequest changes

WIP
Add opportunity to change modules flags in command line

force_builders=Custom
buildworker:Custom=linux-1,linux-2,linux-4
build_image:Docs=docs-js
build_image:Custom=javascript

@dkurt
Copy link
Copy Markdown
Member

dkurt commented Sep 28, 2019

Please also add an ability to override white_list

@dkurt
Copy link
Copy Markdown
Member

dkurt commented Oct 11, 2019

Please resolve the merge conflict

@SimpleVlad
Copy link
Copy Markdown
Contributor Author

python ./platforms/js/build_js.py build_js --emscripten_dir ~/emsdk/fastcomp/emscripten/ --whitelist /home/username/Desktop/args.json --cmake_option="-DCMAKE_C_FLAGS='-s USE_PTHREADS=0 -Os'" --cmake_option="-DBUILD_opencv_calib3d=OFF" --cmake_option="-DBUILD_opencv_dnn=OFF" --cmake_option="--DBUILD_opencv_features2d=OFF" --cmake_option="-DBUILD_opencv_flann=OFF" --cmake_option="-DBUILD_opencv_flann=OFF" --cmake_option="-DCMAKE_CXX_FLAGS='-s USE_PTHREADS=0 -Os'"
and others flag like this: https://github.com/SimpleVlad/opencv/pull/1/files
This is example of custom build.

Comment on lines +228 to +236
# Use flag --cmake option="-D...=ON" only for one argument, if you would add more changes write new cmake_option flags
parser.add_argument('--cmake_option', action='append', help="Append CMake options")
# Use flag --build_flags="-s USE_PTHREADS=0 -Os" for one and more arguments as in the example
parser.add_argument('--build_flags', help="Append Emscripten build options")
parser.add_argument('--build_wasm_intrin_test', default=False, action="store_true", help="Build WASM intrin tests")
# Write a path to modify file like argument of this flag
parser.add_argument('--config', default=os.path.join(os.path.dirname(os.path.abspath(__file__)), 'opencv_js.config.py'),
help="Specify configuration file with own list of exported into JS functions")

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please take a look at https://pullrequest.opencv.org/buildbot/builders/precommit_docs/builds/22427/steps/whitespace%20opencv/logs/stdio and remove trailing whitespaces at lines 229 and 235

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And after that, enable hook on your machine to avoid this in the future: https://github.com/opencv/opencv/wiki/How_to_contribute#the-instruction-in-brief step 5

@dkurt dkurt self-assigned this Oct 30, 2019
Copy link
Copy Markdown
Member

@dkurt dkurt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@alalek alalek merged commit edc5518 into opencv:3.4 Oct 31, 2019
@alalek alalek mentioned this pull request Nov 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants