Changeset 181 for smplayer/trunk/setup/scripts

Timestamp:

Aug 31, 2016, 5:31:04 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.8.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• setup/scripts/install_smplayer.cmd (deleted)
• setup/scripts/install_smplayer2.cmd (copied) (copied from smplayer/vendor/current/setup/scripts/install_smplayer2.cmd )
• setup/scripts/make_pkgs.cmd (modified) (9 diffs)

smplayer/trunk/setup/scripts/make_pkgs.cmd

@@ -99 +99 @@
 set VER_REVISION=
 set VER_REV_CMD=
-set DEF_QT5=
 set /p ALL_PKG_VER="Version: "
 echo.
@@ -161 +160 @@
 echo.
 
-if exist %TOP_LEVEL_DIR%\smplayer-build\Qt5Core.dll (
-  set DEF_QT5=/DQT5
-) else (
-  set DEF_QT5=
-)
-
 if exist %TOP_LEVEL_DIR%\smplayer-build (
-  %MAKENSIS_EXE_PATH% /V3 /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% %VER_REV_CMD% %DEF_QT5% %TOP_LEVEL_DIR%\smplayer.nsi
+  %MAKENSIS_EXE_PATH% /V3 /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% %VER_REV_CMD% %TOP_LEVEL_DIR%\smplayer.nsi
 )
 
@@ -177 +170 @@
 echo.
 
-if exist %TOP_LEVEL_DIR%\smplayer-build64\Qt5Core.dll (
-  set DEF_QT5="/DQT5"
-) else (
-  set DEF_QT5=
-)
-
 if exist %TOP_LEVEL_DIR%\smplayer-build64 (
-  %MAKENSIS_EXE_PATH% /V3 /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% %VER_REV_CMD% /DWIN64 %DEF_QT5% %TOP_LEVEL_DIR%\smplayer.nsi
+  %MAKENSIS_EXE_PATH% /V3 /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% %VER_REV_CMD% /DWIN64 %TOP_LEVEL_DIR%\smplayer.nsi
 )
 
@@ -208 +195 @@
 REM )
 
