X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=BuildArc.cmd;h=89acf04f353c5d9fb9fc704b9afaaa901082a20d;hb=5332924546aa180d4304360ac2b9146aa9d07226;hp=6406d83da6dd507eb488f90fa1f9e2f12b02a511;hpb=363e8e10c093a1ec54808a95aaf7e35a0ef5eb92;p=winmerge-jp%2Fwinmerge-jp.git diff --git a/BuildArc.cmd b/BuildArc.cmd index 6406d83da..89acf04f3 100644 --- a/BuildArc.cmd +++ b/BuildArc.cmd @@ -1,17 +1,14 @@ pushd "%~dp0" -setlocal EnableDelayedExpansion +setlocal call SetVersion.cmd if "%2" == "-ci" ( - for /f %%i in ('date /t') do set MYDATETMP1=%%i - set MYDATETMP2=!MYDATETMP1:/=-! - set MYDATE=!MYDATETMP2: =_! if exist .hg ( - for /F "delims=" %%i in ('hg id') do set SAFEAPPVER=%SAFEAPPVER%-!MYDATE!-%%i + for /F "delims=" %%i in ('hg id') do set SAFEAPPVER=%SAFEAPPVER%-%%i ) else if exist .git ( - for /F "delims=" %%i in ('git rev-parse --short head') do set SAFEAPPVER=%SAFEAPPVER%-!MYDATE!-%%i + for /F "delims=" %%i in ('git rev-parse --short head') do set SAFEAPPVER=%SAFEAPPVER%-%%i ) else ( - set SAFEAPPVER=%SAFEAPPVER%-!MYDATE!-%APPVEYOR_BUILD_VERSION% + set SAFEAPPVER=%SAFEAPPVER%-%APPVEYOR_BUILD_VERSION% ) ) set DISTDIR=.\Build\Releases @@ -20,19 +17,26 @@ set path="%ProgramFiles%\7-zip";"%ProgramFiles(x86)%\7-zip";%path% if "%1" == "" ( call :BuildZip call :BuildZip x64 + call :BuildZip ARM64 ) else ( call :BuildZip %1 ) del "%DISTDIR%\winmerge-%SAFEAPPVER%-full-src.7z" 2> NUL -7z.exe a -t7z -xr!*.gcno -xr!*.gcda -xr!*.gcov -xr!*.orig -xr!*.o -xr!*.a -xr!.dep -xr!*.out -xr!debug_static* -xr!debug_shared* -xr!release_static* -xr!release_shared* -xr!*.bak -xr!*.lang -xr!*.db -xr!*.ncb -xr!*.sdf -xr!*.bsc -xr!*.opt -xr!*.plg -xr!*.suo -xr!*.obj -xr!*.ilk -xr!*.pdb -xr!*.pch -xr!*.res -xr!*.exe -xr!*.sbr -xr!.vs -xr!*.VC.db-* -xr!*.zip -xr!WinMergeSplash.psd -xr!*.lib -xr!*.exp -xr!*.idb -xr!*.%COMPUTERNAME%.%USERNAME%.user -xr!BuildLog.htm -xr!ipch -xr!*.tlb -xr!*.tlog -xr!*.*~ -xr!CVS -xr!.svn -xr!.hg -xr!*.log -xr!*.lastbuildstate -xr!FreeImage*.dll -xr!WinIMergeLib.dll -xr!WinIMerge.exe -xr!BuildTmp -xr!Docs\Manual\Tools "%DISTDIR%\winmerge-%SAFEAPPVER%-full-src.7z" ArchiveSupport ColorSchemes Docs Externals Filters Installer Plugins ShellExtension Src Testing Tools Translations Web readme.txt Version.h *.cmd *.bat *.inf *.sln *.vbs +7z.exe a -t7z -xr!*.gcno -xr!*.gcda -xr!*.gcov -xr!*.orig -xr!*.o -xr!*.a -xr!.dep -xr!*.asm -xr!*.out -xr!debug_static* -xr!debug_shared* -xr!release_static* -xr!release_shared* -xr!*.bak -xr!*.lang -xr!*.db -xr!*.ncb -xr!*.sdf -xr!*.bsc -xr!*.opt -xr!*.plg -xr!*.suo -xr!*.obj -xr!*.ilk -xr!*.pdb -xr!*.pch -xr!*.res -xr!*.exe -xr!*.sbr -xr!.vs -xr!*.VC.db-* -xr!*.zip -xr!WinMergeSplash.psd -xr!*.lib -xr!*.exp -xr!*.idb -xr!*.%COMPUTERNAME%.%USERNAME%.user -xr!BuildLog.htm -xr!ipch -xr!*.tlb -xr!*.tlog -xr!*.*~ -xr!CVS -xr!.svn -xr!.hg -xr!*.log -xr!*.lastbuildstate -xr!FreeImage*.dll -xr!WinIMergeLib.dll -xr!WinIMerge.exe -xr!BuildTmp -xr!Docs\Manual\Tools "%DISTDIR%\winmerge-%SAFEAPPVER%-full-src.7z" ArchiveSupport ColorSchemes Docs Externals Filters Installer Plugins ShellExtension Src Testing Tools Translations Web readme.txt Version.h *.cmd *.bat *.inf *.sln *.vbs ( echo "%DISTDIR%\WinMerge-%SAFEAPPVER%-Setup.exe" -echo "%DISTDIR%\WinMerge-%SAFEAPPVER%-%PLATFORMH%Setup.exe" +echo "%DISTDIR%\WinMerge-%SAFEAPPVER%-x64-Setup.exe" +echo "%DISTDIR%\WinMerge-%SAFEAPPVER%-x64-PerUser-Setup.exe" +echo "%DISTDIR%\WinMerge-%SAFEAPPVER%-ARM64-Setup.exe" echo "%DISTDIR%\winmerge-%SAFEAPPVER%-exe.zip" -echo "%DISTDIR%\winmerge-%SAFEAPPVER%-%PLATFORMH%exe.zip" +echo "%DISTDIR%\winmerge-%SAFEAPPVER%-x64-exe.zip" +echo "%DISTDIR%\winmerge-%SAFEAPPVER%-ARM64-exe.zip" +echo "%DISTDIR%\winmerge-%SAFEAPPVER%-pdb.7z" +echo "%DISTDIR%\winmerge-%SAFEAPPVER%-x64-pdb.7z" +echo "%DISTDIR%\winmerge-%SAFEAPPVER%-ARM64-pdb.7z" echo "%DISTDIR%\winmerge-%SAFEAPPVER%-full-src.7z" ) > "%DISTDIR%\files.txt" @@ -57,15 +61,20 @@ echo ============================================================ rmdir /q /s "%DISTDIR%\%PLATFORMH%zip-version" > NUL 2> NUL mkdir "%DISTDIR%" 2> NUL -copy "Build\WinMerge-%RCVER%-%PLATFORMH%Setup.exe" "%DISTDIR%\WinMerge-%SAFEAPPVER%-%PLATFORMH%Setup.exe" +rem Copy platform setups +copy "Build\WinMerge-%RCVER%-%PLATFORMH%Setup.exe" "%DISTDIR%\WinMerge-%SAFEAPPVER%-%PLATFORMH%Setup.exe" > NUL +if not "%1" == "" ( + copy "Build\WinMerge-%RCVER%-%PLATFORMH%PerUser-Setup.exe" "%DISTDIR%\WinMerge-%SAFEAPPVER%-%PLATFORMH%PerUser-Setup.exe" > NUL +) +rem Create folder structure for %%i in (ColorSchemes Languages Filters MergePlugins Docs Frhed\Docs Frhed\Languages WinIMerge Merge7z\Lang GnuWin32) do ( mkdir "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\%%i" 2> NUL ) rem Docs echo Copy Docs... -for %%i in (Translations\Docs\Readme\ReadMe-*.txt Build\Manual\htmlhelp\WinMerge*.chm Docs\Users\ReleaseNotes.html Docs\Users\ChangeLog.txt) do ( +for %%i in (Translations\Docs\Readme\ReadMe-*.txt Build\Manual\htmlhelp\WinMerge*.chm Docs\Users\ReleaseNotes.html Docs\Users\ChangeLog.html) do ( copy "%%i" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\Docs" > NUL ) for %%i in (Src\COPYING Docs\Users\Contributors.txt Docs\Users\ReadMe.txt) do ( @@ -81,8 +90,13 @@ if not "%1" == "" ( rem ShellExtension echo Copy ShellExtension... -copy "Build\ShellExtension\ShellExtensionU.dll" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\" > NUL -copy "Build\ShellExtension\ShellExtensionX64.dll" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\" > NUL +if not "%1" == "ARM64" ( + copy "Build\ShellExtension\ShellExtensionU.dll" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\" > NUL + copy "Build\ShellExtension\ShellExtensionX64.dll" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\" > NUL +) +if "%1" == "ARM64" ( + copy "Build\ShellExtension\ShellExtensionARM64.dll" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\" > NUL +) copy ShellExtension\*Register*.bat "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\" > NUL rem Translations @@ -149,5 +163,7 @@ echo ------------------------------------------------------------ echo Pack archive... echo ------------------------------------------------------------ 7z.exe a -tzip "%DISTDIR%\winmerge-%SAFEAPPVER%-%PLATFORMH%exe.zip" "%DISTDIR%\%PLATFORMH%zip-version\WinMerge\" +set PDBFILE="Build\%PLATFORM%\Release\WinMergeU.pdb" +7z.exe a -t7z "%DISTDIR%\winmerge-%SAFEAPPVER%-%PLATFORMH%pdb.7z" %PDBFILE:\\=\% goto :eof