tweaks Makefile and moves permissions there #8
+12
−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
dmalan
reviewed
Jan 25, 2017
| VERSION = 1.2.4 | ||
| BUILD_DIR := build | ||
| LIB_DIR := $(BUILD_DIR)/usr/lib | ||
| PYTHON2_DIR := $(LIB_DIR)/python2.7/dist-packages/cs50 |
There was a problem hiding this comment.
So we're (clearly) assuming Python 2.7 here. Is there a more dynamic way to figure out the right path on a system?
There was a problem hiding this comment.
Not sure yet! But even sdist (just emailed about) seems to assume this path, by default.
| mkdir -p "$(BUILD_DIR)"/usr/lib/python3/dist-packages/cs50 | ||
| cp src/* "$(BUILD_DIR)"/usr/lib/python3/dist-packages/cs50 | ||
| mkdir -p "$(PYTHON2_DIR)" "$(PYTHON3_DIR)" | ||
| find "$(PYTHON2_DIR)" "$(PYTHON3_DIR)" -maxdepth 0 -exec cp src/* {} \; |
There was a problem hiding this comment.
Why this cleverness? Why not just cp twice?
There was a problem hiding this comment.
Just didn't want to write src/* twice, or factor it out, so replaced with this one-liner. Seems I've over-complicated? Might be subject to remove, if we're to transition to sdist, anyway!
|
nbd just felt like an overoptimization!
…On Wed, Jan 25, 2017 at 06:32 Kareem Zidane ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In Makefile <#8>:
>
.PHONY: bash
bash:
docker run -i --rm -t -v "$(PWD)":/root cs50/cli
.PHONY: build
build: clean
- mkdir -p "$(BUILD_DIR)"/usr/lib/python2.7/dist-packages/cs50
- cp src/* "$(BUILD_DIR)"/usr/lib/python2.7/dist-packages/cs50
- mkdir -p "$(BUILD_DIR)"/usr/lib/python3/dist-packages/cs50
- cp src/* "$(BUILD_DIR)"/usr/lib/python3/dist-packages/cs50
+ mkdir -p "$(PYTHON2_DIR)" "$(PYTHON3_DIR)"
+ find "$(PYTHON2_DIR)" "$(PYTHON3_DIR)" -maxdepth 0 -exec cp src/* {} \;
Just didn't want to write src/* twice, or factor it out, so replaced with
this one-liner. Seems I've over-complicated? Might be subject to remove, if
we're to transition to sdist, anyway!
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#8>, or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAwIxreYyX-yxTFjsqznVjjVH4LSUDD9ks5rVzLKgaJpZM4Lsteb>
.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
Addresses #6!
cc: @dmalan