New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[FIX] Travis build for macOS. Also add cmake build test. #1063
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,101 @@ | ||
| language: c | ||
| os: | ||
| - osx | ||
| - linux | ||
|
|
||
| sudo: | ||
| - true | ||
|
|
||
| compiler: | ||
| - gcc | ||
| - clang | ||
| matrix: | ||
| include: | ||
| - os: osx | ||
| osx_image: xcode10.1 | ||
| compiler: gcc | ||
| addons: | ||
| homebrew: | ||
| packages: | ||
| autoconf | ||
| libtool | ||
| tesseract | ||
| leptonica | ||
| script: | ||
| - cd mac | ||
| - ./build.command | ||
| - ./ccextractor --version | ||
|
|
||
| before_install: | ||
| - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then brew upgrade automake; brew install pkg-config autoconf automake libtool tesseract leptonica; fi | ||
| - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo apt-get install -y libcurl4-gnutls-dev tesseract-ocr tesseract-ocr-dev libleptonica-dev autoconf-archive; fi | ||
| - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then sudo apt-get install python-distutils-extra tesseract-ocr tesseract-ocr-eng libopencv-dev libtesseract-dev libleptonica-dev python-all-dev swig libcv-dev python-opencv python-numpy python-setuptools build-essential subversion; fi | ||
| - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then wget https://github.com/DanBloomberg/leptonica/releases/download/1.74.4/leptonica-1.74.4.tar.gz && tar xvf leptonica-1.74.4.tar.gz; cd leptonica-1.74.4; ./configure && make && sudo make install; cd ..; fi | ||
| - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then git clone https://github.com/tesseract-ocr/tesseract.git; cd tesseract; ./autogen.sh; ./configure --enable-debug; LDFLAGS="-L/usr/local/lib" CFLAGS="-I/usr/local/include" make; sudo make install; sudo ldconfig; cd ..; fi | ||
| - os: osx | ||
| osx_image: xcode10.1 | ||
| compiler: clang | ||
| addons: | ||
| homebrew: | ||
| packages: | ||
| autoconf | ||
| libtool | ||
| tesseract | ||
| leptonica | ||
| script: | ||
| - cd mac | ||
| - ./build.command | ||
| - ./ccextractor --version | ||
|
|
||
| script: | ||
| - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cd mac; ./build.command; cd ..; fi | ||
| - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cd mac; ./autogen.sh; ./configure; make; cd ..; fi | ||
| - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd linux; ./build; cd ..; fi | ||
| - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir build; cd build; cmake ../src/; make; cd ..; fi | ||
| - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd linux; ./autogen.sh; ./configure; make; cd ..; fi | ||
| - os: osx | ||
| osx_image: xcode10.1 | ||
| compiler: gcc | ||
| addons: | ||
| homebrew: | ||
| packages: | ||
| autoconf | ||
| libtool | ||
| tesseract | ||
| leptonica | ||
| script: | ||
| - cd mac | ||
| - ./autogen.sh | ||
| - ./configure | ||
| - make | ||
| - ./ccextractor --version | ||
|
|
||
| - os: osx | ||
| osx_image: xcode10.1 | ||
| compiler: clang | ||
| addons: | ||
| homebrew: | ||
| packages: | ||
| autoconf | ||
| libtool | ||
| tesseract | ||
| leptonica | ||
| script: | ||
| - cd mac | ||
| - ./autogen.sh | ||
| - ./configure | ||
| - make | ||
| - ./ccextractor --version | ||
|
|
||
| - os: osx | ||
| osx_image: xcode10.1 | ||
| compiler: gcc | ||
| addons: | ||
| homebrew: | ||
| packages: | ||
| autoconf | ||
| libtool | ||
| tesseract | ||
| leptonica | ||
| script: | ||
| - mkdir build | ||
| - cd build | ||
| - cmake ../src/ | ||
| - make | ||
| - ./ccextractor --version | ||
|
|
||
| - os: osx | ||
| osx_image: xcode10.1 | ||
| compiler: clang | ||
| addons: | ||
| homebrew: | ||
| packages: | ||
| autoconf | ||
| libtool | ||
| tesseract | ||
| leptonica | ||
| script: | ||
| - mkdir build | ||
| - cd build | ||
| - cmake ../src/ | ||
| - make | ||
| - ./ccextractor --version | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like you have a lot of whitespace after the end of line... Care to correct? :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi! I would love to correct it, but am unable to locate the extra whitespaces. How do I fix it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's none -_-
It's because the line on the left side is wrapping over multiple ones that this side is as well... My bad.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, let me know if any changes are needed 🙂