2 files changed, 97 insertions, 10 deletions
diff --git a/setup/scripts/install_smplayer.cmd b/setup/scripts/install_smplayer.cmd
index 36f81f4..1f66a44 100644
--- a/setup/scripts/install_smplayer.cmd
+++ b/setup/scripts/install_smplayer.cmd
@@ -37,6 +37,7 @@ copy %QT_DIR%\bin\mingwm10.dll %OUTPUT_DIR%
 if %QTVER% geq 4.6.0 (
 copy %QT_DIR%\bin\libgcc_s_dw2-1.dll %OUTPUT_DIR%
 )
+copy openssl\*.dll %OUTPUT_DIR%
 
 mkdir %OUTPUT_DIR%\imageformats
 copy %QT_DIR%\plugins\imageformats\qjpeg4.dll %OUTPUT_DIR%\imageformats\
@@ -69,12 +70,94 @@ svn export --force %SMPLAYER_DIR%\docs %OUTPUT_DIR%\docs
 echo.
 echo ######         Icon Themes         #######
 echo.
-svn export --force %SMPLAYER_THEMES_DIR%\themes %OUTPUT_DIR%\themes
+
+mkdir %OUTPUT_DIR%\themes\
+
+mkdir %OUTPUT_DIR%\themes\Gartoon
+copy %SMPLAYER_THEMES_DIR%\themes\Gartoon\Gartoon.rcc %OUTPUT_DIR%\themes\Gartoon\
+copy %SMPLAYER_THEMES_DIR%\themes\Gartoon\README.txt %OUTPUT_DIR%\themes\Gartoon\
+
+mkdir %OUTPUT_DIR%\themes\Gnome
+copy %SMPLAYER_THEMES_DIR%\themes\Gnome\Gnome.rcc %OUTPUT_DIR%\themes\Gnome\
+copy %SMPLAYER_THEMES_DIR%\themes\Gnome\README.txt %OUTPUT_DIR%\themes\Gnome\
+
+mkdir %OUTPUT_DIR%\themes\Monochrome
+copy %SMPLAYER_THEMES_DIR%\themes\Monochrome\Monochrome.rcc %OUTPUT_DIR%\themes\Monochrome\
+copy %SMPLAYER_THEMES_DIR%\themes\Monochrome\README.txt %OUTPUT_DIR%\themes\Monochrome\
+
+mkdir %OUTPUT_DIR%\themes\Noia
+copy %SMPLAYER_THEMES_DIR%\themes\Noia\Noia.rcc %OUTPUT_DIR%\themes\Noia\
+copy %SMPLAYER_THEMES_DIR%\themes\Noia\README.txt %OUTPUT_DIR%\themes\Noia\
+
+mkdir %OUTPUT_DIR%\themes\Numix-remix
+copy %SMPLAYER_THEMES_DIR%\themes\Numix-remix\Numix-remix.rcc %OUTPUT_DIR%\themes\Numix-remix\
+copy %SMPLAYER_THEMES_DIR%\themes\Numix-remix\README.txt %OUTPUT_DIR%\themes\Numix-remix\
+
+mkdir %OUTPUT_DIR%\themes\Numix-uTouch
+copy %SMPLAYER_THEMES_DIR%\themes\Numix-uTouch\Numix-uTouch.rcc %OUTPUT_DIR%\themes\Numix-uTouch\
+copy %SMPLAYER_THEMES_DIR%\themes\Numix-uTouch\README.txt %OUTPUT_DIR%\themes\Numix-uTouch\
+
+mkdir %OUTPUT_DIR%\themes\Nuvola
+copy %SMPLAYER_THEMES_DIR%\themes\Nuvola\Nuvola.rcc %OUTPUT_DIR%\themes\Nuvola\
+copy %SMPLAYER_THEMES_DIR%\themes\Nuvola\README.txt %OUTPUT_DIR%\themes\Nuvola\
+
+mkdir %OUTPUT_DIR%\themes\Oxygen
+copy %SMPLAYER_THEMES_DIR%\themes\Oxygen\Oxygen.rcc %OUTPUT_DIR%\themes\Oxygen\
+copy %SMPLAYER_THEMES_DIR%\themes\Oxygen\README.txt %OUTPUT_DIR%\themes\Oxygen\
+
+mkdir %OUTPUT_DIR%\themes\Oxygen-Air
+copy %SMPLAYER_THEMES_DIR%\themes\Oxygen-Air\Oxygen-Air.rcc %OUTPUT_DIR%\themes\Oxygen-Air\
+copy %SMPLAYER_THEMES_DIR%\themes\Oxygen-Air\README.txt %OUTPUT_DIR%\themes\Oxygen-Air\
+
+mkdir %OUTPUT_DIR%\themes\Oxygen-Refit
+copy %SMPLAYER_THEMES_DIR%\themes\Oxygen-Refit\Oxygen-Refit.rcc %OUTPUT_DIR%\themes\Oxygen-Refit\
+copy %SMPLAYER_THEMES_DIR%\themes\Oxygen-Refit\README.txt %OUTPUT_DIR%\themes\Oxygen-Refit\
+
+mkdir %OUTPUT_DIR%\themes\Silk
+copy %SMPLAYER_THEMES_DIR%\themes\Silk\Silk.rcc %OUTPUT_DIR%\themes\Silk\
+copy %SMPLAYER_THEMES_DIR%\themes\Silk\README.txt %OUTPUT_DIR%\themes\Silk\
+
+mkdir %OUTPUT_DIR%\themes\Tango
+copy %SMPLAYER_THEMES_DIR%\themes\Tango\Tango.rcc %OUTPUT_DIR%\themes\Tango\
+copy %SMPLAYER_THEMES_DIR%\themes\Tango\README.txt %OUTPUT_DIR%\themes\Tango\
+
+mkdir %OUTPUT_DIR%\themes\blackPanther-Light
+copy %SMPLAYER_THEMES_DIR%\themes\blackPanther-Light\blackPanther-Light.rcc %OUTPUT_DIR%\themes\blackPanther-Light\
+copy %SMPLAYER_THEMES_DIR%\themes\blackPanther-Light\README.txt %OUTPUT_DIR%\themes\blackPanther-Light\
+
+mkdir %OUTPUT_DIR%\themes\blackPanther-Real
+copy %SMPLAYER_THEMES_DIR%\themes\blackPanther-Real\blackPanther-Real.rcc %OUTPUT_DIR%\themes\blackPanther-Real\
+copy %SMPLAYER_THEMES_DIR%\themes\blackPanther-Real\README.txt %OUTPUT_DIR%\themes\blackPanther-Real\
+
+mkdir %OUTPUT_DIR%\themes\blackPanther-VistaLike
+copy %SMPLAYER_THEMES_DIR%\themes\blackPanther-VistaLike\blackPanther-VistaLike.rcc %OUTPUT_DIR%\themes\blackPanther-VistaLike\
+copy %SMPLAYER_THEMES_DIR%\themes\blackPanther-VistaLike\README.txt %OUTPUT_DIR%\themes\blackPanther-VistaLike\
+
 
 echo.
 echo ######         Skins Themes         #######
 echo.
