REM ///////////////////////////////////////////////////////////////////////////
REM // Set Paths
REM ///////////////////////////////////////////////////////////////////////////
-set "MSVC_PATH=C:\Program Files\Microsoft Visual Studio 10.0\VC"
+set "MSVC_PATH=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC"
+set "WSDK_PATH=C:\Program Files (x86)\Windows Kits\10"
set "NSIS_PATH=C:\Program Files\NSIS\Unicode"
-set "QTVC_PATH=C:\Qt\4.8.4"
set "UPX3_PATH=C:\Program Files\UPX"
+set "PDOC_PATH=C:\Program Files\Pandoc"
+set "TOOLS_VER=140"
REM ###############################################
REM # DO NOT MODIFY ANY LINES BELOW THIS LINE !!! #
REM ###############################################
-
REM ///////////////////////////////////////////////////////////////////////////
REM // Setup environment
REM ///////////////////////////////////////////////////////////////////////////
-if exist "%QTVC_PATH%\bin\qtvars.bat" ( call "%QTVC_PATH%\bin\qtvars.bat" )
-if exist "%QTVC_PATH%\bin\qtenv2.bat" ( call "%QTVC_PATH%\bin\qtenv2.bat" )
call "%MSVC_PATH%\vcvarsall.bat" x86
REM ///////////////////////////////////////////////////////////////////////////
echo C++ compiler not found. Please check your MSVC_PATH var!
goto BuildError
)
-if not exist "%QTDIR%\bin\moc.exe" (
- echo Qt meta compiler not found. Please check your QTVC_PATH var!
+if not exist "%PDOC_PATH%\pandoc.exe" (
+ echo Pandoc binary could not be found. Please check your PDOC_PATH var!
goto BuildError
)
if "%ISO_TIME%"=="" goto BuildError
REM ///////////////////////////////////////////////////////////////////////////
+REM // Clean up temp files
+REM ///////////////////////////////////////////////////////////////////////////
+echo ---------------------------------------------------------------------
+echo CLEAN UP
+echo ---------------------------------------------------------------------
+for %%i in (bin,obj,tmp) do (
+ del /Q /S /F "%~dp0\%%i\*.*"
+)
+
+REM ///////////////////////////////////////////////////////////////////////////
REM // Build the binaries
REM ///////////////////////////////////////////////////////////////////////////
echo ---------------------------------------------------------------------
echo BEGIN BUILD
echo ---------------------------------------------------------------------
-MSBuild.exe /property:Configuration=release /target:clean "%~dp0\x264_launcher_MSVC2012.sln"
+MSBuild.exe /property:Configuration=release /target:clean "%~dp0\x264_launcher_MSVC2015.sln"
if not "%ERRORLEVEL%"=="0" goto BuildError
-MSBuild.exe /property:Configuration=release /target:rebuild "%~dp0\x264_launcher_MSVC2012.sln"
+MSBuild.exe /property:Configuration=release /target:rebuild "%~dp0\x264_launcher_MSVC2015.sln"
if not "%ERRORLEVEL%"=="0" goto BuildError
REM ///////////////////////////////////////////////////////////////////////////
mkdir "%PACK_PATH%\imageformats"
mkdir "%PACK_PATH%\toolset\x86"
mkdir "%PACK_PATH%\toolset\x64"
-copy "%~dp0\bin\Release\*.exe" "%PACK_PATH%"
-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\*.txt" "%PACK_PATH%"
+mkdir "%PACK_PATH%\toolset\common"
+mkdir "%PACK_PATH%\sources"
+copy "%~dp0\bin\Win32\Release\x264_launcher.exe" "%PACK_PATH%"
+copy "%~dp0\bin\Win32\Release\MUtils32-?.dll" "%PACK_PATH%"
+copy "%~dp0\bin\Win32\Release\toolset\x86\*.exe" "%PACK_PATH%\toolset\x86"
+copy "%~dp0\bin\Win32\Release\toolset\x86\*.dll" "%PACK_PATH%\toolset\x86"
+copy "%~dp0\bin\Win32\Release\toolset\x64\*.exe" "%PACK_PATH%\toolset\x64"
+copy "%~dp0\bin\Win32\Release\toolset\x64\*.dll" "%PACK_PATH%\toolset\x64"
+copy "%~dp0\bin\Win32\Release\toolset\common\*.exe" "%PACK_PATH%\toolset\common"
+copy "%~dp0\bin\Win32\Release\toolset\common\*.gpg" "%PACK_PATH%\toolset\common"
+copy "%~dp0\etc\sources\*.xz" "%PACK_PATH%\sources"
+copy "%~dp0\LICENSE.html" "%PACK_PATH%"
+copy "%~dp0\*.txt" "%PACK_PATH%"
REM ///////////////////////////////////////////////////////////////////////////
REM // Copy dependencies
REM ///////////////////////////////////////////////////////////////////////////
-for %%i in (100, 110) 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 "%MSVC_PATH%\redist\x86\Microsoft.VC%TOOLS_VER%.CRT\*.dll" "%PACK_PATH%"
+copy "%~dp0\..\Prerequisites\Qt4\v%TOOLS_VER%_xp\Shared\bin\QtCore4.dll" "%PACK_PATH%"
+copy "%~dp0\..\Prerequisites\Qt4\v%TOOLS_VER%_xp\Shared\bin\QtGui4.dll" "%PACK_PATH%"
+copy "%~dp0\..\Prerequisites\Qt4\v%TOOLS_VER%_xp\Shared\bin\QtSvg4.dll" "%PACK_PATH%"
+copy "%~dp0\..\Prerequisites\Qt4\v%TOOLS_VER%_xp\Shared\bin\QtXml4.dll" "%PACK_PATH%"
+copy "%~dp0\..\Prerequisites\Qt4\v%TOOLS_VER%_xp\Shared\bin\QtXml4.dll" "%PACK_PATH%"
+copy "%~dp0\..\Prerequisites\Qt4\v%TOOLS_VER%_xp\Shared\plugins\imageformats\*.dll" "%PACK_PATH%\imageformats"
+del "%PACK_PATH%\imageformats\*d4.dll" 2> NUL
+if %TOOLS_VER% GEQ 140 (
+ copy "%WSDK_PATH%\Redist\ucrt\DLLs\x86\*.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%"
-copy "%QTVC_PATH%\bin\QtXml4.dll" "%PACK_PATH%"
-copy "%QTVC_PATH%\bin\QtXml4.dll" "%PACK_PATH%"
-copy "%QTVC_PATH%\plugins\imageformats\*.dll" "%PACK_PATH%\imageformats"
-del "%PACK_PATH%\imageformats\*d4.dll"
+
+REM ///////////////////////////////////////////////////////////////////////////
+REM // Generate Docs
+REM ///////////////////////////////////////////////////////////////////////////
+"%PDOC_PATH%\pandoc.exe" --from markdown_github+pandoc_title_block+header_attributes+implicit_figures --to html5 --toc -N --standalone -H "%~dp0\etc\css\style.inc" --output "%PACK_PATH%\README.html" "%~dp0\README.md"
REM ///////////////////////////////////////////////////////////////////////////
REM // Compress
REM ///////////////////////////////////////////////////////////////////////////
"%UPX3_PATH%\upx.exe" --brute "%PACK_PATH%\*.exe"
-"%UPX3_PATH%\upx.exe" --best "%PACK_PATH%\*.dll"
+"%UPX3_PATH%\upx.exe" --brute "%PACK_PATH%\MUtils32-?.dll
+"%UPX3_PATH%\upx.exe" --best "%PACK_PATH%\Qt*.dll"
REM ///////////////////////////////////////////////////////////////////////////
REM // Attributes
attrib +R "%PACK_PATH%\*.exe"
attrib +R "%PACK_PATH%\*.dll"
attrib +R "%PACK_PATH%\*.txt"
+attrib +R "%PACK_PATH%\*.html"
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"
+mkdir "%~dp0\out" 2> NUL
+set "OUT_PATH=%~dp0\out\x264_launcher.%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_COMPRESSOR_SOLID >> "%NSI_FILE%"
-echo !define ZIP2EXE_INSTALLDIR `$PROGRAMFILES\MuldeR\Simple x264 Launcher v2` >> "%NSI_FILE%"
-echo !define ZIP2EXE_REGPATH `SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{986E454F-DACA-4326-A9C7-3E46C0BFFDCE}` >> "%NSI_FILE%"
-echo !define MUI_INSTFILESPAGE_COLORS "C5DEFB 000000" >> "%NSI_FILE%"
-echo RequestExecutionLevel Admin >> "%NSI_FILE%"
-echo ShowInstDetails show >> "%NSI_FILE%"
-echo BrandingText `Created: %ISO_DATE%, %ISO_TIME% [Build #%BUILD_NO%]` >> "%NSI_FILE%"
-echo InstallDirRegKey HKLM `${ZIP2EXE_REGPATH}` InstallLocation >> "%NSI_FILE%"
-echo !include `${NSISDIR}\Contrib\zip2exe\Base.nsh` >> "%NSI_FILE%"
-echo SetCompressorDictSize 96 >> "%NSI_FILE%"
-echo !include `${NSISDIR}\Contrib\zip2exe\Modern.nsh` >> "%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%` `%ISO_TIME%` `%BUILD_NO%` >> "%NSI_FILE%"
-echo !insertmacro SECTION_BEGIN >> "%NSI_FILE%"
-echo Delete `$INSTDIR\*.exe` >> "%NSI_FILE%"
-echo Delete `$INSTDIR\*.dll` >> "%NSI_FILE%"
-echo Delete `$INSTDIR\toolset\*.exe` >> "%NSI_FILE%"
-echo Delete `$INSTDIR\toolset\x86\*.exe` >> "%NSI_FILE%"
-echo Delete `$INSTDIR\toolset\x86\*.dll` >> "%NSI_FILE%"
-echo Delete `$INSTDIR\toolset\x64\*.exe` >> "%NSI_FILE%"
-echo Delete `$INSTDIR\toolset\x64\*.dll` >> "%NSI_FILE%"
-echo File /a /r `%PACK_PATH%\*.exe` >> "%NSI_FILE%"
-echo File /a /r `%PACK_PATH%\*.dll` >> "%NSI_FILE%"
-echo File /a /r `%PACK_PATH%\*.txt` >> "%NSI_FILE%"
-echo WriteRegStr HKLM `${ZIP2EXE_REGPATH}` InstallLocation `$INSTDIR` >> "%NSI_FILE%"
-echo !include `%~dp0\etc\shortcut.nsh` >> "%NSI_FILE%"
-echo !insertmacro SECTION_END >> "%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-2016 LoRd_MuldeR ^<MuldeR2@GMX.de^> >> "%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
+
+call "%~dp0\etc\7zSD.cmd" "%OUT_PATH%.sfx" "%OUT_PATH%.exe" "Simple x264/x265 Launcher" "x264_launcher-setup-r%BUILD_NO%"
if not "%ERRORLEVEL%"=="0" goto BuildError
-attrib +R "%OUT_FULL%"
-del "%NSI_FILE%"
+
+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_PATH%.zip"
+
+REM ///////////////////////////////////////////////////////////////////////////
+REM // Clean up
+REM ///////////////////////////////////////////////////////////////////////////
rmdir /Q /S "%PACK_PATH%"
REM ///////////////////////////////////////////////////////////////////////////
OSDN Git Service
