Component name includes pgwui_ prefix

diff --git a/Makefile b/Makefile
index 4603965ba87ce95f9560a63be05c4bdde4565b1e..c5e52f3a937d85ffd95566179775bb6c5c97ec20 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,5 +20,5 @@
 
 # Karl O. Pinc <kop@karlpinc.com>
 
-PGWUI_NAME := server
+PGWUI_COMPONENT := pgwui_server
 include Makefile_pgwui.mk

diff --git a/Makefile_pgwui.mk b/Makefile_pgwui.mk
index 4787deb9fc5966c071bee2ee100e8eb4dd9b921d..4ead50e66540f4cfe5a4d5428b317185c60362e7 100644 (file)
--- a/Makefile_pgwui.mk
+++ b/Makefile_pgwui.mk
@@ -25,7 +25,7 @@
 #
 
 # Variables to customize:
-# PGWUI_NAME := example
+# PGWUI_COMPONENT := pgwui_example
 
 
 # This works on debian...
@@ -34,10 +34,10 @@ VIRTUALENV=virtualenv -p ${PYTHON_EXE}
 
 TARGETS =
 EXTRA_TARGETS = README.html
-SETUPTOOLS_STUFF = build dist src/pgwui_${PGWUI_NAME}.egg-info
+SETUPTOOLS_STUFF = build dist src/${PGWUI_COMPONENT}.egg-info
 PYTEST_STUFF = .cache                                      \
-            src/pgwui_${PGWUI_NAME}/__pycache__            \
-            src/pgwui_${PGWUI_NAME}/views/__pycache__      \
+            src/${PGWUI_COMPONENT}/__pycache__            \
+            src/${PGWUI_COMPONENT}/views/__pycache__      \
             tests/__pycache__ tests/views/__pycache__
 COVERAGE_STUFF = .coverage
 TOX_STUFF = .tox
@@ -122,14 +122,14 @@ upload:
 .PHONY: check
 check: devel/pytest
        devel/pytest/bin/flake8 .
-       devel/pytest/bin/py.test --cov=pgwui_${PGWUI_NAME} tests
+       devel/pytest/bin/py.test --cov=${PGWUI_COMPONENT} tests
 
 ## check-unit          Quick run of unit regression tests,
 ##                     only with the default python
 .PHONY: check-unit
 check-unit: devel/pytest
        devel/pytest/bin/flake8 .
-       devel/pytest/bin/py.test -m unittest --cov=pgwui_${PGWUI_NAME} tests
+       devel/pytest/bin/py.test -m unittest --cov=${PGWUI_COMPONENT} tests
 
 ## check-integration   Quick run of integration regression tests,
 ##                     only with the default python
@@ -137,7 +137,7 @@ check-unit: devel/pytest
 check-integration: devel/pytest
        devel/pytest/bin/flake8 .
        devel/pytest/bin/py.test -m integrationtest \
-                                --cov=pgwui_${PGWUI_NAME} tests
+                                --cov=${PGWUI_COMPONENT} tests
 
 ## check-debug         Start a regression test and drop into the Pdb
 ##                     debugger.  Variables designate the test file
@@ -208,14 +208,14 @@ devel/pytest: devel dist
             devel/pytest/bin/pip install --upgrade pip ; \
             devel/pytest/bin/pip install --upgrade setuptools ; \
             devel/pytest/bin/pip install --upgrade wheel ; \
-            devel/pytest/bin/pip install dist/pgwui_${PGWUI_NAME}-*.tar.gz ; \
+            devel/pytest/bin/pip install dist/${PGWUI_COMPONENT}-*.tar.gz ; \
             devel/pytest/bin/pip install flake8 ; \
             devel/pytest/bin/pip install pytest-cov ; \
             devel/pytest/bin/pip install -e '.[testing]' ; \
           ) \
        else \
-          ( devel/pytest/bin/pip uninstall -y pgwui_${PGWUI_NAME} ; \
-            devel/pytest/bin/pip install dist/pgwui_${PGWUI_NAME}-*.tar.gz ; \
+          ( devel/pytest/bin/pip uninstall -y ${PGWUI_COMPONENT} ; \
+            devel/pytest/bin/pip install dist/${PGWUI_COMPONENT}-*.tar.gz ; \
             devel/pytest/bin/pip install -e '.[testing]' ; \
             ) ; \
        fi
@@ -227,13 +227,13 @@ devel/pudb: devel dist
            devel/pudb/bin/pip install --upgrade pip ; \
            devel/pudb/bin/pip install --upgrade setuptools ; \
            devel/pudb/bin/pip install --upgrade wheel ; \
-           devel/pudb/bin/pip install dist/pgwui_${PGWUI_NAME}-*.tar.gz ; \
+           devel/pudb/bin/pip install dist/${PGWUI_COMPONENT}-*.tar.gz ; \
            devel/pudb/bin/pip install -e '.[testing]' ; \
            devel/pudb/bin/pip install pudb ; \
          ) \
        else \
-         ( devel/pudb/bin/pip uninstall -y pgwui_${PGWUI_NAME} ; \
+         ( devel/pudb/bin/pip uninstall -y ${PGWUI_COMPONENT} ; \
            devel/pudb/bin/pip install -e '.[testing]' ; \
-           devel/pudb/bin/pip install dist/pgwui_${PGWUI_NAME}-*.tar.gz \
+           devel/pudb/bin/pip install dist/${PGWUI_COMPONENT}-*.tar.gz \
          ) ; \
        fi