Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

vs2017ビルド時のビルドログを整理する #790

Merged
merged 4 commits into from
Mar 2, 2019
Merged

vs2017ビルド時のビルドログを整理する #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
62353f3
バッチデバッグ用のecho onを除去する
berryzplus Feb 3, 2019
fcb2d57
zipユーティリティバッチの改善
berryzplus Feb 17, 2019
e91fb13
postBuild.batの整理
berryzplus Feb 17, 2019
5faa71c
7zがない警告メッセージをエラー出力に出す
berryzplus Feb 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions calc-hash-res.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@echo off
set OUTHASHFILE=%1
set SRCDIR=%2

Expand All @@ -24,7 +23,6 @@ if errorlevel 1 (
) else (
python calc-hash.py %OUTHASHFILE% %SRCDIR% .res
)
@echo on
exit /b 0

@rem ------------------------------------------------------------------------------
Expand Down
2 changes: 0 additions & 2 deletions calc-hash.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@echo off
set OUTHASHFILE=%1
set SRCDIR=%2

Expand All @@ -24,7 +23,6 @@ if errorlevel 1 (
) else (
python calc-hash.py %OUTHASHFILE% %SRCDIR%
)
@echo on
exit /b 0

@rem ------------------------------------------------------------------------------
Expand Down
51 changes: 24 additions & 27 deletions sakura/postBuild.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,48 +17,45 @@ set PLATFORM=%1
set CONFIGURATION=%2
@echo CONFIGURATION=%CONFIGURATION%

set DEST_DIR=..\%PLATFORM%\%CONFIGURATION%
set DEST_DIR=%PLATFORM%\%CONFIGURATION%
set OUT_DIR=%~dp0..\%DEST_DIR%

: ---- bron412 ---- :
set INSTALLER_RESOURCES_BRON=%~dp0..\installer\temp\bron
set BRON_ZIP=%~dp0..\installer\externals\bregonig\bron412.zip
set DLL_BREGONIG_NAME=bregonig.dll
set BREGONIG_DLL=bregonig.dll
set BRON_ZIP=..\installer\externals\bregonig\bron412.zip
set BRON_TMP=..\installer\temp\bron
if "%platform%" == "x64" (
set INSTALLER_RESOURCES_BRON_DLL=%INSTALLER_RESOURCES_BRON%\x64
set BRON_DIR=%~dp0%BRON_TMP%\x64
) else (
set INSTALLER_RESOURCES_BRON_DLL=%INSTALLER_RESOURCES_BRON%
set BRON_DIR=%~dp0%BRON_TMP%
)

