search

uniconproject / unicon

http://www.unicon.org
Other
54 stars 27 forks source link

Updated UniDoc for use with uni/lib #129

Closed StephenWampler closed 3 years ago

StephenWampler commented 3 years ago

The UniDoc sources now compile and run using the uni/lib support instead of the old UniLib librareis. Note that the build*.sh scripts require customization for each system they are run on to propertly locate the Unicon source hierarchy.

Signed-off-by: Steve Wampler sbw@tapestry.tucson.az.us

Jafaral commented 3 years ago

There is a huge white space diff in a few files, was the intentional ?

StephenWampler commented 3 years ago

There is a huge white space diff in a few files, was the intentional ?

Interesting. I build this new version from my own copies of UniDoc, not from the sources in the unidoc directory and copied those overtop of the unidoc versions once I had things running.

So the differences may be a difference in the editors used to build the files. I tink I'll try and get away with claiming it was intentional...

Jafaral commented 3 years ago

white space could be space vs tab issue. I didn't check. It is good to keep those in one form or the other but minimize flipping between the two. No need to register undesired changes in the commits over time.

Jafaral commented 3 years ago

Steve, can you do a rebase instead of merge when you update your PR branch ? This is the preferred method especially when you have a few commits only in the PR. Doing a merge adds an unnecessary merge commit in this case and it just complicate the commit history.

Jafaral commented 3 years ago

BTW, I didn't forget about an html config option. Will add that this weekend.

StephenWampler commented 3 years ago

BTW, I didn't forget about an html config option. Will add that this weekend.

No rush - I've pulled this back into Draft to add a few features and fix a few annoyances...

StephenWampler commented 3 years ago

Jafar,

I did a rebase of (local) unidoc onto origin/unidoc first, but that didn't seem to update origin/unidoc until after I followed up with a merge of unidoc onto origin/unidoc (a couple of web pages give this sequence as how to do a rebase). Let me know if there was a better process!

Thanks.

Jafaral commented 3 years ago

see #140