-if exist %TOP_LEVEL_DIR%\smplayer-build\Qt5Core.dll (
-  set QT5_SUFFIX="-qt5"
-  set QT5_OUTPUT_DIR="\Qt5"
-) else (
-  set QT5_SUFFIX=""
-  set QT5_OUTPUT_DIR=""
-)
-
-ren "%SMPLAYER_DIR%" "smplayer-portable-%PORTABLE_PKG_VER%%QT5_SUFFIX%"
-set SMPLAYER_PORTABLE_DIR="%TOP_LEVEL_DIR%\smplayer-portable-%PORTABLE_PKG_VER%%QT5_SUFFIX%"
-
-if not exist "%TOP_LEVEL_DIR%\smplayer-portable-%PORTABLE_PKG_VER%%QT5_SUFFIX%" (
+ren "%SMPLAYER_DIR%" "smplayer-portable-%PORTABLE_PKG_VER%"
+set SMPLAYER_PORTABLE_DIR="%TOP_LEVEL_DIR%\smplayer-portable-%PORTABLE_PKG_VER%"
+
+if not exist "%TOP_LEVEL_DIR%\smplayer-portable-%PORTABLE_PKG_VER%" (
   echo Oops! Unable to find renamed directory, make sure no files are opened.
   goto end
@@ -259 +238 @@
 
 echo Finalizing package...
-7za a -t7z "%OUTPUT_DIR%%QT5_OUTPUT_DIR%\smplayer-portable-%PORTABLE_PKG_VER%%QT5_SUFFIX%.7z" "%SMPLAYER_PORTABLE_DIR%" -xr!*.bak* -xr!qxtcore.dll -xr!mplayer64.exe -xr!mencoder.exe -xr!mencoder64.exe -xr!mplayer64.exe.debug -xr!mencoder64.exe.debug -xr!mplayer.exe.debug -xr!mencoder.exe.debug -xr!gdb.exe -xr!gdb64.exe -xr!vfw2menc.exe -xr!buildinfo -xr!buildinfo64 -xr!buildinfo-mencoder-32 -xr!buildinfo-mencoder-debug-32 -xr!buildinfo-mplayer-32 -xr!buildinfo-mplayer-debug-32 -xr!buildinfo-mencoder-64 -xr!buildinfo-mencoder-debug-64 -xr!buildinfo-mplayer-64 -xr!buildinfo-mplayer-debug-64 -xr!mpv64.exe -xr!mpv64.com -mx9 >nul
+7za a -t7z "%OUTPUT_DIR%\smplayer-portable-%PORTABLE_PKG_VER%.7z" "%SMPLAYER_PORTABLE_DIR%" -xr!*.bak* -xr!qxtcore.dll -xr!mplayer64.exe -xr!mencoder.exe -xr!mencoder64.exe -xr!mplayer64.exe.debug -xr!mencoder64.exe.debug -xr!mplayer.exe.debug -xr!mencoder.exe.debug -xr!gdb.exe -xr!gdb64.exe -xr!vfw2menc.exe -xr!buildinfo -xr!buildinfo64 -xr!buildinfo-mencoder-32 -xr!buildinfo-mencoder-debug-32 -xr!buildinfo-mplayer-32 -xr!buildinfo-mplayer-debug-32 -xr!buildinfo-mencoder-64 -xr!buildinfo-mencoder-debug-64 -xr!buildinfo-mplayer-64 -xr!buildinfo-mplayer-debug-64 -xr!mpv64.exe -xr!mpv64.com -mx9 >nul
 
 echo.
@@ -295 +274 @@
 REM )
 
-if exist %TOP_LEVEL_DIR%\smplayer-build64\Qt5Core.dll (
-  set QT5_SUFFIX="-qt5"
-  set QT5_OUTPUT_DIR="\Qt5"
-) else (
-  set QT5_SUFFIX=""
-  set QT5_OUTPUT_DIR=""
-)
-
-ren "%SMPLAYER_DIR64%" "smplayer-portable-%PORTABLE_PKG_VER%-x64%QT5_SUFFIX%"
-set SMPLAYER_PORTABLE_DIR="%TOP_LEVEL_DIR%\smplayer-portable-%PORTABLE_PKG_VER%-x64%QT5_SUFFIX%"
-
-if not exist "%TOP_LEVEL_DIR%\smplayer-portable-%PORTABLE_PKG_VER%-x64%QT5_SUFFIX%" (
+ren "%SMPLAYER_DIR64%" "smplayer-portable-%PORTABLE_PKG_VER%-x64"
+set SMPLAYER_PORTABLE_DIR="%TOP_LEVEL_DIR%\smplayer-portable-%PORTABLE_PKG_VER%-x64"
+
+if not exist "%TOP_LEVEL_DIR%\smplayer-portable-%PORTABLE_PKG_VER%-x64" (
   echo Oops! Unable to find renamed directory, make sure no files are opened.
   goto end
@@ -360 +331 @@
 
 echo Finalizing package...
-7za a -t7z "%OUTPUT_DIR%%QT5_OUTPUT_DIR%\smplayer-portable-%PORTABLE_PKG_VER%-x64%QT5_SUFFIX%.7z" "%SMPLAYER_PORTABLE_DIR%" -xr!*.bak* -xr!qxtcore.dll -xr!mencoder.exe -xr!mencoder64.exe  -xr!mplayer64.exe.debug -xr!mencoder64.exe.debug -xr!mplayer.exe.debug -xr!mencoder.exe.debug -xr!gdb.exe -xr!gdb64.exe -xr!vfw2menc.exe -xr!codecs -xr!buildinfo -xr!buildinfo64 -xr!buildinfo-mencoder-32 -xr!buildinfo-mencoder-debug-32 -xr!buildinfo-mplayer-32 -xr!buildinfo-mplayer-debug-32 -xr!buildinfo-mencoder-64 -xr!buildinfo-mencoder-debug-64 -xr!buildinfo-mplayer-64 -xr!buildinfo-mplayer-debug-64 -mx9 >nul
+7za a -t7z "%OUTPUT_DIR%\smplayer-portable-%PORTABLE_PKG_VER%-x64.7z" "%SMPLAYER_PORTABLE_DIR%" -xr!*.bak* -xr!qxtcore.dll -xr!mencoder.exe -xr!mencoder64.exe  -xr!mplayer64.exe.debug -xr!mencoder64.exe.debug -xr!mplayer.exe.debug -xr!mencoder.exe.debug -xr!gdb.exe -xr!gdb64.exe -xr!vfw2menc.exe -xr!codecs -xr!buildinfo -xr!buildinfo64 -xr!buildinfo-mencoder-32 -xr!buildinfo-mencoder-debug-32 -xr!buildinfo-mplayer-32 -xr!buildinfo-mplayer-debug-32 -xr!buildinfo-mencoder-64 -xr!buildinfo-mencoder-debug-64 -xr!buildinfo-mplayer-64 -xr!buildinfo-mplayer-debug-64 -mx9 >nul
 
 echo.
@@ -394 +365 @@
 :portablesfx
 
-if exist %TOP_LEVEL_DIR%\smplayer-build\Qt5Core.dll (
-  set DEF_QT5=/DQT5
-) else (
-  set DEF_QT5=
-)
-
 if exist %PORTABLE_EXE_DIR%\smplayer-portable.exe (
   if exist %TOP_LEVEL_DIR%\smplayer-build (
-  %MAKENSIS_EXE_PATH% /V3 /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% %VER_REV_CMD% %DEF_QT5% %TOP_LEVEL_DIR%\smportable.nsi
+  %MAKENSIS_EXE_PATH% /V3 /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% %VER_REV_CMD% %TOP_LEVEL_DIR%\smportable.nsi
   )
-)
-
-if exist %TOP_LEVEL_DIR%\smplayer-build64\Qt5Core.dll (
-  set DEF_QT5=/DQT5
-) else (
-  set DEF_QT5=
 )
 
 if exist %PORTABLE_EXE_DIR%\smplayer-portable64.exe (
   if exist %TOP_LEVEL_DIR%\smplayer-build64 (
-  %MAKENSIS_EXE_PATH% /V3 /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% %VER_REV_CMD% /DWIN64 %DEF_QT5% %TOP_LEVEL_DIR%\smportable.nsi
+  %MAKENSIS_EXE_PATH% /V3 /DVER_MAJOR=%VER_MAJOR% /DVER_MINOR=%VER_MINOR% /DVER_BUILD=%VER_BUILD% %VER_REV_CMD% /DWIN64 %TOP_LEVEL_DIR%\smportable.nsi
   )
 )
@@ -458 +417 @@
 :end
 
-pause
+timeout /t 10
 
 :superend