Changeset 135 for smplayer/trunk/setup/scripts

Timestamp:

Oct 24, 2012, 8:25:23 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMplayer: update trunk to 0.8.1

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• setup/scripts/install_smplayer.cmd (modified) (1 diff)
• setup/scripts/make_pkgs.cmd (modified) (13 diffs)

smplayer/trunk/setup/scripts/install_smplayer.cmd

@@ -24 +24 @@
 copy %SMPLAYER_DIR%\src\release\smplayer.exe %OUTPUT_DIR%
 copy %SMPLAYER_DIR%\dxlist\release\dxlist.exe %OUTPUT_DIR%
-copy %SMPLAYER_DIR%\zlib-1.2.6\zlib1.dll %OUTPUT_DIR%
+copy %SMPLAYER_DIR%\zlib\zlib1.dll %OUTPUT_DIR%
 copy %SMPLAYER_DIR%\*.txt %OUTPUT_DIR%
 copy %QT_DIR%\bin\QtCore4.dll %OUTPUT_DIR%

smplayer/trunk/setup/scripts/make_pkgs.cmd

@@ -13 +13 @@
 echo * Release Packages
 echo.
-echo 1 - Portable SMPlayer Package
-echo 2 - SMPlayer Package w/o MPlayer
-echo 3 - MPlayer Package
+echo 1 - NSIS SMPlayer Packages
+echo 2 - Portable SMPlayer Package
+echo 3 - SMPlayer Package w/o MPlayer
+echo 4 - MPlayer Package
 echo.
 echo * Update Packages
 echo.
-echo 4 - SMPlayer SVN Update Package
-echo 5 - Qt DLL Package
-
-echo.
-
+echo 5 - SMPlayer SVN Update Package
+echo 6 - Qt DLL Package
+
+echo.
+
+:: Relative directory of all the source files to this script
 set TOP_LEVEL_DIR=..
+
+:: Reset in case ran again in same command prompt instance
+set SMPLAYER_VER=
+
+:: NSIS path
+set NSIS_PATH="C:\Program Files (x86)\NSIS\Unicode"
 
 set SMPLAYER_DIR=%TOP_LEVEL_DIR%\smplayer-build
@@ -36 +44 @@
 echo.
 
-if "%USER_CHOICE%" == "1"     goto portable
-if "%USER_CHOICE%" == "2"     goto nomplayer
-if "%USER_CHOICE%" == "3"     goto mplayer
-if "%USER_CHOICE%" == "4"     goto svn_updpkg
-if "%USER_CHOICE%" == "5"     goto qtdlls
-if "%USER_CHOICE%" == ""      goto end
+if "%USER_CHOICE%" == "1" (
+  goto nsispkg
+
+) else if "%USER_CHOICE%" == "2" (
+  goto portable
+
+) else if "%USER_CHOICE%" == "3" (
+  goto nomplayer
+
+) else if "%USER_CHOICE%" == "4" (
+  goto mplayer
+
+) else if "%USER_CHOICE%" == "5" (
+  goto svn_updpkg
+
+) else if "%USER_CHOICE%" == "6" (
+  goto qtdlls
+
+) else (
+  goto reask
+)
+
+:nsispkg
+
+echo --- Creating SMPlayer NSIS Packages ---
+echo.
+echo Format: VER_MAJOR.VER_MINOR.VER_BUILD.VER_REVISION
+echo Example: 0.8.1.0
+echo.
+echo Note: VER_REVISION must be defined as '0' if not used
+echo.
+
+:: Reset in case ran again in same command prompt instance
+set VER_MAJOR=
+set VER_MINOR=
+set VER_BUILD=
+set VER_REVISION=
+
+set /P VER_MAJOR="VER_MAJOR: "
+set /P VER_MINOR="VER_MINOR: "
+set /P VER_BUILD="VER_BUILD: "
+set /P VER_REVISION="VER_REVISION: "
+
+echo.
+
+if %VER_REVISION% neq 0 (
+
+%NSIS_PATH%\makensis.exe /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% /DVER_REVISION=%VER_REVISION% %TOP_LEVEL_DIR%\smplayer.nsi
+rem %NSIS_PATH%\makensis.exe /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% /DVER_REVISION=%VER_REVISION% /DWIN64 %TOP_LEVEL_DIR%\smplayer.nsi
+rem %NSIS_PATH%\makensis.exe /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% /DVER_REVISION=%VER_REVISION% /DWIN64 %TOP_LEVEL_DIR%\smplayer.full.nsi
+
+) else (
+
+%NSIS_PATH%\makensis.exe /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% %TOP_LEVEL_DIR%\smplayer.nsi
+rem %NSIS_PATH%\makensis.exe /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% /DWIN64 %TOP_LEVEL_DIR%\smplayer.nsi
+rem %NSIS_PATH%\makensis.exe /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% /DWIN64 %TOP_LEVEL_DIR%\smplayer.full.nsi
+
+)
+
+echo.
+
+goto end
 
 :portable
