Minor correction (build.bat)

- No ILRepack if "BUILDTYPE == Clean"
- Avoid path names with package version
This commit is contained in:
Waldi Ravens 2016-06-14 10:18:26 +02:00
parent 41ae126dcb
commit 29638abe96

View File

@ -48,15 +48,15 @@ TITLE %BUILDTYPE%ing SubtitleEdit - Release^|Any CPU...
/maxcpucount /consoleloggerparameters:DisableMPLogging;Summary;Verbosity=minimal /maxcpucount /consoleloggerparameters:DisableMPLogging;Summary;Verbosity=minimal
IF %ERRORLEVEL% NEQ 0 GOTO EndWithError IF %ERRORLEVEL% NEQ 0 GOTO EndWithError
IF /I "%BUILDTYPE%" == "Clean" GOTO END
ECHO. ECHO.
ECHO ILRepack... ECHO ILRepack...
"packages\ILRepack.2.0.10\tools\ILRepack.exe" /parallel /internalize /targetplatform:v4 /out:"bin\Release\SubtitleEdit.exe" "bin\Release\SubtitleEdit.exe" "bin\Release\libse.dll" "packages\NHunspell.1.2.5554.16953\lib\net\NHunspell.dll" "packages\zlib.net.1.0.4.0\lib\zlib.net.dll" "DLLs\Interop.QuartzTypeLib.dll" "packages\ILRepack.2.0.10\tools\ILRepack.exe" /parallel /internalize /targetplatform:v4 /out:"bin\Release\SubtitleEdit.exe" "bin\Release\SubtitleEdit.exe" "bin\Release\libse.dll" "bin\Release\zlib.net.dll" "bin\Release\NHunspell.dll" "DLLs\Interop.QuartzTypeLib.dll"
ECHO. ECHO.
ECHO. ECHO.
POPD POPD
IF /I "%BUILDTYPE%" == "Clean" GOTO END
CALL :SubDetectSevenzipPath CALL :SubDetectSevenzipPath
IF DEFINED SEVENZIP IF EXIST "%SEVENZIP%" ( IF DEFINED SEVENZIP IF EXIST "%SEVENZIP%" (
CALL :SubGetVersion CALL :SubGetVersion