Umgebungsvariablen in DXFMAKROS umbenannt
This commit is contained in:
+3
-3
@@ -46,9 +46,9 @@ venv/
|
|||||||
ENV/
|
ENV/
|
||||||
env.bak/
|
env.bak/
|
||||||
venv.bak/
|
venv.bak/
|
||||||
.spyderproject
|
.spyderDXFMAKRO
|
||||||
.spyproject
|
.spyDXFMAKRO
|
||||||
.ropeproject
|
.ropeDXFMAKRO
|
||||||
.mypy_cache/
|
.mypy_cache/
|
||||||
.dmypy.json
|
.dmypy.json
|
||||||
dmypy.json
|
dmypy.json
|
||||||
|
|||||||
@@ -29,15 +29,15 @@ test/
|
|||||||
|
|
||||||
| Variable | Beschreibung |
|
| Variable | Beschreibung |
|
||||||
|----------------|---------------------------|
|
|----------------|---------------------------|
|
||||||
| `PROJECT` | Wurzelverzeichnis |
|
| `DXFMAKRO` | Wurzelverzeichnis |
|
||||||
| `PV_BIN` | Skriptverzeichnis |
|
| `DXFM_BIN` | Skriptverzeichnis |
|
||||||
| `PV_LIB` | Python-Quellcode |
|
| `DXFM_LIB` | Python-Quellcode |
|
||||||
| `PV_CFG` | Konfigurationsdateien |
|
| `DXFM_CFG` | Konfigurationsdateien |
|
||||||
| `PV_DATA` | Eingabedaten |
|
| `DXFM_DATA` | Eingabedaten |
|
||||||
| `PV_LOG` | Log-Dateien |
|
| `DXFM_LOG` | Log-Dateien |
|
||||||
| `PV_RESULTS` | Ergebnisse |
|
| `DXFM_RESULTS` | Ergebnisse |
|
||||||
| `PV_EXAMPLES` | Beispieldateien |
|
| `DXFM_EXAMPLES` | Beispieldateien |
|
||||||
| `PYTHONPATH` | Erweitert um `PV_LIB` |
|
| `PYTHONPATH` | Erweitert um `DXFM_LIB` |
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
|
|||||||
@@ -5,13 +5,13 @@ REM ================================================================
|
|||||||
|
|
||||||
call "%~dp0setenv.bat"
|
call "%~dp0setenv.bat"
|
||||||
|
|
||||||
if not exist "%PROJECT%\.venv" (
|
if not exist "%DXFMAKRO%\.venv" (
|
||||||
echo FEHLER: Virtual environment nicht gefunden.
|
echo FEHLER: Virtual environment nicht gefunden.
|
||||||
echo Bitte zuerst bin\install_py.bat ausfuehren.
|
echo Bitte zuerst bin\install_py.bat ausfuehren.
|
||||||
exit /b 1
|
exit /b 1
|
||||||
)
|
)
|
||||||
|
|
||||||
call "%PROJECT%\.venv\Scripts\activate.bat"
|
call "%DXFMAKRO%\.venv\Scripts\activate.bat"
|
||||||
echo Virtuelle Umgebung aktiviert.
|
echo Virtuelle Umgebung aktiviert.
|
||||||
echo Python-Version:
|
echo Python-Version:
|
||||||
python --version
|
python --version
|
||||||
|
|||||||
@@ -8,13 +8,13 @@
|
|||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
source "$SCRIPT_DIR/setenv.sh"
|
source "$SCRIPT_DIR/setenv.sh"
|
||||||
|
|
||||||
if [ ! -d "$PROJECT/.venv" ]; then
|
if [ ! -d "$DXFMAKRO/.venv" ]; then
|
||||||
echo "FEHLER: Virtual environment nicht gefunden."
|
echo "FEHLER: Virtual environment nicht gefunden."
|
||||||
echo "Bitte zuerst bin/install_py.sh ausfuehren."
|
echo "Bitte zuerst bin/install_py.sh ausfuehren."
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
source "$PROJECT/.venv/bin/activate"
|
source "$DXFMAKRO/.venv/bin/activate"
|
||||||
echo "Virtuelle Umgebung aktiviert."
|
echo "Virtuelle Umgebung aktiviert."
|
||||||
echo "Python-Version:"
|
echo "Python-Version:"
|
||||||
python --version
|
python --version
|
||||||
|
|||||||
+1
-1
@@ -4,4 +4,4 @@ REM TEST - Shell mit gesetzten Umgebungsvariablen oeffnen
|
|||||||
REM ================================================================
|
REM ================================================================
|
||||||
|
|
||||||
call "%~dp0setenv.bat"
|
call "%~dp0setenv.bat"
|
||||||
start cmd /k "echo TEST Umgebung aktiv. && echo PROJECT=%PROJECT%"
|
start cmd /k "echo TEST Umgebung aktiv. && echo DXFMAKRO=%DXFMAKRO%"
|
||||||
|
|||||||
+4
-4
@@ -5,14 +5,14 @@ REM ================================================================
|
|||||||
|
|
||||||
call "%~dp0setenv.bat"
|
call "%~dp0setenv.bat"
|
||||||
|
|
||||||
if not exist "%PROJECT%\.venv" (
|
if not exist "%DXFMAKRO%\.venv" (
|
||||||
echo Initialisiere Python virtual environment...
|
echo Initialisiere Python virtual environment...
|
||||||
py -m venv "%PROJECT%\.venv" --upgrade-deps
|
py -m venv "%DXFMAKRO%\.venv" --upgrade-deps
|
||||||
echo Erfolgreich.
|
echo Erfolgreich.
|
||||||
|
|
||||||
call "%PROJECT%\.venv\Scripts\activate.bat"
|
call "%DXFMAKRO%\.venv\Scripts\activate.bat"
|
||||||
echo Installiere erforderliche Python Packages...
|
echo Installiere erforderliche Python Packages...
|
||||||
pip install -r "%PROJECT%\requirements.txt" -q
|
pip install -r "%DXFMAKRO%\requirements.txt" -q
|
||||||
echo Erfolgreich.
|
echo Erfolgreich.
|
||||||
deactivate
|
deactivate
|
||||||
) else (
|
) else (
|
||||||
|
|||||||
+4
-4
@@ -6,14 +6,14 @@
|
|||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
source "$SCRIPT_DIR/setenv.sh"
|
source "$SCRIPT_DIR/setenv.sh"
|
||||||
|
|
||||||
if [ ! -d "$PROJECT/.venv" ]; then
|
if [ ! -d "$DXFMAKRO/.venv" ]; then
|
||||||
echo "Initialisiere Python virtual environment..."
|
echo "Initialisiere Python virtual environment..."
|
||||||
python3 -m venv "$PROJECT/.venv" --upgrade-deps
|
python3 -m venv "$DXFMAKRO/.venv" --upgrade-deps
|
||||||
echo "Erfolgreich."
|
echo "Erfolgreich."
|
||||||
|
|
||||||
source "$PROJECT/.venv/bin/activate"
|
source "$DXFMAKRO/.venv/bin/activate"
|
||||||
echo "Installiere erforderliche Python Packages..."
|
echo "Installiere erforderliche Python Packages..."
|
||||||
pip install -r "$PROJECT/requirements.txt" -q
|
pip install -r "$DXFMAKRO/requirements.txt" -q
|
||||||
echo "Erfolgreich."
|
echo "Erfolgreich."
|
||||||
deactivate
|
deactivate
|
||||||
else
|
else
|
||||||
|
|||||||
+24
-24
@@ -7,44 +7,44 @@ REM ================================================================
|
|||||||
echo Setting up environment variables for TEST ...
|
echo Setting up environment variables for TEST ...
|
||||||
|
|
||||||
REM Basis-Projektpfad (aktueller Ordner)
|
REM Basis-Projektpfad (aktueller Ordner)
|
||||||
set "PROJECT=%~dp0.."
|
set "DXFMAKRO=%~dp0.."
|
||||||
if "%PROJECT:~-6%"=="bin\.." set "PROJECT=%PROJECT:~0,-6%"
|
if "%DXFMAKRO:~-6%"=="bin\.." set "DXFMAKRO=%DXFMAKRO:~0,-6%"
|
||||||
if "%PROJECT:~-1%"=="\" set "PROJECT=%PROJECT:~0,-1%"
|
if "%DXFMAKRO:~-1%"=="\" set "DXFMAKRO=%DXFMAKRO:~0,-1%"
|
||||||
|
|
||||||
REM Pfade fuer verschiedene Komponenten
|
REM Pfade fuer verschiedene Komponenten
|
||||||
set "PV_BIN=%PROJECT%\bin"
|
set "DXFM_BIN=%DXFMAKRO%\bin"
|
||||||
set "PV_LIB=%PROJECT%\lib"
|
set "DXFM_LIB=%DXFMAKRO%\lib"
|
||||||
set "PV_DATA=%PROJECT%\data"
|
set "DXFM_DATA=%DXFMAKRO%\data"
|
||||||
set "PV_CFG=%PROJECT%\cfg"
|
set "DXFM_CFG=%DXFMAKRO%\cfg"
|
||||||
set "PV_BLOCKS=%PROJECT%\Blocks"
|
set "DXFM_BLOCKS=%DXFMAKRO%\Blocks"
|
||||||
set "PV_LISP=%PROJECT%\Lisp"
|
set "DXFM_LISP=%DXFMAKRO%\Lisp"
|
||||||
|
|
||||||
REM Python-Pfad erweitern (nur wenn noch nicht vorhanden)
|
REM Python-Pfad erweitern (nur wenn noch nicht vorhanden)
|
||||||
echo %PYTHONPATH% | find /i "%PV_LIB%" >nul
|
echo %PYTHONPATH% | find /i "%DXFM_LIB%" >nul
|
||||||
if errorlevel 1 (
|
if errorlevel 1 (
|
||||||
set "PYTHONPATH=%PV_LIB%;%PYTHONPATH%"
|
set "PYTHONPATH=%DXFM_LIB%;%PYTHONPATH%"
|
||||||
)
|
)
|
||||||
|
|
||||||
REM Ordner erstellen falls sie nicht existieren
|
REM Ordner erstellen falls sie nicht existieren
|
||||||
if not exist "%PV_BIN%" mkdir "%PV_BIN%"
|
if not exist "%DXFM_BIN%" mkdir "%DXFM_BIN%"
|
||||||
if not exist "%PV_CFG%" mkdir "%PV_CFG%"
|
if not exist "%DXFM_CFG%" mkdir "%DXFM_CFG%"
|
||||||
if not exist "%PV_LIB%" mkdir "%PV_LIB%"
|
if not exist "%DXFM_LIB%" mkdir "%DXFM_LIB%"
|
||||||
if not exist "%PV_DATA%" mkdir "%PV_DATA%"
|
if not exist "%DXFM_DATA%" mkdir "%DXFM_DATA%"
|
||||||
if not exist "%PV_BLOCKS%" mkdir "%PV_BLOCKS%"
|
if not exist "%DXFM_BLOCKS%" mkdir "%DXFM_BLOCKS%"
|
||||||
if not exist "%PV_LISP%" mkdir "%PV_LISP%"
|
if not exist "%DXFM_LISP%" mkdir "%DXFM_LISP%"
|
||||||
|
|
||||||
REM Umgebungsvariablen anzeigen
|
REM Umgebungsvariablen anzeigen
|
||||||
echo.
|
echo.
|
||||||
echo ================================================================
|
echo ================================================================
|
||||||
echo TEST ENVIRONMENT SETUP COMPLETE
|
echo TEST ENVIRONMENT SETUP COMPLETE
|
||||||
echo ================================================================
|
echo ================================================================
|
||||||
echo PROJECT = %PROJECT%
|
echo DXFMAKRO = %DXFMAKRO%
|
||||||
echo PV_BIN = %PV_BIN%
|
echo DXFM_BIN = %DXFM_BIN%
|
||||||
echo PV_CFG = %PV_CFG%
|
echo DXFM_CFG = %DXFM_CFG%
|
||||||
echo PV_LIB = %PV_LIB%
|
echo DXFM_LIB = %DXFM_LIB%
|
||||||
echo PV_DATA = %PV_DATA%
|
echo DXFM_DATA = %DXFM_DATA%
|
||||||
echo PV_BLOCKS = %PV_BLOCKS%
|
echo DXFM_BLOCKS = %DXFM_BLOCKS%
|
||||||
echo PV_LISP = %PV_LISP%
|
echo DXFM_LISP = %DXFM_LISP%
|
||||||
echo PYTHONPATH = %PYTHONPATH%
|
echo PYTHONPATH = %PYTHONPATH%
|
||||||
echo ================================================================
|
echo ================================================================
|
||||||
echo.
|
echo.
|
||||||
|
|||||||
+20
-20
@@ -9,38 +9,38 @@ echo "Setting up environment variables for TEST ..."
|
|||||||
|
|
||||||
# Basis-Projektpfad (uebergeordnetes Verzeichnis von bin/)
|
# Basis-Projektpfad (uebergeordnetes Verzeichnis von bin/)
|
||||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
export PROJECT="$(cd "$SCRIPT_DIR/.." && pwd)"
|
export DXFMAKRO="$(cd "$SCRIPT_DIR/.." && pwd)"
|
||||||
|
|
||||||
# Pfade fuer verschiedene Komponenten
|
# Pfade fuer verschiedene Komponenten
|
||||||
export PV_BIN="$PROJECT/bin"
|
export DXFM_BIN="$DXFMAKRO/bin"
|
||||||
export PV_LIB="$PROJECT/lib"
|
export DXFM_LIB="$DXFMAKRO/lib"
|
||||||
export PV_DATA="$PROJECT/data"
|
export DXFM_DATA="$DXFMAKRO/data"
|
||||||
export PV_CFG="$PROJECT/cfg"
|
export DXFM_CFG="$DXFMAKRO/cfg"
|
||||||
export PV_LOG="$PROJECT/log"
|
export DXFM_LOG="$DXFMAKRO/log"
|
||||||
export PV_TESTS="$PROJECT/tests"
|
export DXFM_TESTS="$DXFMAKRO/tests"
|
||||||
export PV_RESULTS="$PROJECT/results"
|
export DXFM_RESULTS="$DXFMAKRO/results"
|
||||||
export PV_EXAMPLES="$PROJECT/examples"
|
export DXFM_EXAMPLES="$DXFMAKRO/examples"
|
||||||
|
|
||||||
# Python-Pfad erweitern (nur wenn noch nicht vorhanden)
|
# Python-Pfad erweitern (nur wenn noch nicht vorhanden)
|
||||||
if [[ ":$PYTHONPATH:" != *":$PV_LIB:"* ]]; then
|
if [[ ":$PYTHONPATH:" != *":$DXFM_LIB:"* ]]; then
|
||||||
export PYTHONPATH="$PV_LIB:$PYTHONPATH"
|
export PYTHONPATH="$DXFM_LIB:$PYTHONPATH"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Ordner erstellen falls sie nicht existieren
|
# Ordner erstellen falls sie nicht existieren
|
||||||
mkdir -p "$PV_BIN" "$PV_CFG" "$PV_LIB" "$PV_DATA" "$PV_LOG" "$PV_RESULTS" "$PV_EXAMPLES"
|
mkdir -p "$DXFM_BIN" "$DXFM_CFG" "$DXFM_LIB" "$DXFM_DATA" "$DXFM_LOG" "$DXFM_RESULTS" "$DXFM_EXAMPLES"
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "================================================================"
|
echo "================================================================"
|
||||||
echo "TEST ENVIRONMENT SETUP COMPLETE"
|
echo "TEST ENVIRONMENT SETUP COMPLETE"
|
||||||
echo "================================================================"
|
echo "================================================================"
|
||||||
echo "PROJECT = $PROJECT"
|
echo "DXFMAKRO = $DXFMAKRO"
|
||||||
echo "PV_BIN = $PV_BIN"
|
echo "DXFM_BIN = $DXFM_BIN"
|
||||||
echo "PV_CFG = $PV_CFG"
|
echo "DXFM_CFG = $DXFM_CFG"
|
||||||
echo "PV_LIB = $PV_LIB"
|
echo "DXFM_LIB = $DXFM_LIB"
|
||||||
echo "PV_DATA = $PV_DATA"
|
echo "DXFM_DATA = $DXFM_DATA"
|
||||||
echo "PV_RESULTS = $PV_RESULTS"
|
echo "DXFM_RESULTS = $DXFM_RESULTS"
|
||||||
echo "PV_LOG = $PV_LOG"
|
echo "DXFM_LOG = $DXFM_LOG"
|
||||||
echo "PV_EXAMPLES = $PV_EXAMPLES"
|
echo "DXFM_EXAMPLES = $DXFM_EXAMPLES"
|
||||||
echo "PYTHONPATH = $PYTHONPATH"
|
echo "PYTHONPATH = $PYTHONPATH"
|
||||||
echo "================================================================"
|
echo "================================================================"
|
||||||
echo ""
|
echo ""
|
||||||
|
|||||||
Reference in New Issue
Block a user