Skip to content

Commit

Permalink
closes #286: アセンブラ出力を行い、artifacts に含める
Browse files Browse the repository at this point in the history
  • Loading branch information
m-tmatma committed Jul 20, 2018
1 parent 27a4524 commit a191983
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
4 changes: 4 additions & 0 deletions sakura/sakura.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
Expand Down Expand Up @@ -143,6 +144,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
Expand Down Expand Up @@ -178,6 +180,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
Expand Down Expand Up @@ -213,6 +216,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
Expand Down
18 changes: 18 additions & 0 deletions zipArtifacts.bat
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,10 @@ 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%.zip
set OUTFILE_LOG=%BASENAME%-Log.zip
set OUTFILE_ASM=%BASENAME%-Asm.zip

@rem cleanup for local testing
if exist "%OUTFILE%" (
Expand All @@ -128,9 +130,15 @@ if exist "%OUTFILE%" (
if exist "%OUTFILE_LOG%" (
del %OUTFILE_LOG%
)
if exist "%OUTFILE_ASM%" (
del %OUTFILE_ASM%
)
if exist "%WORKDIR%" (
rmdir /s /q %WORKDIR%
)
if exist "%WORKDIR_ASM%" (
rmdir /s /q %WORKDIR_ASM%
)

mkdir %WORKDIR%
mkdir %WORKDIR_LOG%
Expand Down Expand Up @@ -170,6 +178,16 @@ if exist "%HASHFILE%" (
7z a %OUTFILE_LOG% -r %WORKDIR_LOG%
7z l %OUTFILE_LOG%

@echo start zip asm
mkdir %WORKDIR_ASM%
copy sakura\%platform%\%configuration%\*.asm %WORKDIR_ASM%\
7z a %OUTFILE_ASM% -r %WORKDIR_ASM%
7z l %OUTFILE_ASM%
@echo end zip asm

if exist "%WORKDIR%" (
rmdir /s /q %WORKDIR%
)
if exist "%WORKDIR_ASM%" (
rmdir /s /q %WORKDIR_ASM%
)

0 comments on commit a191983

Please sign in to comment.