Changeset 154 for smplayer/vendor/current/setup/scripts

Timestamp:

Feb 21, 2014, 4:44:11 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update vendor to 0.8.6

Location:

smplayer/vendor/current/setup/scripts

Files:

• install_smplayer.cmd (modified) (3 diffs)
• make_pkgs.cmd (modified) (6 diffs)
• make_pkgs64.cmd (added)

smplayer/vendor/current/setup/scripts/install_smplayer.cmd

@@ -6 +6 @@
 echo.
 
-set /P QTVER="Qt Version (Default: 4.7.4): "
-if "%QTVER%"=="" set QTVER=4.7.4
+set /P QTVER="Qt Version (Default: 4.8.4): "
+if "%QTVER%"=="" set QTVER=4.8.4
 
 set OUTPUT_DIR=smplayer-build
@@ -16 +16 @@
 set SMPLAYER_SKINS_DIR=svn\smplayer-skins
 set MPLAYER_DIR=mplayer
-set QT_DIR=C:\QtSDK\Desktop\Qt\%QTVER%\mingw
+rem set QT_DIR=C:\QtSDK\Desktop\Qt\%QTVER%\mingw
+set QT_DIR=C:\Qt\%QTVER%
 
 echo.
@@ -32 +33 @@
 copy %QT_DIR%\bin\QtNetwork4.dll %OUTPUT_DIR%
 copy %QT_DIR%\bin\QtXml4.dll %OUTPUT_DIR%
+copy %QT_DIR%\bin\QtScript4.dll %OUTPUT_DIR%
 copy %QT_DIR%\bin\mingwm10.dll %OUTPUT_DIR%
 if %QTVER% geq 4.6.0 (

smplayer/vendor/current/setup/scripts/make_pkgs.cmd

@@ -57 +57 @@
 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 Format: VER_MAJOR.VER_MINOR.VER_BUILD[.VER_REVISION]
+echo VER_REVISION is optional (set to 0 if blank)
 echo.
 
 :: Reset in case ran again in same command prompt instance
+set NSIS_PKG_VER=
 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
-
+set VER_REV_CMD=
+
+:nsispkgver_again
+Set /p NSIS_PKG_VER="Version: "
+
+for /f "tokens=1 delims=." %%j in ("%NSIS_PKG_VER%")  do set VER_MAJOR=%%j
+for /f "tokens=2 delims=." %%k in ("%NSIS_PKG_VER%")  do set VER_MINOR=%%k
+for /f "tokens=3 delims=." %%l in ("%NSIS_PKG_VER%")  do set VER_BUILD=%%l
+for /f "tokens=4 delims=." %%m in ("%NSIS_PKG_VER%")  do set VER_REVISION=%%m
+
+if [%VER_MAJOR%]==[] (
+  echo Major Version # must be specified [#.x.x]
+  echo.
+  goto nsispkgver_again
+)
+
+if [%VER_MINOR%]==[] (
+  echo Minor Version # must be specified [x.#.x]
+  echo.
+  goto nsispkgver_again
+)
+
+if [%VER_BUILD%]==[] (
+  echo Build Version # must be specified [x.x.#]
+  echo.
+  goto nsispkgver_again
+)
+
+if [%VER_REVISION%]==[] (
+  set VER_REV_CMD=
 ) 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.
+  set VER_REV_CMD= /DVER_REVISION=%VER_REVISION%
+)
+
+if exist %TOP_LEVEL_DIR%\smplayer-build (
+  %NSIS_PATH%\makensis.exe /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD%%VER_REV_CMD% %TOP_LEVEL_DIR%\smplayer.nsi
+)
+
+if exist %TOP_LEVEL_DIR%\smplayer-build64 (
+  %NSIS_PATH%\makensis.exe /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD%%VER_REV_CMD% /DWIN64 %TOP_LEVEL_DIR%\smplayer.nsi
+)
 
 goto end
@@ -122 +139 @@
 
 echo.
-echo ######      Backing up files       #######
+echo Backing up files...
 echo.
 
@@ -130 +147 @@
 
 echo.
-echo ######   Create screenshots dir.   #######
+echo Creating screenshots dir...
 echo.
 
@@ -136 +153 @@
 
 echo.
-echo ######    Create mplayer config    #######
-echo.
-
-echo ## MPlayer Windows configuration>> %SMPLAYER_PORTABLE_DIR%\mplayer\mplayer\config
+echo Creating smplayer.ini...
+echo.
+
+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.
+echo Creating smplayer_orig.ini...
+echo.
+
+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.
+echo Creating mplayer config...
+echo.
+
+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
@@ -145 +182 @@
 
 echo.
-echo ######    Copying portable .exe    #######
+echo Copying portable .exe...
 echo.
 
@@ -152 +189 @@
 
 echo.
-echo ######  Creating portable package  #######
-echo.
-7za a -t7z %OUTPUT_DIR%\smplayer-portable-%SMPLAYER_VER%.7z %SMPLAYER_PORTABLE_DIR% -xr!*.bak -xr!qxtcore.dll -mx9
+echo Finalizing portable package...
+echo.
+7za a -t7z %OUTPUT_DIR%\smplayer-portable-%SMPLAYER_VER%.7z %SMPLAYER_PORTABLE_DIR% -xr!*.bak -xr!qxtcore.dll -xr!mplayer64.exe -mx9
 
 echo.