Thanks to visit codestin.com
Credit goes to github.com

Skip to content

clean up buildchain linuxisms & update FreeBSD URLs #1813

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Apr 27, 2019
Merged

clean up buildchain linuxisms & update FreeBSD URLs #1813

merged 3 commits into from
Apr 27, 2019

Conversation

@dch
Copy link
Collaborator

@dch dch commented Jul 19, 2018

minor changes

  • fix the url for port status as it's defunct since months
  • mention the additional beta port link maybe this could go somewhere else?

Also, I'm unable to generate the docs locally using the instructions in source, to check my changes. I'll commit a fix if somebody can clarify how that works today. Here's what I'm trying on FreeBSD:

git clone ...
cd h2o
git submodule update --recursive
mkdir _build
cd _build
cmake ..  -DCMAKE_INSTALL_PREFIX:PATH=/tmp/usr/local
...
[100%] Linking C executable h2o
[100%] Built target h2o
Scanning dependencies of target doc
mkdir -p doc/configure
../misc/oktavia/bin/oktavia-mkindex  -m html -u h2 -c 10 -t js -s english
Search Engine Oktavia - Index Generator

usage: oktavia_mkindex [options]

Common Options:
 -i, --input [input folder/file ] : Target files to search. .html, .csv, .txt are available.
...
make[4]: stopped in /repos/h2o/doc
*** Error code 2

If I append -i . and run oktavia manually, then we get further:

...

Source text size: 229714 bytes
Serializing FM-index
    Wavelet Matrix: 70586 bytes (70%)
    Dictionary Cache: 183792 bytes
Char Code Map: 198 bytes
Stemmed Word Table: 7519 bytes (53%)
Meta Data section: 5030 bytes (21%)
Meta Data tag: 4280 bytes (23%)
generated: /repos/h2o/doc/search/searchindex.js
make[4]: don't know how to make workdir/configure/quick_start.man. Stop

make[4]: stopped in /repos/h2o/doc
*** Error code 2

@dch
Copy link
Collaborator Author

dch commented Aug 31, 2018

@kazuho what am I missing for regenerating the documentation locally?

@kazuho
Copy link
Member

kazuho commented Sep 6, 2018

@dch Could it be the case with make? Looking at the line that invokes oktavia, it seems like patsubst is not woking.

https://github.com/h2o/h2o/blob/master/misc/doc.mk#L80:

../misc/oktavia/bin/oktavia-mkindex $(patsubst %,-i %,$(OUTPUT)) -m html -u h2 -c 10 -t js -s english

@dch
Copy link
Collaborator Author

dch commented Apr 24, 2019

notes to self:

build the docs on FreeBSD via:

$ sudo pkg install -r FreeBSD textproc/p5-Text-MicroTemplate www/p5-HTML-TokeParser-Simple devel/libuv devel/gmake
$ git clone ...
$ cd h2o
$ git submodule update --recursive
$ mkdir _build; cd _build
$ cmake ..  -DCMAKE_INSTALL_PREFIX:PATH=/tmp/usr/local -DCMAKE_MAKE_PROGRAM=gmake  -DCMAKE_MAKE_PROGRAM=gmake
$ gmake doc

@dch dch self-assigned this Apr 24, 2019
@dch dch changed the title docs: fix oktavia flags, update stale URL for FreeBSD & add link to -devel flavour clean up buildchain linuxisms & update FreeBSD URLs Apr 24, 2019
@dch dch requested review from deweerdt and kazuho and removed request for kazuho April 24, 2019 10:20
@dch
Copy link
Collaborator Author

dch commented Apr 24, 2019

OK this LGTM now but the CMake changes deserve a closer look

kazuho
kazuho reviewed Apr 25, 2019
View reviewed changes
Copy link
Member

@kazuho kazuho left a comment

Choose a reason for hiding this comment

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

Nice PR! Thank you for the work.

LGTM modulo the point below.

dch added 3 commits April 26, 2019 12:43
@dch
build: defer $MAKE choice to cmake for BSD compatibility
1fc4c6c 
The doc target uses gmake-specific functionality and therefore we need
to propagate the choice of make engine through the whole build chain
@dch
doc: use perl via PATH when building manpage
242bd27 
Linuxisms do not work on *BSD
@dch
docs: update stale URL for FreeBSD and add link to -devel flavour
3c95cf9
@kazuho kazuho merged commit 8400d13 into h2o:master Apr 27, 2019
@kazuho
Copy link
Member

kazuho commented Apr 27, 2019

Thanks for the changes!

@dch dch deleted the doc branch May 22, 2019 22:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kazuho kazuho kazuho left review comments

@deweerdt deweerdt Awaiting requested review from deweerdt

Assignees

@dch dch

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@dch @kazuho