Skip to content
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

Ford build updates #116

Merged
merged 9 commits into from
Jul 15, 2015
Merged

Ford build updates #116

merged 9 commits into from
Jul 15, 2015

Conversation

zbeekman
Copy link
Contributor

@zbeekman zbeekman commented Jul 7, 2015

  • Fix .travis.yml build and testing script
    • It was trying to interpret the json-fortran.md file as a fortran source file due to extraction of sources from README.md
    • Sources extracted from README.md must have a name matching the glob example*
  • Update CMake build to build FORD documentation, and do so as few times as possible due to speed concerns
  • Clean remaining references to ROBODoc form build.sh
  • Remove some old bug work arounds from build.sh and CMakeLists.txt

@codecov-io
Copy link

Current coverage is 77.66%

Merging #116 into ford will change coverage by -5.75% by 866adb0

Coverage Diff

@@             ford    #116   diff @@
=====================================
  Files           1       2      +1
  Stmts        1453    2892   +1439
  Branches        0       0        
  Methods         0       0        
=====================================
+ Hit          1212    2246   +1034
  Partial         0       0        
- Missed        241     646    +405

Powered by Codecov

@zbeekman zbeekman force-pushed the ford-build-deploy branch from 939c27e to fb11a98 Compare July 10, 2015 19:02
@zbeekman
Copy link
Contributor Author

BTW, @jacobwilliams, please let me know if you want me to do a better job of separating FORD related stuff from other fixes and improvements. I can rebase this PR and pull commits unrelated to FORD out into a separate PR… with a separate feature branch.

@zbeekman zbeekman force-pushed the ford-build-deploy branch 10 times, most recently from 7cce2cc to 14f8d44 Compare July 11, 2015 19:24
@jacobwilliams
Copy link
Owner

Yes, if we can keep just the FORD stuff in this PR then that would be great. If it's too much trouble at this point though, then don't worry about.

@zbeekman
Copy link
Contributor Author

OK, I’ll branch out some of the more incidental stuff to their own branches… we’ll just need to be careful when we start pulling changes into master that we have merged changes from accepted PRs into outstanding PRs, or rebase outstanding PRs against master. (The latter approach is my preference… but can be a little tricky to resolve conflicts.)

@zbeekman zbeekman force-pushed the ford-build-deploy branch 4 times, most recently from 6339980 to 105296f Compare July 14, 2015 21:00
zbeekman added 9 commits July 14, 2015 17:03
@zbeekman
Fix .travis.yml README.md builds
2b4b54d 
 - Restrict example programs in README.md to be named example* to
   prevent confusion with other .md files when renaming extracted
   programs from README.md
 - Fixes a problem where new .md files are being interpreted as f90 sources
@zbeekman
Cleanup white space
61ac9be
@zbeekman
Replace remaining ROBODoc code/info with FORD
d6802f8
@zbeekman
Update CMake build script to use FORD instead of ROBODoc
e501011 
 - Outputs still dynamically computed at configure time
 - Outputs not deleted after configure since FORD build is slower
 - FORD outputs cached so that running CMake again doesn't recompute
   them unless they need to be.
 - Small issue with some of the modification time of FORD files, see
   https://github.com/cmacmackin/ford/issues/55
@zbeekman
rename logos to media add favicon 32x32
476f8c7
@zbeekman
Update ford documentation project file
20b207f 
 - new meta data
 - added TOC
 - preprocessor macro workaround in json_module.F90 so that USE_UCS4
   macro is not expanded in the documentation when unicode is enabled
@zbeekman
Improve UCS4 macro + character kind documentation
4685fa4
@zbeekman
Update README and CONTRIBUTING ROBODoc --> FORD
c9dfc0e
@zbeekman
Remove emoji from README (FORD won't render it)
ae2cb3f
@zbeekman zbeekman force-pushed the ford-build-deploy branch from 105296f to ae2cb3f Compare July 14, 2015 21:12
@zbeekman
Copy link
Contributor Author

I’ve cherry picked the unrelated commits into their own branches and submitted PRs against master for those… Once you merge them into master, you should either rebase the ford branch against master, or pull changes from master into the ford branch.

#after merging PRs against master
git co master
git pull origin master
git co ford
git rebase master # or git pull master

I think 🙏 that my PRs against master won’t cause any merge conflicts when you do that… Let me know if they do and I can help you sort them out and any other git issues you run into.

@jacobwilliams
Copy link
Owner

Cross your fingers..

jacobwilliams added a commit that referenced this pull request Jul 15, 2015
@jacobwilliams
Merge pull request #116 from zbeekman/ford-build-deploy
9e1e02b 
Ford build updates
@jacobwilliams jacobwilliams merged commit 9e1e02b into jacobwilliams:ford Jul 15, 2015
@zbeekman zbeekman deleted the ford-build-deploy branch July 15, 2015 15:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@zbeekman @codecov-io @jacobwilliams