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

アセンブラ出力を行い、artifacts に含める #290

Merged
merged 2 commits into from
Jul 23, 2018
Merged

アセンブラ出力を行い、artifacts に含める #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a191983
closes #286: アセンブラ出力を行い、artifacts に含める
m-tmatma Jul 20, 2018
bd829d5
closes #286: アセンブラ出力を UTF8 で行う
m-tmatma Jul 22, 2018
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
8 changes: 8 additions & 0 deletions sakura/sakura.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

お疲れ様です。1件お願いです。
アセンブラリストの出力にUnicodeを使う、というオプションが存在するので、それも一緒に入れたいです。
#264 (comment) ←このコメントでも書いてますが。

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

今 pc 環境がないので、2日後に確認します。

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

アセンブラリストの出力にUnicodeを使う、というオプションが存在するので、それも一緒に入れたいです。

これを入れると、もともとのソースコードが含まれなくなるみたいだ。

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

↑ サイズが半減する。(圧縮後のサイズで 5 MB → 3MB)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ま、いいか

<UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
Expand Down Expand Up @@ -143,6 +145,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
<UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
Expand Down Expand Up @@ -178,6 +182,8 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
<UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
Expand Down Expand Up @@ -213,6 +219,8 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalOptions>/source-charset:shift_jis %(AdditionalOptions)</AdditionalOptions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
<UseUnicodeForAssemblerListing>true</UseUnicodeForAssemblerListing>
</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
View file
Open in desktop
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%
)