@@ -48 +112 @@
 
 set /P SMPLAYER_VER="SMPlayer Version: "
-if "%SMPLAYER_VER%"=="" exit
-echo.
+if "%SMPLAYER_VER%"=="" goto end
+echo.
+
+:: Check for portable exes
+if not exist %PORTABLE_EXE_DIR%\smplayer-portable.exe (
+  echo SMPlayer portable EXE not found!
+        goto end
+)
+
+if not exist %PORTABLE_EXE_DIR%\smtube-portable.exe (
+  echo SMTube portable EXE not found!
+        goto end
+)
 
 ren %SMPLAYER_DIR% smplayer-portable-%SMPLAYER_VER%
-set SMPLAYER_DIR=%TOP_LEVEL_DIR%\smplayer-portable-%SMPLAYER_VER%
+set SMPLAYER_PORTABLE_DIR=%TOP_LEVEL_DIR%\smplayer-portable-%SMPLAYER_VER%
+
+if not exist %TOP_LEVEL_DIR%\smplayer-portable-%SMPLAYER_VER% (
+  echo Oops! Unable to find renamed directory, make sure no files are opened.
+        goto end
+)
 
 echo.
@@ -58 +138 @@
 echo.
 
-ren %SMPLAYER_DIR%\smplayer.exe smplayer.bak
-ren %SMPLAYER_DIR%\mplayer\mplayer\config config.bak
+ren %SMPLAYER_PORTABLE_DIR%\smplayer.exe smplayer.bak
+ren %SMPLAYER_PORTABLE_DIR%\smtube.exe smtube.bak
+ren %SMPLAYER_PORTABLE_DIR%\mplayer\mplayer\config config.bak
 
 echo.
@@ -65 +146 @@
 echo.
 
-mkdir %SMPLAYER_DIR%\screenshots
+mkdir %SMPLAYER_PORTABLE_DIR%\screenshots
 
 echo.
@@ -71 +152 @@
 echo.
 
-echo [%%General]>> %SMPLAYER_DIR%\smplayer.ini
-echo screenshot_directory=.\\screenshots>> %SMPLAYER_DIR%\smplayer.ini
-echo.>> %SMPLAYER_DIR%\smplayer.ini
-echo [advanced]>> %SMPLAYER_DIR%\smplayer.ini
-echo mplayer_additional_options=-nofontconfig>> %SMPLAYER_DIR%\smplayer.ini
+echo [%%General]>> %SMPLAYER_PORTABLE_DIR%\smplayer.ini
+echo screenshot_directory=.\\screenshots>> %SMPLAYER_PORTABLE_DIR%\smplayer.ini
+echo.>> %SMPLAYER_PORTABLE_DIR%\smplayer.ini
+echo [advanced]>> %SMPLAYER_PORTABLE_DIR%\smplayer.ini
+echo mplayer_additional_options=-nofontconfig>> %SMPLAYER_PORTABLE_DIR%\smplayer.ini
 
 echo.
@@ -81 +162 @@
 echo.
 
-echo [%%General]>> %SMPLAYER_DIR%\smplayer_orig.ini
-echo screenshot_directory=.\\screenshots>> %SMPLAYER_DIR%\smplayer_orig.ini
-echo.>> %SMPLAYER_DIR%\smplayer_orig.ini
-echo [advanced]>> %SMPLAYER_DIR%\smplayer_orig.ini
-echo mplayer_additional_options=-nofontconfig>> %SMPLAYER_DIR%\smplayer_orig.ini
+echo [%%General]>> %SMPLAYER_PORTABLE_DIR%\smplayer_orig.ini
+echo screenshot_directory=.\\screenshots>> %SMPLAYER_PORTABLE_DIR%\smplayer_orig.ini
+echo.>> %SMPLAYER_PORTABLE_DIR%\smplayer_orig.ini
+echo [advanced]>> %SMPLAYER_PORTABLE_DIR%\smplayer_orig.ini
+echo mplayer_additional_options=-nofontconfig>> %SMPLAYER_PORTABLE_DIR%\smplayer_orig.ini
 
 echo.
@@ -91 +172 @@
 echo.
 
