Skip to content

Pass custom config file path as absolute#19494

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
bosper351:js-build-config-fix
Feb 10, 2021
Merged

Pass custom config file path as absolute#19494
opencv-pushbot merged 1 commit intoopencv:3.4from
bosper351:js-build-config-fix

Conversation

@bosper351
Copy link
Copy Markdown

@bosper351 bosper351 commented Feb 10, 2021 •
edited by alalek
Loading

This PR resolves issue #19493 .

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake
force_builder=Custom
buildworker:Docs=linux-4,linux-6
build_image:Docs=docs-js:18.04
build_image:Custom=javascript
buildworker:Custom=linux-4,linux-6

@alalek
Copy link
Copy Markdown
Member

alalek commented Feb 10, 2021

Thank you for contribution!

This patch should go into 3.4 branch first.
We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

Please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@bosper351 bosper351 changed the base branch from master to 3.4 February 10, 2021 11:47
@bosper351
Copy link
Copy Markdown
Author

bosper351 commented Feb 10, 2021

Rebased as you said, thanks for help.

@opencv-pushbot opencv-pushbot merged commit cac5b0f into opencv:3.4 Feb 10, 2021
@bosper351 bosper351 deleted the js-build-config-fix branch February 10, 2021 20:09
@alalek alalek mentioned this pull request Feb 12, 2021
Merged
@alalek alalek mentioned this pull request Apr 9, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

category: build/install category: javascript (js) feature

Projects

None yet

Milestone

3.4.14

Development

Successfully merging this pull request may close these issues.

3 participants

@bosper351 @alalek @opencv-pushbot