Skip to content
Snippets Groups Projects

Improve build system & Update dependency

Merged Ghost User requested to merge update into master

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Ghost User Added 3 commits:

    Added 3 commits:

    Compare with previous version

  • Author Contributor

    @jung You maybe want to look at the Makefile changes. The rest is trivial. If Makefile is good then you can merge this ASAP :) or we can discuss further improvement of this "build system".

  • Why do you want to split iris-local like this? Notice that the way I wrote it, it serves as both init and update; the --init arguments just means "initialize if necessary" and the -nf passed to ln means "if the link already exists, delete it". So right now, make iris-local is "initialize Iris if necessary, or update it if necessary, and then build it if necessary". I feel if you (for some reason, but that should be rare) want to only do one of these two things, that's just a single command and you can just do it yourself.

    Edited by Ralf Jung
  • Author Contributor

    Because I added a iris-local-update, and want to make the build part explicit? But maybe just copying the line of building after the git line in update as well will be better.

  • So why did you add iris-local-update? make iris-local (the way it is currently in master) already does an update :)

    Edited by Ralf Jung
  • Author Contributor

    Really? I experienced once that git submodule update --init iris didn't do the update (not 100% sure it is to blame though) so I found the git submodule update --remote --merge thing.

  • Author Contributor

    Oh I got it ... maybe my added update mean update the dependency according to the dependency itself, and the original update is for update according to downstream's repo.

  • Right... my definition of "update" is "update the contents of the folder to the commit given by the submodule".

    I just realized that you probably meant "change the submodule to point to the latest upstream commit"? Hm, I see. I didn't add a target for that because it was my expectation that this is only done by the developer of the repo, so they can just do it manually. Also, I didn't know git submodule can actually do that ;)

  • Notice however that to do the update, one also has to do a git commit iris -m "Updating Iris" (or so), and a re-build of the local repo (not just the remote one). So I am not sure if it is worth having this as a make target. Notice that --merge is probably wrong, we don't want any additional merge commits there, we want it to essentially hard-reset to the new origin/master.

  • Author Contributor

    Good point. I think now I will just add a fews lines of comments and note down how to track remote dependency in README.md

  • All right.

  • Ghost User Added 2 commits:

    Added 2 commits:

    • 529d50ff - Add more build instructions
    • fa386c5a - Update according to dependencies

    Compare with previous version

  • Ghost User Added 2 commits:

    Added 2 commits:

    • 1c4eac1d - Add more build instructions
    • 13900169 - Update according to dependencies

    Compare with previous version

  • Ghost User Unmarked this merge request as a Work In Progress

    Unmarked this merge request as a Work In Progress

  • Ghost User Mentioned in commit 0a54775b

    Mentioned in commit 0a54775b

  • Ghost User Status changed to merged

    Status changed to merged

Please register or sign in to reply
Loading