From 460c45f60bd45f022d87730705061f4a4a82dbe1 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Thu, 28 Mar 2019 07:02:13 +0900 Subject: [PATCH 1/2] =?UTF-8?q?ZIP=20=E5=86=85=E9=83=A8=E3=81=AE=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=AB=E3=83=80=E3=82=92=E7=9F=AD=E3=81=8F=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zipArtifacts.bat | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/zipArtifacts.bat b/zipArtifacts.bat index 4fc723ec43..6292c20ccf 100644 --- a/zipArtifacts.bat +++ b/zipArtifacts.bat @@ -142,15 +142,22 @@ if not "%RELEASE_PHASE%" == "" ( @rem build WORKDIR @rem ---------------------------------------------------------------- set WORKDIR=%BASENAME% -set WORKDIR_LOG=%WORKDIR%\Log -set WORKDIR_EXE=%WORKDIR%\EXE -set WORKDIR_INST=%WORKDIR%\Installer -set WORKDIR_ASM=%BASENAME%-Asm -set OUTFILE=%BASENAME%-All.zip -set OUTFILE_LOG=%BASENAME%-Log.zip -set OUTFILE_ASM=%BASENAME%-Asm.zip -set OUTFILE_INST=%BASENAME%-Installer.zip -set OUTFILE_EXE=%BASENAME%-Exe.zip + +set RELDIR_LOG=Log +set RELDIR_EXE=EXE +set RELDIR_INST=Installer +set RELDIR_ASM=Asm + +set WORKDIR_LOG=%WORKDIR%\%RELDIR_LOG% +set WORKDIR_EXE=%WORKDIR%\%RELDIR_EXE% +set WORKDIR_INST=%WORKDIR%\%RELDIR_INST% +set WORKDIR_ASM=%WORKDIR%\%RELDIR_ASM% + +set OUTFILE=%~dp0%BASENAME%-All.zip +set OUTFILE_LOG=%~dp0%BASENAME%-Log.zip +set OUTFILE_ASM=%~dp0%BASENAME%-Asm.zip +set OUTFILE_INST=%~dp0%BASENAME%-Installer.zip +set OUTFILE_EXE=%~dp0%BASENAME%-Exe.zip @rem cleanup for local testing if exist "%OUTFILE%" ( @@ -248,9 +255,9 @@ if "%ALPHA%" == "1" ( copy /Y installer\warning-alpha.txt %WORKDIR%\ ) @rem temporally disable to zip all files to a file to workaround #514. -@rem call %ZIP_CMD% %OUTFILE% %WORKDIR% +@rem pushd %WORKDIR% && call %ZIP_CMD% %OUTFILE% . && popd -call %ZIP_CMD% %OUTFILE_LOG% %WORKDIR_LOG% +pushd %WORKDIR% && call %ZIP_CMD% %OUTFILE_LOG% %RELDIR_LOG% && popd @rem copy text files for warning after zipping %OUTFILE% because %WORKDIR% is the parent directory of %WORKDIR_EXE% and %WORKDIR_INST%. if "%ALPHA%" == "1" ( @@ -259,13 +266,14 @@ if "%ALPHA%" == "1" ( ) copy /Y installer\warning.txt %WORKDIR_EXE%\ copy /Y installer\warning.txt %WORKDIR_INST%\ -call %ZIP_CMD% %OUTFILE_INST% %WORKDIR_INST% -call %ZIP_CMD% %OUTFILE_EXE% %WORKDIR_EXE% + +pushd %WORKDIR% && call %ZIP_CMD% %OUTFILE_INST% %RELDIR_INST% && popd +pushd %WORKDIR% && call %ZIP_CMD% %OUTFILE_EXE% %RELDIR_EXE% && popd @echo start zip asm mkdir %WORKDIR_ASM% copy /Y sakura\%platform%\%configuration%\*.asm %WORKDIR_ASM%\ > NUL -call %ZIP_CMD% %OUTFILE_ASM% %WORKDIR_ASM% +pushd %WORKDIR% && call %ZIP_CMD% %OUTFILE_ASM% %RELDIR_ASM% && popd @echo end zip asm From 13054bb33f33e7cf07d87df1a9521f658a49a4d1 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Thu, 28 Mar 2019 22:10:15 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E9=9A=8E=E5=B1=A4=E3=82=92=E4=B8=80?= =?UTF-8?q?=E3=81=A4=E3=81=AA=E3=81=8F=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zipArtifacts.bat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zipArtifacts.bat b/zipArtifacts.bat index 6292c20ccf..e8f35b7e24 100644 --- a/zipArtifacts.bat +++ b/zipArtifacts.bat @@ -257,7 +257,7 @@ if "%ALPHA%" == "1" ( @rem temporally disable to zip all files to a file to workaround #514. @rem pushd %WORKDIR% && call %ZIP_CMD% %OUTFILE% . && popd -pushd %WORKDIR% && call %ZIP_CMD% %OUTFILE_LOG% %RELDIR_LOG% && popd +pushd %WORKDIR_LOG% && call %ZIP_CMD% %OUTFILE_LOG% . && popd @rem copy text files for warning after zipping %OUTFILE% because %WORKDIR% is the parent directory of %WORKDIR_EXE% and %WORKDIR_INST%. if "%ALPHA%" == "1" ( @@ -267,13 +267,13 @@ if "%ALPHA%" == "1" ( copy /Y installer\warning.txt %WORKDIR_EXE%\ copy /Y installer\warning.txt %WORKDIR_INST%\ -pushd %WORKDIR% && call %ZIP_CMD% %OUTFILE_INST% %RELDIR_INST% && popd -pushd %WORKDIR% && call %ZIP_CMD% %OUTFILE_EXE% %RELDIR_EXE% && popd +pushd %WORKDIR_INST% && call %ZIP_CMD% %OUTFILE_INST% . && popd +pushd %WORKDIR_EXE% && call %ZIP_CMD% %OUTFILE_EXE% . && popd @echo start zip asm mkdir %WORKDIR_ASM% copy /Y sakura\%platform%\%configuration%\*.asm %WORKDIR_ASM%\ > NUL -pushd %WORKDIR% && call %ZIP_CMD% %OUTFILE_ASM% %RELDIR_ASM% && popd +pushd %WORKDIR_ASM% && call %ZIP_CMD% %OUTFILE_ASM% . && popd @echo end zip asm