Discussion:
PR #1277
Willem Ferguson
2018-09-15 11:11:05 UTC
Permalink
Dear Lubomir, Dirk,

Please look at #1277. Github told me at the time that this PR was pulled
and it is indeed reflected in the latest master user-manual.txt in
src/subsurface/Documentation. BUT it is clearly NOT in the present
user-manual.html in subsurface/build/Documentation. There must be some
issue with the build script or am I going mad?

Kind regards,

willem
--
This message and attachments are subject to a disclaimer.

Please refer to 
http://upnet.up.ac.za/services/it/documentation/docs/004167.pdf
<http://upnet.up.ac.za/services/it/documentation/docs/004167.pdf> for
full
details.
Lubomir I. Ivanov
2018-09-15 14:58:29 UTC
Permalink
On 15 September 2018 at 14:11, Willem Ferguson
Post by Willem Ferguson
Dear Lubomir, Dirk,
Please look at #1277. Github told me at the time that this PR was pulled and
it is indeed reflected in the latest master user-manual.txt in
src/subsurface/Documentation. BUT it is clearly NOT in the present
user-manual.html in subsurface/build/Documentation. There must be some issue
with the build script or am I going mad?
Willem, i can confirm that the additions you've made are not reflected
in the user-manual.html file.
no errors are thrown:

-- Installing: /home/lubo-it/src/install-root/share/subsurface/Documentation/user-manual.html
-- Installing: /home/lubo-it/src/install-root/share/subsurface/Documentation/user-manual_es.html
-- Installing: /home/lubo-it/src/install-root/share/subsurface/Documentation/user-manual_fr.html
-- Installing: /home/lubo-it/src/install-root/share/subsurface/Documentation/user-manual_ru.html

searching for one of the new strings from this PR:

lubo-***@luboitvbox:~/src/subsurface/build/Documentation$ grep "In pSCR
diving" * -rnI
user-manual_fr.html:3130:<div class="paragraph"><p>In pSCR diving, the
inspired gas often has a pO<sub>2</sub> below that of the fresh
(the string is only found in the FR translation of the manual)

we seem to have a docs generation bug, but i won't have the time to
debug this during the weekend.

something that can be done is find which commit broke it, here is the
history of commit SHAs:
https://github.com/Subsurface-divelog/subsurface/commits/master/Documentation/user-manual.txt

then this can be done:
git checkout <commit-SHA>
rebuild subsurface...
to find the last one which works.

also a question - your commit is
https://github.com/Subsurface-divelog/subsurface/commit/773ee0d990d1b5d9783a9eef5784e7c4963ca02c
did you verify that your additions look good after the HTML is generated?

lubomir
--
Dirk Hohndel
2018-09-15 17:59:19 UTC
Permalink
I believe I know what's wrong. I won't be at my computer for a few hours, but will address this later today

/D
Post by Willem Ferguson
Dear Lubomir, Dirk,
Please look at #1277. Github told me at the time that this PR was pulled
and it is indeed reflected in the latest master user-manual.txt in
src/subsurface/Documentation. BUT it is clearly NOT in the present
user-manual.html in subsurface/build/Documentation. There must be some
issue with the build script or am I going mad?
Kind regards,
willem
--
This message and attachments are subject to a disclaimer.
Please refer to 
http://upnet.up.ac.za/services/it/documentation/docs/004167.pdf
<http://upnet.up.ac.za/services/it/documentation/docs/004167.pdf> for
full
details.
--
From my phone
Dirk Hohndel
2018-09-15 23:08:25 UTC
Permalink
Post by Willem Ferguson
Dear Lubomir, Dirk,
Please look at #1277. Github told me at the time that this PR was pulled
and it is indeed reflected in the latest master user-manual.txt in
src/subsurface/Documentation. BUT it is clearly NOT in the present
user-manual.html in subsurface/build/Documentation. There must be some
issue with the build script or am I going mad?
My current guess is that you are missing a few tools and that our build system silently gives you the HTML files that are stored in git.
On Ubuntu you need to run

sudo apt install asciidoc w3m

in order to be able to create the HTML files from source.

Additionally, most of the .txt files had errors in them which caused the conversion to HTML to fail, as a result of which the HTML versions stored in git were outdated.
I fixed all of those (but for the French version for example they need to be reflected in the tooling used to create the translation) and pushed new .html.git files.

With this you should see the updates that you were missing.

/D

Loading...