X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=z_build.bat;h=6eb1416d2de26aa39260e77a9f0da859c09ec762;hb=086639e37b95f0d7c5f3ec04bfbefbb2ae0a394f;hp=e3d00163a2ceb35a11a32c4f9825a64096faf46a;hpb=d51294e088e86adfed04059e2d1ee204450f6af0;p=x264-launcher%2Fx264-launcher.git

diff --git a/z_build.bat b/z_build.bat
index e3d0016..6eb1416 100644
--- a/z_build.bat
+++ b/z_build.bat
@@ -86,6 +86,7 @@ mkdir "%PACK_PATH%\imageformats"
 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\x86\*.exe" "%PACK_PATH%\toolset\x86"
 copy "%~dp0\bin\Release\toolset\x86\*.dll" "%PACK_PATH%\toolset\x86"
@@ -93,6 +94,7 @@ 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 ///////////////////////////////////////////////////////////////////////////
@@ -127,61 +129,57 @@ 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_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-2014 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
+
+"%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 ///////////////////////////////////////////////////////////////////////////