diff --git a/source/changelog.md b/source/changelog.md index 6867db52..a4710bb4 100644 --- a/source/changelog.md +++ b/source/changelog.md @@ -1,6 +1,9 @@ ChanSort Change Log =================== +2020-03-15 +- repackaged to include Polish translation files + 2020-03-14 - check for updates can now handle multiple updates on a specific day - fixed applying favorites from a reference list (it showed fav letters on the channels, but the fav lists were empty) diff --git a/source/makeDistribZip.cmd b/source/makeDistribZip.cmd index f094c3d1..62d0162f 100644 --- a/source/makeDistribZip.cmd +++ b/source/makeDistribZip.cmd @@ -3,38 +3,33 @@ setlocal setlocal enabledelayedexpansion cd /d %~dp0 +set languages=cs de es pl pt ru set curdate=%date:~6,4%-%date:~3,2%-%date:~0,2% set target=%cd%\..\..\ChanSort_%curdate% set DXversion=19.2 mkdir "%target%" 2>nul -del /s /q "%target%\*" -copy debug\ChanSort.exe* "%target%" -copy debug\ChanSort.*.dll "%target%" -copy debug\ChanSort.ico "%target%" -copy debug\ChanSort.*.ini "%target%" -copy debug\Lookup.csv "%target%" -copy DLL\* "%target%" +rem del /s /q "%target%\*" +xcopy /idy debug\ChanSort.exe* "%target%" +xcopy /idy debug\ChanSort.*.dll "%target%" +xcopy /idy debug\ChanSort.ico "%target%" +xcopy /idy debug\ChanSort.*.ini "%target%" +xcopy /idy debug\Lookup.csv "%target%" +xcopy /idy DLL\* "%target%" del "%target%\*nunit*.dll" -mkdir "%target%\de" 2>nul -mkdir "%target%\pt" 2>nul -mkdir "%target%\ru" 2>nul -mkdir "%target%\cs" 2>nul -mkdir "%target%\es" 2>nul +for %%l in (%languages%) do ( + mkdir "%target%\%%l" 2>nul + xcopy /sidy debug\%%l "%target%\%%l" +) mkdir "%target%\ReferenceLists" 2>nul -xcopy /siy debug\de "%target%\de" -xcopy /siy debug\pt "%target%\pt" -xcopy /siy debug\ru "%target%\ru" -xcopy /siy debug\cs "%target%\cs" -xcopy /siy debug\es "%target%\es" -xcopy /siy ChanSort\ReferenceLists\* "%target%\ReferenceLists" -copy ..\readme.md "%target%\readme.txt" -copy changelog.md "%target%\changelog.txt" +xcopy /sidy ChanSort\ReferenceLists\* "%target%\ReferenceLists" +xcopy /idy ..\readme.md "%target%\readme.txt" +xcopy /idy changelog.md "%target%\changelog.txt" for %%f in (Utils Data DataAccess Printing XtraPrinting XtraReports XtraEditors XtraBars XtraGrid XtraLayout XtraTreeList) do call :copyDll %%f call :CodeSigning cd .. del Website\ChanSort.zip 2>nul -copy Source\readme.txt %target% +xcopy /idy readme.* %target% cd %target%\.. "c:\program files\7-Zip\7z.exe" a -tzip ChanSort_%curdate%.zip ChanSort_%curdate% @@ -50,33 +45,40 @@ rem ----------------------------- set signtool="C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64\signtool.exe" set oldcd=%cd% cd %target% -set files=ChanSort.exe ChanSort*.dll de\ChanSort*.dll ru\ChanSort*.dll pt\ChanSort*.dll cs\ChanSort*.dll es\ChanSort*.dll +call :signBatch ChanSort.exe ChanSort*.dll +if errorlevel 1 goto :error +set files= +for %%l in (%languages%) do ( + call :signBatch "%%l\ChanSort*.dll" + if errorlevel 1 goto :error +) +cd %oldcd% +goto:eof +:signBatch set todo= -for %%f in (%files%) do ( +for %%f in (%*) do ( %signtool% verify /pa "%%f" >nul 2>nul if errorlevel 1 set todo=!todo! "%%f" ) if "%todo%" == "" goto:skipCodeSigning %signtool% sign /a /t "http://timestamp.comodoca.com/authenticode" %todo% -if errorlevel 1 goto :error :skipCodeSigning -cd %oldcd% goto:eof :copyDll echo Copying DevExpress %1 set source="C:\Program Files (x86)\DevExpress %DXversion%\Components\Bin\Framework\DevExpress.%1.v%DXversion%.dll" -if exist %source% copy %source% "%target%" +if exist %source% xcopy /idy %source% "%target%" set source="C:\Program Files (x86)\DevExpress %DXversion%\Components\Bin\Framework\DevExpress.%1.v%DXversion%.Core.dll" -if exist %source% copy %source% "%target%" -for %%l in (de pt) do call :copyLangDll %1 %%l +if exist %source% xcopy /idy %source% "%target%" +for %%l in (%languages%) do call :copyLangDll %1 %%l goto:eof :copyLangDll set source="C:\Program Files (x86)\DevExpress %DXversion%\Components\Bin\Framework\%2\DevExpress.%1.v%DXversion%.resources.dll" -if exist %source% copy %source% "%target%\%2" +if exist %source% xcopy /idy %source% "%target%\%2" set source="C:\Program Files (x86)\DevExpress %DXversion%\Components\Bin\Framework\%2\DevExpress.%1.v%DXversion%.Core.resources.dll" -if exist %source% copy %source% "%target%\%2" +if exist %source% xcopy /idy %source% "%target%\%2" goto:eof :error