X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=z_build.bat;h=6eb1416d2de26aa39260e77a9f0da859c09ec762;hb=086639e37b95f0d7c5f3ec04bfbefbb2ae0a394f;hp=9ab8a95fcb3f1ee139be01d4a7a9e02a5f199617;hpb=5b01c677859aab58a1a487e6a236ef90c9dbbf16;p=x264-launcher%2Fx264-launcher.git diff --git a/z_build.bat b/z_build.bat index 9ab8a95..6eb1416 100644 --- a/z_build.bat +++ b/z_build.bat @@ -2,9 +2,9 @@ REM /////////////////////////////////////////////////////////////////////////// REM // Set Paths REM /////////////////////////////////////////////////////////////////////////// -set "MSVC_PATH=C:\Program Files\Microsoft Visual Studio 10.0\VC" +set "MSVC_PATH=C:\Program Files\Microsoft Visual Studio 12.0\VC" set "NSIS_PATH=C:\Program Files\NSIS\Unicode" -set "QTVC_PATH=C:\MuldeR\Qt\4.8.0" +set "QTVC_PATH=C:\Qt\4.8.5" set "UPX3_PATH=C:\Program Files\UPX" REM ############################################### @@ -40,17 +40,41 @@ if not exist "%QTDIR%\bin\moc.exe" ( ) REM /////////////////////////////////////////////////////////////////////////// +REM // Get current date and time (in ISO format) +REM /////////////////////////////////////////////////////////////////////////// +set "ISO_DATE=" +set "ISO_TIME=" +if not exist "%~dp0\etc\date.exe" BuildError +for /F "tokens=1,2 delims=:" %%a in ('"%~dp0\etc\date.exe" +ISODATE:%%Y-%%m-%%d') do ( + if "%%a"=="ISODATE" set "ISO_DATE=%%b" +) +for /F "tokens=1,2,3,4 delims=:" %%a in ('"%~dp0\etc\date.exe" +ISOTIME:%%T') do ( + if "%%a"=="ISOTIME" set "ISO_TIME=%%b:%%c:%%d" +) +if "%ISO_DATE%"=="" goto BuildError +if "%ISO_TIME%"=="" goto BuildError + +REM /////////////////////////////////////////////////////////////////////////// REM // Build the binaries REM /////////////////////////////////////////////////////////////////////////// echo --------------------------------------------------------------------- echo BEGIN BUILD echo --------------------------------------------------------------------- -MSBuild.exe /property:Configuration=release /target:clean "%~dp0\x264_launcher.sln" +MSBuild.exe /property:Configuration=release /target:clean "%~dp0\x264_launcher_MSVC2013.sln" if not "%ERRORLEVEL%"=="0" goto BuildError -MSBuild.exe /property:Configuration=release /target:rebuild "%~dp0\x264_launcher.sln" +MSBuild.exe /property:Configuration=release /target:rebuild "%~dp0\x264_launcher_MSVC2013.sln" if not "%ERRORLEVEL%"=="0" goto BuildError REM /////////////////////////////////////////////////////////////////////////// +REM // Detect build number +REM /////////////////////////////////////////////////////////////////////////// +set "BUILD_NO=" +for /F "tokens=2,*" %%s in (%~dp0\src\version.h) do ( + if "%%s"=="VER_X264_BUILD" set "BUILD_NO=%%~t" +) +if "%BUILD_NO%"=="" goto BuildError + +REM /////////////////////////////////////////////////////////////////////////// REM // Copy base files REM /////////////////////////////////////////////////////////////////////////// echo --------------------------------------------------------------------- @@ -59,15 +83,28 @@ echo --------------------------------------------------------------------- set "PACK_PATH=%TMP%\~%RANDOM%%RANDOM%.tmp" mkdir "%PACK_PATH%" mkdir "%PACK_PATH%\imageformats" -mkdir "%PACK_PATH%\toolset" +mkdir "%PACK_PATH%\toolset\x86" +mkdir "%PACK_PATH%\toolset\x64" +mkdir "%PACK_PATH%\toolset\common" +mkdir "%PACK_PATH%\sources" copy "%~dp0\bin\Release\*.exe" "%PACK_PATH%" -copy "%~dp0\bin\Release\toolset\*.exe" "%PACK_PATH%\toolset" +copy "%~dp0\bin\Release\toolset\x86\*.exe" "%PACK_PATH%\toolset\x86" +copy "%~dp0\bin\Release\toolset\x86\*.dll" "%PACK_PATH%\toolset\x86" +copy "%~dp0\bin\Release\toolset\x64\*.exe" "%PACK_PATH%\toolset\x64" +copy "%~dp0\bin\Release\toolset\x64\*.dll" "%PACK_PATH%\toolset\x64" +copy "%~dp0\bin\Release\toolset\common\*.exe" "%PACK_PATH%\toolset\common" +copy "%~dp0\bin\Release\toolset\common\*.gpg" "%PACK_PATH%\toolset\common" +copy "%~dp0\etc\sources\*.tar" "%PACK_PATH%\sources" copy "%~dp0\*.txt" "%PACK_PATH%" REM /////////////////////////////////////////////////////////////////////////// REM // Copy dependencies REM /////////////////////////////////////////////////////////////////////////// -copy "%MSVC_PATH%\redist\x86\Microsoft.VC100.CRT\*.dll" "%PACK_PATH%" +for %%i in (100, 110, 120) do ( + if exist "%MSVC_PATH%\redist\x86\Microsoft.VC%%i.CRT\*.dll" ( + copy "%MSVC_PATH%\redist\x86\Microsoft.VC%%i.CRT\msvc?%%i.dll" "%PACK_PATH%" + ) +) copy "%QTVC_PATH%\bin\QtCore4.dll" "%PACK_PATH%" copy "%QTVC_PATH%\bin\QtGui4.dll" "%PACK_PATH%" copy "%QTVC_PATH%\bin\QtSvg4.dll" "%PACK_PATH%" @@ -80,60 +117,69 @@ REM /////////////////////////////////////////////////////////////////////////// REM // Compress REM /////////////////////////////////////////////////////////////////////////// "%UPX3_PATH%\upx.exe" --brute "%PACK_PATH%\*.exe" -"%UPX3_PATH%\upx.exe" --best "%PACK_PATH%\*.dll" +"%UPX3_PATH%\upx.exe" --best "%PACK_PATH%\*.dll" REM /////////////////////////////////////////////////////////////////////////// -REM // Get current date (in ISO format) +REM // Attributes REM /////////////////////////////////////////////////////////////////////////// -if not exist "%~dp0\etc\date.exe" BuildError -for /F "tokens=1,2 delims=:" %%a in ('"%~dp0\etc\date.exe" +ISODATE:%%Y-%%m-%%d') do ( - if "%%a"=="ISODATE" set "ISO_DATE=%%b" -) -if "%ISO_DATE%"=="" BuildError +attrib +R "%PACK_PATH%\*.exe" +attrib +R "%PACK_PATH%\*.dll" +attrib +R "%PACK_PATH%\*.txt" REM /////////////////////////////////////////////////////////////////////////// REM // Setup install parameters REM /////////////////////////////////////////////////////////////////////////// -set "NSI_FILE=%TMP%\~%RANDOM%%RANDOM%.nsi" -set "OUT_NAME=x264_x64.%ISO_DATE%" -set "OUT_PATH=%~dp0\bin" -set "OUT_FULL=%OUT_PATH%\%OUT_NAME%.exe" +set "OUT_PATH=%~dp0bin\x264_x64.%ISO_DATE%" :GenerateOutfileName -if exist "%OUT_FULL%" ( - set "OUT_NAME=%OUT_NAME%.new" - set "OUT_FULL=%OUT_PATH%\%OUT_NAME%.exe" +if exist "%OUT_PATH%.exe" ( + set "OUT_PATH=%OUT_PATH%.new" + goto GenerateOutfileName +) +if exist "%OUT_PATH%.sfx" ( + set "OUT_PATH=%OUT_PATH%.new" + goto GenerateOutfileName +) +if exist "%OUT_PATH%.zip" ( + set "OUT_PATH=%OUT_PATH%.new" goto GenerateOutfileName ) REM /////////////////////////////////////////////////////////////////////////// -REM // Generate install script -REM /////////////////////////////////////////////////////////////////////////// -echo #Generated File - Do NOT modify! > "%NSI_FILE%" -echo !define ZIP2EXE_NAME `Simple x264 Launcher (%ISO_DATE%)` >> "%NSI_FILE%" -echo !define ZIP2EXE_OUTFILE `%OUT_FULL%` >> "%NSI_FILE%" -echo !define ZIP2EXE_COMPRESSOR_LZMA >> "%NSI_FILE%" -echo !define ZIP2EXE_INSTALLDIR `$PROGRAMFILES\MuldeR\Simple x264 Launcher v2` >> "%NSI_FILE%" -echo !define MUI_INSTFILESPAGE_COLORS "C5DEFB 000000" >> "%NSI_FILE%" -echo RequestExecutionLevel Admin >> "%NSI_FILE%" -echo ShowInstDetails show >> "%NSI_FILE%" -echo !include `${NSISDIR}\Contrib\zip2exe\Base.nsh` >> "%NSI_FILE%" -echo !include `${NSISDIR}\Contrib\zip2exe\Modern.nsh` >> "%NSI_FILE%" -echo !insertmacro SECTION_BEGIN >> "%NSI_FILE%" -echo File /r `%PACK_PATH%\*.*` >> "%NSI_FILE%" -echo !include `%~dp0\etc\shortcut.nsh` >> "%NSI_FILE%" -echo !insertmacro SECTION_END >> "%NSI_FILE%" -echo !include `%~dp0\etc\check_os.nsh` >> "%NSI_FILE%" -echo !include `%~dp0\etc\finalization.nsh` >> "%NSI_FILE%" -echo !include `%~dp0\etc\version.nsh` >> "%NSI_FILE%" -echo !insertmacro X264_VERSIONINFO `%ISO_DATE%` >> "%NSI_FILE%" +REM // Create Tag +REM /////////////////////////////////////////////////////////////////////////// +echo Simple x264/x265 Launcher - graphical front-end for x264 and x265 > "%PACK_PATH%\BUILD_TAG.txt" +echo Copyright (C) 2004-2014 LoRd_MuldeR ^ >> "%PACK_PATH%\BUILD_TAG.txt" +echo. >> "%PACK_PATH%\BUILD_TAG.txt" +echo Build #%BUILD_NO%, created on %ISO_DATE% at %ISO_TIME% >> "%PACK_PATH%\BUILD_TAG.txt" +echo. >> "%PACK_PATH%\BUILD_TAG.txt" +echo. >> "%PACK_PATH%\BUILD_TAG.txt" +"%~dp0\etc\cat.exe" "%~dp0\etc\setup\build.nfo" >> "%PACK_PATH%\BUILD_TAG.txt" REM /////////////////////////////////////////////////////////////////////////// REM // Build the installer REM /////////////////////////////////////////////////////////////////////////// -"%NSIS_PATH%\makensis.exe" "%NSI_FILE%" +"%NSIS_PATH%\makensis.exe" "/DX264_UPX_PATH=%UPX3_PATH%" "/DX264_DATE=%ISO_DATE%" "/DX264_BUILD=%BUILD_NO%" "/DX264_OUTPUT_FILE=%OUT_PATH%.sfx" "/DX264_SOURCE_PATH=%PACK_PATH%" "%~dp0\etc\setup\setup.nsi" +if not "%ERRORLEVEL%"=="0" goto BuildError + +"%NSIS_PATH%\makensis.exe" "/DX264_UPX_PATH=%UPX3_PATH%" "/DX264_DATE=%ISO_DATE%" "/DX264_BUILD=%BUILD_NO%" "/DX264_OUTPUT_FILE=%OUT_PATH%.exe" "/DX264_SOURCE_FILE=%OUT_PATH%.sfx" "%~dp0\etc\setup\wrapper.nsi" +if not "%ERRORLEVEL%"=="0" goto BuildError + +attrib +R "%OUT_PATH%.exe" +attrib +R "%OUT_PATH%.sfx" + +REM /////////////////////////////////////////////////////////////////////////// +REM // Build ZIP package +REM /////////////////////////////////////////////////////////////////////////// +pushd "%PACK_PATH%" +"%~dp0\etc\zip.exe" -r -9 -z "%OUT_PATH%.zip" "*.*" < "%PACK_PATH%\BUILD_TAG.txt" +popd + if not "%ERRORLEVEL%"=="0" goto BuildError -attrib +R "%OUT_FULL%" -del "%NSI_FILE%" +attrib +R "%OUT_PATH%.zip" + +REM /////////////////////////////////////////////////////////////////////////// +REM // Clean up +REM /////////////////////////////////////////////////////////////////////////// rmdir /Q /S "%PACK_PATH%" REM ///////////////////////////////////////////////////////////////////////////