tweaks Makefile and moves permissions there #8
+12
−13
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,22 @@ | ||
| BUILD_DIR := build | ||
| LIB_DIR := $(BUILD_DIR)/usr/lib | ||
| PYTHON2_DIR := $(LIB_DIR)/python2.7/dist-packages/cs50 | ||
| PYTHON3_DIR := $(LIB_DIR)/python3/dist-packages/cs50 | ||
| DESCRIPTION := CS50 Library for Python | ||
| MAINTAINER := CS50 <[email protected]> | ||
| NAME := python-cs50 | ||
| OLD_NAME := lib50-python | ||
| VERSION := 1.2.4 | ||
|
|
||
| .PHONY: bash | ||
| bash: | ||
| docker run -i --rm -t -v "$(PWD)":/root cs50/cli | ||
|
|
||
| .PHONY: build | ||
| build: clean | ||
| 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 There was a problem hiding this comment. Just didn't want to write |
||
| chmod -R a+rX "$(PYTHON2_DIR)" "$(PYTHON3_DIR)" | ||
|
|
||
| .PHONY: clean | ||
| clean: | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,3 @@ | ||
| #!/bin/bash | ||
|
|
||
| pip3 install SQLAlchemy | ||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure yet! But even
sdist(just emailed about) seems to assume this path, by default.