-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove USER_MODE option in the Makefile.
- Loading branch information
Showing
5 changed files
with
7 additions
and
24 deletions.
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
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 |
---|---|---|
|
@@ -6,7 +6,6 @@ | |
# email: [email protected] | ||
|
||
LAUNCHSCRIPT = launch_pyslvs | ||
USER_MODE ?= true | ||
PYSLVS_PATH = depend/pyslvs | ||
PYTHON_SLVS_PATH = depend/solvespace/cython | ||
|
||
|
@@ -44,11 +43,6 @@ all: test | |
help: | ||
@echo Pyslvs Makefile Help | ||
@echo | ||
@echo parameters: | ||
@echo - USER_MODE: install submodule as --user option if not false, | ||
@echo set it as USER_MODE=false to disable it. | ||
@echo default has no sudo required. | ||
@echo | ||
@echo make target: | ||
@echo - help: show this help message. | ||
@echo - all: build Pyslvs and test binary. | ||
|
@@ -66,23 +60,13 @@ help: | |
build-pyslvs: | ||
@echo ---Pyslvs libraries Build--- | ||
-$(PY) -m pip uninstall pyslvs -y | ||
$(eval CMD = cd $(PYSLVS_PATH) && $(PY) setup.py install) | ||
ifneq ($(USER_MODE),false) | ||
$(CMD) --user | ||
else | ||
$(CMD) | ||
endif | ||
cd $(PYSLVS_PATH) && $(PY) setup.py install | ||
@echo ---Done--- | ||
|
||
build-solvespace: | ||
@echo ---Python Solvespace Build--- | ||
-$(PY) -m pip uninstall python_solvespace -y | ||
$(eval CMD = cd $(PYTHON_SLVS_PATH) && $(PY) setup.py install) | ||
ifneq ($(USER_MODE),false) | ||
$(CMD) --user | ||
else | ||
$(CMD) | ||
endif | ||
cd $(PYTHON_SLVS_PATH) && $(PY) setup.py install | ||
@echo ---Done--- | ||
|
||
build-kernel: build-pyslvs build-solvespace | ||
|
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 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 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