-svn export --force %SMPLAYER_SKINS_DIR%\themes %OUTPUT_DIR%\themes
+
+mkdir %OUTPUT_DIR%\themes\Black
+copy %SMPLAYER_SKINS_DIR%\themes\Black\Black.rcc %OUTPUT_DIR%\themes\Black\
+copy %SMPLAYER_SKINS_DIR%\themes\Black\main.css %OUTPUT_DIR%\themes\Black\
+
+mkdir %OUTPUT_DIR%\themes\Gonzo
+copy %SMPLAYER_SKINS_DIR%\themes\Gonzo\Gonzo.rcc %OUTPUT_DIR%\themes\Gonzo\
+copy %SMPLAYER_SKINS_DIR%\themes\Gonzo\main.css %OUTPUT_DIR%\themes\Gonzo\
+
+mkdir %OUTPUT_DIR%\themes\Mac
+copy %SMPLAYER_SKINS_DIR%\themes\Mac\Mac.rcc %OUTPUT_DIR%\themes\Mac\
+copy %SMPLAYER_SKINS_DIR%\themes\Mac\main.css %OUTPUT_DIR%\themes\Mac\
+
+mkdir %OUTPUT_DIR%\themes\Modern
+copy %SMPLAYER_SKINS_DIR%\themes\Modern\Modern.rcc %OUTPUT_DIR%\themes\Modern\
+copy %SMPLAYER_SKINS_DIR%\themes\Modern\main.css %OUTPUT_DIR%\themes\Modern\
+
+mkdir %OUTPUT_DIR%\themes\Vista
+copy %SMPLAYER_SKINS_DIR%\themes\Vista\Vista.rcc %OUTPUT_DIR%\themes\Vista\
+copy %SMPLAYER_SKINS_DIR%\themes\Vista\main.css %OUTPUT_DIR%\themes\Vista\
+
 
 echo.
 echo ######           MPlayer           #######