-echo ## MPlayer Windows configuration>> %SMPLAYER_DIR%\mplayer\mplayer\config
-echo.>> %SMPLAYER_DIR%\mplayer\mplayer\config
-echo subfont=c:\windows\fonts\arial.ttf>> %SMPLAYER_DIR%\mplayer\mplayer\config
-echo ^<cachedir^>../fontconfig^</cachedir^>> %SMPLAYER_DIR%\mplayer\fonts\local.conf
+echo ## MPlayer Windows configuration>> %SMPLAYER_PORTABLE_DIR%\mplayer\mplayer\config
+echo.>> %SMPLAYER_PORTABLE_DIR%\mplayer\mplayer\config
+echo subfont=c:\windows\fonts\arial.ttf>> %SMPLAYER_PORTABLE_DIR%\mplayer\mplayer\config
+echo ^<cachedir^>../fontconfig^</cachedir^>> %SMPLAYER_PORTABLE_DIR%\mplayer\fonts\local.conf
 
 echo.
@@ -100 +181 @@
 echo.
 
-copy /y %PORTABLE_EXE_DIR%\smplayer-portable.exe %SMPLAYER_DIR%\smplayer.exe
+copy /y %PORTABLE_EXE_DIR%\smplayer-portable.exe %SMPLAYER_PORTABLE_DIR%\smplayer.exe
+copy /y %PORTABLE_EXE_DIR%\smtube-portable.exe %SMPLAYER_PORTABLE_DIR%\smtube.exe
 
 echo.
 echo ######  Creating portable package  #######
 echo.
-7za a -t7z %OUTPUT_DIR%\smplayer-portable-%SMPLAYER_VER%.7z %SMPLAYER_DIR% -xr!*.bak -xr!qxtcore.dll -mx9
+7za a -t7z %OUTPUT_DIR%\smplayer-portable-%SMPLAYER_VER%.7z %SMPLAYER_PORTABLE_DIR% -xr!*.bak -xr!qxtcore.dll -mx9
 
 echo.
 echo Restoring source folder(s) back to its original state...
 echo.
-rmdir %SMPLAYER_DIR%\screenshots
-del %SMPLAYER_DIR%\smplayer.ini
-del %SMPLAYER_DIR%\smplayer_orig.ini
-del %SMPLAYER_DIR%\smplayer.exe
-del %SMPLAYER_DIR%\mplayer\mplayer\config
-del %SMPLAYER_DIR%\mplayer\fonts\local.conf
-ren %SMPLAYER_DIR%\smplayer.bak smplayer.exe
-ren %SMPLAYER_DIR%\mplayer\mplayer\config.bak config
-ren %SMPLAYER_DIR% smplayer-build
+rmdir %SMPLAYER_PORTABLE_DIR%\screenshots
+del %SMPLAYER_PORTABLE_DIR%\smplayer.ini
+del %SMPLAYER_PORTABLE_DIR%\smplayer_orig.ini
+del %SMPLAYER_PORTABLE_DIR%\smplayer.exe
+del %SMPLAYER_PORTABLE_DIR%\smtube.exe
+del %SMPLAYER_PORTABLE_DIR%\mplayer\mplayer\config
+del %SMPLAYER_PORTABLE_DIR%\mplayer\fonts\local.conf
+ren %SMPLAYER_PORTABLE_DIR%\smplayer.bak smplayer.exe
+ren %SMPLAYER_PORTABLE_DIR%\smtube.bak smtube.exe
+ren %SMPLAYER_PORTABLE_DIR%\mplayer\mplayer\config.bak config
+ren %SMPLAYER_PORTABLE_DIR% smplayer-build
 
 goto end
@@ -127 +211 @@
 
 set /P SMPLAYER_VER="SMPlayer Version: "
-if "%SMPLAYER_VER%"=="" exit
+if "%SMPLAYER_VER%"=="" goto end
 echo.
 
@@ -152 +236 @@
 set MPLAYER_DIR=%TOP_LEVEL_DIR%\mplayer-svn-%MP_REV%
 
-7za a -t7z %OUTPUT_DIR%\mplayer-svn-%MP_REV%.7z %MPLAYER_DIR% -mx9
+7za a -t7z %OUTPUT_DIR%\mplayer-svn-%MP_REV%.7z %MPLAYER_DIR% -xr!mencoder.exe -mx9
 
 ren %MPLAYER_DIR% mplayer
@@ -168 +252 @@
 
 set /P SMPLAYER_SVN="SMPlayer SVN Revision: "
-if "%SMPLAYER_SVN%"=="" exit
+if "%SMPLAYER_SVN%"=="" goto end
 
 7za a -t7z %OUTPUT_DIR%\smplayer_update_svn_r%SMPLAYER_SVN%.7z %SMPLAYER_DIR%\smplayer.exe %SMPLAYER_DIR%\translations -mx9
@@ -177 +261 @@
 
 set /P QTVER="Qt Version: "
-if "%QTVER%"=="" exit
+if "%QTVER%"=="" goto end
 
 echo.