Apply some polish to README and Makefile, support d/l mirror in Makefile #13
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit adds two features: * The generated RPM SPEC files can point to a mirror for downloading the source code of packages * Handling name spaces (upstream, xs) is more explicit. This is in anticipation of adding another one that will be handled slightly different because its packages will not be built by default. Signed-off-by: Christian <christian.lindig@citrix.com>
This commit covers the invocation of sources.rb in the Makefile in a macro to make it more uniform and easier to change. Furthermore it fixes some typos in the documentation and expands it minimally. Signed-off-by: Christian Lindig <christian.lindig@citrix.com>
….99.tar.gz This commit just changes the version to indicate that a fixed version is used rather than HEAD of a branch. Signed-off-by: Christian <christian.lindig@citrix.com>
gaborigloi
suggested changes
Feb 8, 2017
Makefile
Outdated
|
|
||
| # | ||
| # build an Opam repo in build/ with all URL files pointing | ||
| # to sources in build/src. | ||
| # | ||
| repo: build | ||
| cp -r packages build | ||
| ./utils/sources.rb packages/*/*/url | while read pkg url; do \ | ||
| $(SRCS) | while read package url; do \ | ||
| echo "http: \"file://$(SRC)/$$(basename $$url)\"" > build/packages/$$pkg/url;\ |
There was a problem hiding this comment.
Could this be a typo: package vs. $$pkg?
There was a problem hiding this comment.
Indeed, I ran make repo, and the URLs did not get rewritten:
~/s/xs-opam> cat build/packages/url
http: "file:///home/gabori/src/xs-opam/build/src/ocaml-xenstore-clients-0.9.4.tar.gz"
~/s/xs-opam> cat build/packages/xs/xenstore_transport.0.9.4/url
archive: "https://github.com/djs55/ocaml-xenstore-clients/archive/0.9.4.tar.gz"
checksum: "470299fe940fc4b67dfeeab430c06b1d"There was a problem hiding this comment.
Good catch! Will fix it.
| -u, --url just emit URLs | ||
| -m, --mirror http://example.com/some/path download from mirror | ||
| -h, --help show this help | ||
| -u, --url just emit URLs |
There was a problem hiding this comment.
With the above changes in the Makefile, this --url option isn't really needed anymore, if I'm not mistaken? But I'm fine with keeping it though.
There was a problem hiding this comment.
I'd like to keep it - I just gave up on using it to make things more uniform.
gaborigloi
reviewed
Feb 8, 2017
utils/sources.rb
Outdated
|
|
||
| Note that the mirror must end with a slash or otherwise the last | ||
| element of the path will be ignored. It is possible to provide the | ||
| --mirror flag without an argument - in which case no mirrow will be used. In the future a default mirror might be used in that case. |
There was a problem hiding this comment.
Maybe this line could be broken, as it is quite long.
|
I've addressed the comments. I've also added one commit that renames the package for message-switch because the name did not reflect that we are using a fixed version. |
gaborigloi
approved these changes
Feb 8, 2017
This commit fixes an error when URLs are rewritten in the Makefile target "repo". Signed-off-by: Christian <christian.lindig@citrix.com>
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These two commits add a bit of polish:
The invocation of sources.rb is now covered by a macro in the Makefile. This makes it easier to add new name spaces (say
xs-daemons) and adding a mirror for downloads.Downloading from a mirror is now supported by the Makefile and explained in the help message of sources.rb.
Handling download mirrors in sources.rb is better explained in the help message.