merge konflikt bereinigt
This commit is contained in:
+2
-2
@@ -6,6 +6,7 @@ for %%i in ("%~1") do (
|
||||
set "EXT=%%~xi"
|
||||
set "DIR=%%~dpi"
|
||||
)
|
||||
call C:\10-Develop\gitrepos\kabellaengen\bin\setenv.bat
|
||||
|
||||
REM echo Dateiname ohne Erweiterung: %FILENAME%
|
||||
REM echo Erweiterung: %EXT%
|
||||
@@ -18,8 +19,6 @@ REM Namen der Ergebnisdateien
|
||||
set ERROR_DOUBLE=%FILENAME%_errors.json
|
||||
set RESULT_TIA=%FILENAME%-*_TIA.xlsx
|
||||
|
||||
|
||||
call C:\kabellaengen\bin\setenv.bat
|
||||
|
||||
|
||||
echo.
|
||||
@@ -44,6 +43,7 @@ if not exist "%PROJECT_WORK%\%RESULT_TIA%" (
|
||||
goto :eof
|
||||
)
|
||||
mkdir %PROJECT_IO_RESULTS%\%FILENAME%
|
||||
echo move %PROJECT_WORK%\%FILENAME%-* %PROJECT_IO_RESULTS%\%FILENAME%
|
||||
move %PROJECT_WORK%\%FILENAME%-* %PROJECT_IO_RESULTS%\%FILENAME%
|
||||
pause
|
||||
goto :eof
|
||||
|
||||
+5
-6
@@ -1,6 +1,8 @@
|
||||
@echo off
|
||||
REM falls Umlaute in den Pfaden sind:
|
||||
chcp 65001 > nul
|
||||
|
||||
set PROJECT=c:\Kabellaengen
|
||||
set PROJECT=c:\10-Develop\gitrepos\Kabellaengen
|
||||
set PROJECT_BIN=%PROJECT%\bin
|
||||
set PROJECT_CFG=%PROJECT%\cfg
|
||||
set PROJECT_DOC=%PROJECT%\doc
|
||||
@@ -15,8 +17,8 @@ set SIVAS_EXCEL_EXPORT_DIR=%PROJECT_DATA%
|
||||
if not exist %PROJECT%\work mkdir %PROJECT%\work
|
||||
if not exist %PROJECT%\data mkdir %PROJECT%\data
|
||||
|
||||
set PROJECT_IO_RESULTS=Z:\Automatisierung\Konvertierungstools\4_io-Konvertierer
|
||||
set PROJECT_BOM_RESULTS=Z:\Automatisierung\Konvertierungstools\3_Kabellaengen-Konvertierer
|
||||
set PROJECT_IO_RESULTS=%PROJECT_WORK%
|
||||
set PROJECT_BOM_RESULTS=%PROJECT_WORK%
|
||||
set INSTALL_DIR="%ONEDRIVE%\Desktop\Kabeltool"
|
||||
|
||||
set PATH=%PROJECT_BIN%;%PATH%
|
||||
@@ -24,6 +26,3 @@ set PATH=%PROJECT_BIN%;%PATH%
|
||||
|
||||
popd
|
||||
goto :eof
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user