Umgebungsvariable heisst jetzt SPS_SKEL
This commit is contained in:
@@ -27,15 +27,15 @@
|
|||||||
|
|
||||||
| Variable | Beschreibung |
|
| Variable | Beschreibung |
|
||||||
|----------------|---------------------------|
|
|----------------|---------------------------|
|
||||||
| `PROJECT` | Wurzelverzeichnis |
|
| `SPS_SKEL` | Wurzelverzeichnis |
|
||||||
| `PV_BIN` | Skriptverzeichnis |
|
| `SKEL_BIN` | Skriptverzeichnis |
|
||||||
| `PV_LIB` | Python-Quellcode |
|
| `SKEL_LIB` | Python-Quellcode |
|
||||||
| `PV_CFG` | Konfigurationsdateien |
|
| `SKEL_CFG` | Konfigurationsdateien |
|
||||||
| `PV_DATA` | Eingabedaten |
|
| `SKEL_DATA` | Eingabedaten |
|
||||||
| `PV_LOG` | Log-Dateien |
|
| `SKEL_LOG` | Log-Dateien |
|
||||||
| `PV_RESULTS` | Ergebnisse |
|
| `SKEL_RESULTS` | Ergebnisse |
|
||||||
| `PV_EXAMPLES` | Beispieldateien |
|
| `SKEL_EXAMPLES` | Beispieldateien |
|
||||||
| `PYTHONPATH` | Erweitert um `PV_LIB` |
|
| `PYTHONPATH` | Erweitert um `SKEL_LIB` |
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
|
|||||||
@@ -5,13 +5,13 @@ REM ================================================================
|
|||||||
|
|
||||||
call "%~dp0setenv.bat"
|
call "%~dp0setenv.bat"
|
||||||
|
|
||||||
if not exist "%PROJECT%\.venv" (
|
if not exist "%SPS_SKEL%\.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 "%SPS_SKEL%\.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 "$SPS_SKEL/.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 "$SPS_SKEL/.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 SPS_SKEL - Shell mit gesetzten Umgebungsvariablen oeffnen
|
|||||||
REM ================================================================
|
REM ================================================================
|
||||||
|
|
||||||
call "%~dp0setenv.bat"
|
call "%~dp0setenv.bat"
|
||||||
start cmd /k "echo SPS_SKEL Umgebung aktiv. && echo PROJECT=%PROJECT%"
|
start cmd /k "echo SPS_SKEL Umgebung aktiv. && echo SPS_SKEL=%SPS_SKEL%"
|
||||||
|
|||||||
+4
-4
@@ -5,14 +5,14 @@ REM ================================================================
|
|||||||
|
|
||||||
call "%~dp0setenv.bat"
|
call "%~dp0setenv.bat"
|
||||||
|
|
||||||
if not exist "%PROJECT%\.venv" (
|
if not exist "%SPS_SKEL%\.venv" (
|
||||||
echo Initialisiere Python virtual environment...
|
echo Initialisiere Python virtual environment...
|
||||||
py -m venv "%PROJECT%\.venv" --upgrade-deps
|
py -m venv "%SPS_SKEL%\.venv" --upgrade-deps
|
||||||
echo Erfolgreich.
|
echo Erfolgreich.
|
||||||
|
|
||||||
call "%PROJECT%\.venv\Scripts\activate.bat"
|
call "%SPS_SKEL%\.venv\Scripts\activate.bat"
|
||||||
echo Installiere erforderliche Python Packages...
|
echo Installiere erforderliche Python Packages...
|
||||||
pip install -r "%PROJECT%\requirements.txt" -q
|
pip install -r "%SPS_SKEL%\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 "$SPS_SKEL/.venv" ]; then
|
||||||
echo "Initialisiere Python virtual environment..."
|
echo "Initialisiere Python virtual environment..."
|
||||||
python3 -m venv "$PROJECT/.venv" --upgrade-deps
|
python3 -m venv "$SPS_SKEL/.venv" --upgrade-deps
|
||||||
echo "Erfolgreich."
|
echo "Erfolgreich."
|
||||||
|
|
||||||
source "$PROJECT/.venv/bin/activate"
|
source "$SPS_SKEL/.venv/bin/activate"
|
||||||
echo "Installiere erforderliche Python Packages..."
|
echo "Installiere erforderliche Python Packages..."
|
||||||
pip install -r "$PROJECT/requirements.txt" -q
|
pip install -r "$SPS_SKEL/requirements.txt" -q
|
||||||
echo "Erfolgreich."
|
echo "Erfolgreich."
|
||||||
deactivate
|
deactivate
|
||||||
else
|
else
|
||||||
|
|||||||
+29
-29
@@ -4,7 +4,7 @@ REM ================================================================
|
|||||||
REM SPS_SKEL - Umgebungsvariablen Setup
|
REM SPS_SKEL - Umgebungsvariablen Setup
|
||||||
REM ================================================================
|
REM ================================================================
|
||||||
|
|
||||||
if defined PV_BIN (
|
if defined SKEL_BIN (
|
||||||
echo SPS_SKEL Umgebung bereits gesetzt.
|
echo SPS_SKEL Umgebung bereits gesetzt.
|
||||||
goto :show
|
goto :show
|
||||||
)
|
)
|
||||||
@@ -12,34 +12,34 @@ if defined PV_BIN (
|
|||||||
echo Setting up environment variables for SPS_SKEL ...
|
echo Setting up environment variables for SPS_SKEL ...
|
||||||
|
|
||||||
REM Basis-Projektpfad (aktueller Ordner)
|
REM Basis-Projektpfad (aktueller Ordner)
|
||||||
set "PROJECT=%~dp0.."
|
set "SPS_SKEL=%~dp0.."
|
||||||
if "%PROJECT:~-6%"=="bin\.." set "PROJECT=%PROJECT:~0,-6%"
|
if "%SPS_SKEL:~-6%"=="bin\.." set "SPS_SKEL=%SPS_SKEL:~0,-6%"
|
||||||
if "%PROJECT:~-1%"=="\" set "PROJECT=%PROJECT:~0,-1%"
|
if "%SPS_SKEL:~-1%"=="\" set "SPS_SKEL=%SPS_SKEL:~0,-1%"
|
||||||
|
|
||||||
REM Pfade fuer verschiedene Komponenten
|
REM Pfade fuer verschiedene Komponenten
|
||||||
set "PV_BIN=%PROJECT%\bin"
|
set "SKEL_BIN=%SPS_SKEL%\bin"
|
||||||
set "PV_LIB=%PROJECT%\lib"
|
set "SKEL_LIB=%SPS_SKEL%\lib"
|
||||||
set "PV_DATA=%PROJECT%\data"
|
set "SKEL_DATA=%SPS_SKEL%\data"
|
||||||
set "PV_CFG=%PROJECT%\cfg"
|
set "SKEL_CFG=%SPS_SKEL%\cfg"
|
||||||
set "PV_LOG=%PROJECT%\log"
|
set "SKEL_LOG=%SPS_SKEL%\log"
|
||||||
set "PV_TESTS=%PROJECT%\tests"
|
set "SKEL_TESTS=%SPS_SKEL%\tests"
|
||||||
set "PV_RESULTS=%PROJECT%\results"
|
set "SKEL_RESULTS=%SPS_SKEL%\results"
|
||||||
set "PV_EXAMPLES=%PROJECT%\examples"
|
set "SKEL_EXAMPLES=%SPS_SKEL%\examples"
|
||||||
|
|
||||||
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 "%SKEL_LIB%" >nul
|
||||||
if errorlevel 1 (
|
if errorlevel 1 (
|
||||||
set "PYTHONPATH=%PV_LIB%;%PYTHONPATH%"
|
set "PYTHONPATH=%SKEL_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 "%SKEL_BIN%" mkdir "%SKEL_BIN%"
|
||||||
if not exist "%PV_CFG%" mkdir "%PV_CFG%"
|
if not exist "%SKEL_CFG%" mkdir "%SKEL_CFG%"
|
||||||
if not exist "%PV_LIB%" mkdir "%PV_LIB%"
|
if not exist "%SKEL_LIB%" mkdir "%SKEL_LIB%"
|
||||||
if not exist "%PV_DATA%" mkdir "%PV_DATA%"
|
if not exist "%SKEL_DATA%" mkdir "%SKEL_DATA%"
|
||||||
if not exist "%PV_LOG%" mkdir "%PV_LOG%"
|
if not exist "%SKEL_LOG%" mkdir "%SKEL_LOG%"
|
||||||
if not exist "%PV_RESULTS%" mkdir "%PV_RESULTS%"
|
if not exist "%SKEL_RESULTS%" mkdir "%SKEL_RESULTS%"
|
||||||
if not exist "%PV_EXAMPLES%" mkdir "%PV_EXAMPLES%"
|
if not exist "%SKEL_EXAMPLES%" mkdir "%SKEL_EXAMPLES%"
|
||||||
|
|
||||||
REM Umgebungsvariablen anzeigen
|
REM Umgebungsvariablen anzeigen
|
||||||
:show
|
:show
|
||||||
@@ -47,14 +47,14 @@ echo.
|
|||||||
echo ================================================================
|
echo ================================================================
|
||||||
echo SPS_SKEL ENVIRONMENT SETUP COMPLETE
|
echo SPS_SKEL ENVIRONMENT SETUP COMPLETE
|
||||||
echo ================================================================
|
echo ================================================================
|
||||||
echo PROJECT = %PROJECT%
|
echo SPS_SKEL = %SPS_SKEL%
|
||||||
echo PV_BIN = %PV_BIN%
|
echo SKEL_BIN = %SKEL_BIN%
|
||||||
echo PV_CFG = %PV_CFG%
|
echo SKEL_CFG = %SKEL_CFG%
|
||||||
echo PV_LIB = %PV_LIB%
|
echo SKEL_LIB = %SKEL_LIB%
|
||||||
echo PV_DATA = %PV_DATA%
|
echo SKEL_DATA = %SKEL_DATA%
|
||||||
echo PV_RESULTS = %PV_RESULTS%
|
echo SKEL_RESULTS = %SKEL_RESULTS%
|
||||||
echo PV_LOG = %PV_LOG%
|
echo SKEL_LOG = %SKEL_LOG%
|
||||||
echo PV_EXAMPLES = %PV_EXAMPLES%
|
echo SKEL_EXAMPLES = %SKEL_EXAMPLES%
|
||||||
echo PYTHONPATH = %PYTHONPATH%
|
echo PYTHONPATH = %PYTHONPATH%
|
||||||
echo ================================================================
|
echo ================================================================
|
||||||
echo.
|
echo.
|
||||||
|
|||||||
+20
-20
@@ -9,38 +9,38 @@ echo "Setting up environment variables for SPS_SKEL ..."
|
|||||||
|
|
||||||
# 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 SPS_SKEL="$(cd "$SCRIPT_DIR/.." && pwd)"
|
||||||
|
|
||||||
# Pfade fuer verschiedene Komponenten
|
# Pfade fuer verschiedene Komponenten
|
||||||
export PV_BIN="$PROJECT/bin"
|
export SKEL_BIN="$SPS_SKEL/bin"
|
||||||
export PV_LIB="$PROJECT/lib"
|
export SKEL_LIB="$SPS_SKEL/lib"
|
||||||
export PV_DATA="$PROJECT/data"
|
export SKEL_DATA="$SPS_SKEL/data"
|
||||||
export PV_CFG="$PROJECT/cfg"
|
export SKEL_CFG="$SPS_SKEL/cfg"
|
||||||
export PV_LOG="$PROJECT/log"
|
export SKEL_LOG="$SPS_SKEL/log"
|
||||||
export PV_TESTS="$PROJECT/tests"
|
export SKEL_TESTS="$SPS_SKEL/tests"
|
||||||
export PV_RESULTS="$PROJECT/results"
|
export SKEL_RESULTS="$SPS_SKEL/results"
|
||||||
export PV_EXAMPLES="$PROJECT/examples"
|
export SKEL_EXAMPLES="$SPS_SKEL/examples"
|
||||||
|
|
||||||
# Python-Pfad erweitern (nur wenn noch nicht vorhanden)
|
# Python-Pfad erweitern (nur wenn noch nicht vorhanden)
|
||||||
if [[ ":$PYTHONPATH:" != *":$PV_LIB:"* ]]; then
|
if [[ ":$PYTHONPATH:" != *":$SKEL_LIB:"* ]]; then
|
||||||
export PYTHONPATH="$PV_LIB:$PYTHONPATH"
|
export PYTHONPATH="$SKEL_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 "$SKEL_BIN" "$SKEL_CFG" "$SKEL_LIB" "$SKEL_DATA" "$SKEL_LOG" "$SKEL_RESULTS" "$SKEL_EXAMPLES"
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "================================================================"
|
echo "================================================================"
|
||||||
echo "SPS_SKEL ENVIRONMENT SETUP COMPLETE"
|
echo "SPS_SKEL ENVIRONMENT SETUP COMPLETE"
|
||||||
echo "================================================================"
|
echo "================================================================"
|
||||||
echo "PROJECT = $PROJECT"
|
echo "SPS_SKEL = $SPS_SKEL"
|
||||||
echo "PV_BIN = $PV_BIN"
|
echo "SKEL_BIN = $SKEL_BIN"
|
||||||
echo "PV_CFG = $PV_CFG"
|
echo "SKEL_CFG = $SKEL_CFG"
|
||||||
echo "PV_LIB = $PV_LIB"
|
echo "SKEL_LIB = $SKEL_LIB"
|
||||||
echo "PV_DATA = $PV_DATA"
|
echo "SKEL_DATA = $SKEL_DATA"
|
||||||
echo "PV_RESULTS = $PV_RESULTS"
|
echo "SKEL_RESULTS = $SKEL_RESULTS"
|
||||||
echo "PV_LOG = $PV_LOG"
|
echo "SKEL_LOG = $SKEL_LOG"
|
||||||
echo "PV_EXAMPLES = $PV_EXAMPLES"
|
echo "SKEL_EXAMPLES = $SKEL_EXAMPLES"
|
||||||
echo "PYTHONPATH = $PYTHONPATH"
|
echo "PYTHONPATH = $PYTHONPATH"
|
||||||
echo "================================================================"
|
echo "================================================================"
|
||||||
echo ""
|
echo ""
|
||||||
|
|||||||
Reference in New Issue
Block a user