diff --git a/setup/scripts/make_pkgs.cmd b/setup/scripts/make_pkgs.cmd
index a81a953..faacb78 100644
--- a/setup/scripts/make_pkgs.cmd
+++ b/setup/scripts/make_pkgs.cmd
@@ -60,15 +60,19 @@ if "%USER_CHOICE%" == "11"  goto pkgver
 goto reask
 
 :pkgver
+if exist "pkg_version" (
+  for /f "tokens=*" %%i in ('type pkg_version') do set ALL_PKG_VER=%%i
+  goto parse_version
+)
 
 echo Format: VER_MAJOR.VER_MINOR.VER_BUILD[.VER_REVISION]
 echo VER_REVISION is optional (set to 0 if blank)
 echo.
-
-:pkgver_again
-Set /p ALL_PKG_VER="Version: "
+:pkgver_manual
+set /p ALL_PKG_VER="Version: "
 echo.
 
+:parse_version
 for /f "tokens=1 delims=." %%j in ("%ALL_PKG_VER%")  do set VER_MAJOR=%%j
 for /f "tokens=2 delims=." %%k in ("%ALL_PKG_VER%")  do set VER_MINOR=%%k
 for /f "tokens=3 delims=." %%l in ("%ALL_PKG_VER%")  do set VER_BUILD=%%l
@@ -77,19 +81,19 @@ for /f "tokens=4 delims=." %%m in ("%ALL_PKG_VER%")  do set VER_REVISION=%%m
 if [%VER_MAJOR%]==[] (
   echo Major Version # must be specified [#.x.x]
   echo.
-  goto pkgver_again
+  goto pkgver_manual
 )
 
 if [%VER_MINOR%]==[] (
   echo Minor Version # must be specified [x.#.x]
   echo.
-  goto pkgver_again
+  goto pkgver_manual
 )
 
 if [%VER_BUILD%]==[] (
   echo Build Version # must be specified [x.x.#]
   echo.
-  goto pkgver_again
+  goto pkgver_manual
 )
 
 if [%VER_REVISION%]==[] (
@@ -195,7 +199,7 @@ copy /y %PORTABLE_EXE_DIR%\smtube-portable.exe %SMPLAYER_PORTABLE_DIR%\smtube.ex
 
 ::
 echo Finalizing package...
-7za a -t7z %OUTPUT_DIR%\smplayer-portable-%ALL_PKG_VER%.7z %SMPLAYER_PORTABLE_DIR% -xr!*.bak* -xr!qxtcore.dll -xr!mplayer64.exe -xr!mencoder.exe -xr!mencoder64.exe -mx9 >nul
+7za a -t7z %OUTPUT_DIR%\smplayer-portable-%ALL_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!buildinfo -xr!buildinfo64 -mx9 >nul
 
 echo.
 echo Restoring source folder(s) back to its original state...
@@ -279,7 +283,7 @@ copy /y %PORTABLE_EXE_DIR%\smtube-portable64.exe %SMPLAYER_PORTABLE_DIR%\smtube.
 
 ::
 echo Finalizing package...
-7za a -t7z %OUTPUT_DIR%\smplayer-portable-%ALL_PKG_VER%-x64.7z %SMPLAYER_PORTABLE_DIR% -xr!*.bak* -xr!qxtcore.dll -xr!mencoder.exe -xr!mencoder64.exe -xr!codecs -mx9 >nul
+7za a -t7z %OUTPUT_DIR%\smplayer-portable-%ALL_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!codecs -xr!buildinfo -xr!buildinfo64 -mx9 >nul
 
 echo.
 echo Restoring source folder(s) back to its original state...