Improve installer and ReadMe file.

diff --git a/ReadMe.txt b/ReadMe.txt
index bb78553..075ad2d 100644 (file)
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -1,19 +1,83 @@
+Simple x264 Launcher - use 64-Bit x264 with 32-Bit Avisynth
+Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
 
- Simple x264 Launcher - use 64-Bit x264 with 32-Bit Avisynth
- Copyright (C) 2004-2012 LoRd_MuldeR <MuldeR2@GMX.de>
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+1. Introduction
+---------------
 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+This program is a simple GUI front-end for the x264 H.264/AVC encoder.
+Thanks to Avs2YUV, this program can use the 64-Bit version of x264 with
+the 32-Bit version of Avisynth. This way you can keep on using your
+favorite 32-Bit Avisynth plug-ins (e.g. DGDecodeNV) and still benefit
+from the speed improvements of 64-Bit x264. Of course you can also use
+64-Bit Avisynth, which is still considered experimental, if desired.
+And of course you can use x264's built-in LAVF/FFMS input instead of
+Avisynth just as well. Moreover this program provides full batch
+encoding support. This means that you can run several encoding jobs in
+parallel. Or you can let them run in sequence - one by one.
 
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
- http://www.gnu.org/licenses/gpl-2.0.txt
+2. System Requirements
+----------------------
+
+This program runs on Windows XP with Service Pack 2 and later.
+64-Bit Windows is highly recommended, but 32-Bit Windows works as well.
+The CPU should support at least the MMX and SSE1 instruction sets.
+
+
+3. Anti-Virus Warning
+---------------------
+
+Occasionally your Antivirus program may mistakenly detect "malware"
+(virus, trojan, worm, etc.) in some of the files here. This is called a
+"False Positive" and the files are actually innocent/clean. It´s an
+error in your specific Antivirus software.
+
+In case you encounter such problems, go to http://www.virustotal.com/
+and check the file again with multiple Antivirus engines! And take care
+with results like "suspicious" , "generic" or "packed". Those are *not*
+real hits, they are just wild speculation.
+
+Apparently Antivirus programs tend to suspect installers/uninstaller
+created with NSIS. Furthermore some Antivirus programs blindly suspect
+all UPX´d (packed) executables of being malware. Obviously this is a
+stupid generalization, so you can safely ignore those warnings!
+
+Last but not least: Always keep in mind that this is OpenSource
+software! If you don´t trust the people providing the pre-compiled
+binaries, download the source codes and compile them yourself.
+
+DON´T SUBMIT ANY VIRUS/TROJAN REPORTS, UNLESS YOU HAVE VERIFIED THE
+INFECTION WITH MULTIPLE ANTIVIRUS ENGNINES. THANKS!
+
+
+4. License
+----------
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+http://www.gnu.org/licenses/gpl-2.0.txt
+
+
+5. Help & Support
+-----------------
+
+For help and support, please join the discussion at:
+http://forum.doom9.org/showthread.php?t=144140
+
+Please do NOT send me e-mail with support requests. Thanks!
+
+
+e.o.f.

diff --git a/etc/shortcut.nsh b/etc/shortcut.nsh
index 043299b..62ab57a 100644 (file)
--- a/etc/shortcut.nsh
+++ b/etc/shortcut.nsh
@@ -1,4 +1,3 @@
-#Function createShortcuts
-       MessageBox MB_ICONQUESTION|MB_TOPMOST|MB_YESNO "Create a desktop icon for Simple x264 Launcher?" IDNO +2
-       CreateShortCut "$DESKTOP\Simple x264 Launcher.lnk" "$INSTDIR\x264_launcher.exe"
-#FunctionEnd
+#Create Shortcuts
+MessageBox MB_ICONQUESTION|MB_TOPMOST|MB_YESNO "Create a desktop icon for Simple x264 Launcher?" /SD IDYES IDNO +2
+CreateShortCut "$DESKTOP\Simple x264 Launcher.lnk" "$INSTDIR\x264_launcher.exe"

diff --git a/etc/version.nsh b/etc/version.nsh
new file mode 100644 (file)
index 0000000..d1f292f
--- /dev/null
+++ b/etc/version.nsh
@@ -0,0 +1,15 @@
+!macro X264_VERSIONINFO DATE
+       !searchreplace PRODUCT_VERSION_DATE "${DATE}" "-" "."
+       VIProductVersion "${PRODUCT_VERSION_DATE}.0"
+       VIAddVersionKey "Author" "LoRd_MuldeR <mulder2@gmx.de>"
+       VIAddVersionKey "Comments" "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
+       VIAddVersionKey "CompanyName" "Free Software Foundation"
+       VIAddVersionKey "FileDescription" "Simple x264 Launcher (${DATE})"
+       VIAddVersionKey "FileVersion" "${DATE}"
+       VIAddVersionKey "LegalCopyright" "Copyright 2004-2012 LoRd_MuldeR"
+       VIAddVersionKey "LegalTrademarks" "GNU"
+       VIAddVersionKey "OriginalFilename" "x264_x64.${DATE}.exe"
+       VIAddVersionKey "ProductName" "Simple x264 Launcher"
+       VIAddVersionKey "ProductVersion" "${DATE}"
+       VIAddVersionKey "Website" "http://mulder.at.gg/"
+!macroend

diff --git a/src/version.h b/src/version.h
index 9b8e081..bb9dc91 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -21,7 +21,7 @@
 
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 0
-#define VER_X264_PATCH 66
+#define VER_X264_PATCH 72
 
 #define VER_X264_MINIMUM_REV 2146
 #define VER_X264_CURRENT_API 120

diff --git a/z_build.bat b/z_build.bat
index 5a4b294..cfa92b1 100644 (file)
--- a/z_build.bat
+++ b/z_build.bat
@@ -62,6 +62,7 @@ mkdir "%PACK_PATH%\imageformats"
 mkdir "%PACK_PATH%\toolset"
 copy "%~dp0\bin\Release\*.exe" "%PACK_PATH%"
 copy "%~dp0\bin\Release\toolset\*.exe" "%PACK_PATH%\toolset"
+copy "%~dp0\*.txt" "%PACK_PATH%"
 
 REM ///////////////////////////////////////////////////////////////////////////
 REM // Copy dependencies
@@ -112,6 +113,7 @@ 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 ShowInstDetails show >> "%NSI_FILE%"
 echo !include `${NSISDIR}\Contrib\zip2exe\Base.nsh` >> "%NSI_FILE%"
 echo !include `${NSISDIR}\Contrib\zip2exe\Modern.nsh` >> "%NSI_FILE%"
@@ -121,6 +123,8 @@ 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 ///////////////////////////////////////////////////////////////////////////
 REM // Build the installer