Просмотр исходного кода

Makefile adaption for venv usage

master
Dirk Alders 3 лет назад
Родитель
Сommit
a6e0b136ab
1 измененных файлов: 26 добавлений и 9 удалений
  1. 26
    9
      scripts/Makefile

+ 26
- 9
scripts/Makefile Просмотреть файл

@@ -1,7 +1,7 @@
1
-COV2_CMD=python2-coverage
2
-COV3_CMD=python3-coverage
3
-PYT2_CMD=python2
4
-PYT3_CMD=python3
1
+COV2_CMD=venv2/bin/coverage
2
+COV3_CMD=venv3/bin/coverage
3
+PYT2_CMD=venv2/bin/python
4
+PYT3_CMD=venv3/bin/python
5 5
 PDF_CMD=xdg-open
6 6
 
7 7
 OUTDIR=testresults
@@ -33,18 +33,35 @@ short: testrun_short finalise compile status
33 33
 smoke: testrun_smoke finalise compile status
34 34
 single: testrun_single finalise compile status
35 35
 
36
-clean:
37
-	@echo "\033[1;33mCleaning up unittest...\e[0m"
38
-	@echo "\e[1m  * Testresults from last testrun\e[0m"
36
+venv:
37
+	@[[ -d venv2 ]] || make venv2
38
+	@[[ -d venv3 ]] || make venv3
39
+
40
+venv2:
41
+	virtualenv -p /usr/bin/python2 venv2
42
+	venv2/bin/pip install --upgrade pip
43
+	venv2/bin/pip install -r requirements.txt
44
+venv3:
45
+	virtualenv -p /usr/bin/python3 venv3
46
+	venv3/bin/pip install --upgrade pip
47
+	venv3/bin/pip install -r requirements.txt
48
+
49
+clean: venv
50
+	@echo -e "\033[1;33mCleaning up unittest...\e[0m"
51
+	@echo -e "\e[1m  * Testresults from last testrun\e[0m"
39 52
 	@ls testresults | xargs -i echo "    testresults/{}"
40 53
 	@ls testresults | xargs -i rm -f "testresults/{}"
41
-	@echo "\e[1m  * Collected coverage information\e[0m"
54
+	@echo -e "\e[1m  * Collected coverage information\e[0m"
42 55
 	@$(COV3_CMD) erase
43 56
 
57
+cleanall: clean
58
+	@echo -e "\e[1m  * Virtualenv\e[0m"
59
+	@rm -rf venv?
60
+
44 61
 release_testcases:
45 62
 	@$(PYT3_CMD) src/unittest/scripts/unittest.py release_testcases
46 63
 
47
-prepare:
64
+prepare: venv
48 65
 	@$(PYT3_CMD) src/unittest/scripts/unittest.py prepare
49 66
 
50 67
 testrun_full: clean prepare

Загрузка…
Отмена
Сохранить