if not exist "%INSTALLER_RESOURCES_BRON_DLL%\%DLL_BREGONIG_NAME%" (
@echo extract %BRON_ZIP%
call %UNZIP_CMD% %BRON_ZIP% %INSTALLER_RESOURCES_BRON% || (echo error && exit /b 1)
)
if not exist "%DEST_DIR%\%DLL_BREGONIG_NAME%" (
@echo %DLL_BREGONIG_NAME% to destination directory.
copy /Y /B %INSTALLER_RESOURCES_BRON_DLL%\%DLL_BREGONIG_NAME% %DEST_DIR%\
if not exist "%OUT_DIR%\%BREGONIG_DLL%" (
@echo %BRON_ZIP% -^> %DEST_DIR%\%BREGONIG_DLL%
if not exist "%BRON_DIR%\%BREGONIG_DLL%" (
call "%UNZIP_CMD%" "%~dp0%BRON_ZIP%" "%~dp0%BRON_TMP%" > NUL || (echo error && exit /b 1)
)
copy /Y /B "%BRON_DIR%\%BREGONIG_DLL%" "%OUT_DIR%\" > NUL
)

: ---- ctags.exe ---- :
set INSTALLER_RESOURCES_CTAGS=%~dp0..\installer\temp\ctags
set INSTALLER_RESOURCES_CTAGS_EXE=%INSTALLER_RESOURCES_CTAGS%
set CTAGS_EXE=ctags.exe
if "%PLATFORM%" == "Win32" (
set CTAGS_PREFIX=x86
) else if "%PLATFORM%" == "x64" (
set CTAGS_PREFIX=x64
) else (
@echo unknown PLATFORM %PLATFORM%
echo unknown PLATFORM %PLATFORM%
exit /b 1
)
set CTAGS_ZIP=%~dp0..\installer\externals\universal-ctags\ctags-2018-09-16_e522743d-%CTAGS_PREFIX%.zip
set EXE_CTAGS_NAME=ctags.exe

if not exist "%INSTALLER_RESOURCES_CTAGS_DLL%\%EXE_CTAGS_NAME%" (
@echo extract %CTAGS_ZIP%
call %UNZIP_CMD% %CTAGS_ZIP% %INSTALLER_RESOURCES_CTAGS% || (echo error && exit /b 1)
)
if not exist "%DEST_DIR%\%EXE_CTAGS_NAME%" (
@echo %EXE_CTAGS_NAME% to destination directory.
copy /Y /B %INSTALLER_RESOURCES_CTAGS_EXE%\%EXE_CTAGS_NAME% %DEST_DIR%\
set CTAGS_ZIP=..\installer\externals\universal-ctags\ctags-2018-09-16_e522743d-%CTAGS_PREFIX%.zip
set CTAGS_TMP=..\installer\temp\ctags
set CTAGS_DIR=%~dp0%CTAGS_TMP%
if not exist "%OUT_DIR%\%CTAGS_EXE%" (
@echo %CTAGS_ZIP% -^> %DEST_DIR%\%CTAGS_EXE%
if not exist "%CTAGS_DIR%\%CTAGS_EXE%" (
call "%UNZIP_CMD%" "%~dp0%CTAGS_ZIP%" "%CTAGS_DIR%" > NUL || (echo error && exit /b 1)
)
copy /Y /B "%CTAGS_DIR%\%CTAGS_EXE%" "%OUT_DIR%\" > NUL
)

ENDLOCAL
11 changes: 4 additions & 7 deletions tools/zip/listzip.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
@echo off
set SRCZIP=%1


@echo examining %SRCZIP%.
@rem CMD_7Z contains double quotes.
if not defined CMD_7Z call %~dp0..\find-tools.bat
if not defined CMD_7Z call "%~dp0..\find-tools.bat" > NUL
if not defined CMD_7Z (
@echo -------------------------------------------------------
@echo ---- you can make this faster by installing 7-zip. ----
@echo -------------------------------------------------------
@echo ------------------------------------------------------- >&2
@echo ---- you can make this faster by installing 7-zip. ---- >&2
@echo ------------------------------------------------------- >&2
powershell -ExecutionPolicy RemoteSigned -File %~dp0listzip.ps1 %SRCZIP%
) else (
"%CMD_7Z%" l "%SRCZIP%"
)
@echo on
14 changes: 6 additions & 8 deletions tools/zip/unzip.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
@echo off
set SRCZIP=%1
set OUTDIR=%2

if exist "%OUTDIR%" rmdir /s /q "%OUTDIR%"
if exist "%OUTDIR%" rmdir /s /q "%OUTDIR%" > NUL

@echo extracting %SRCZIP%.
if not defined CMD_7Z call %~dp0..\find-tools.bat
if not defined CMD_7Z call "%~dp0..\find-tools.bat" > NUL
if not defined CMD_7Z (
@echo -------------------------------------------------------
@echo ---- you can make this faster by installing 7-zip. ----
@echo -------------------------------------------------------
@echo ------------------------------------------------------- >&2
@echo ---- you can make this faster by installing 7-zip. ---- >&2
@echo ------------------------------------------------------- >&2
powershell -ExecutionPolicy RemoteSigned -File %~dp0unzip.ps1 %SRCZIP% %OUTDIR%
) else (
"%CMD_7Z%" x "%SRCZIP%" -O"%OUTDIR%"
"%CMD_7Z%" x "%SRCZIP%" "-o%OUTDIR%"
)
@echo on
12 changes: 5 additions & 7 deletions tools/zip/zip.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
@echo off
set DSTZIP=%1
set SRCDIR=%2

if exist "%DSTZIP%" del "%DSTZIP%"
@echo archiving %SRCZIP%.

if not defined CMD_7Z call %~dp0..\find-tools.bat
if not defined CMD_7Z call "%~dp0..\find-tools.bat" > NUL
if not defined CMD_7Z (
@echo -------------------------------------------------------
@echo ---- you can make this faster by installing 7-zip. ----
@echo -------------------------------------------------------
@echo ------------------------------------------------------- >&2
@echo ---- you can make this faster by installing 7-zip. ---- >&2
@echo ------------------------------------------------------- >&2
powershell -ExecutionPolicy RemoteSigned -File %~dp0zip.ps1 %DSTZIP% %SRCDIR%
) else (
"%CMD_7Z%" a "%DSTZIP%" -r "%SRCDIR%"
"%CMD_7Z%" a "%DSTZIP%" -r "%SRCDIR%"
)
@echo on