From f25affddcb1fdc45926ab7facf62e5377f6a2ab1 Mon Sep 17 00:00:00 2001 From: kobake Date: Sun, 10 Jun 2018 19:57:13 +0900 Subject: [PATCH 01/19] =?UTF-8?q?x64=20=E3=83=93=E3=83=AB=E3=83=89?= =?UTF-8?q?=E7=94=A8=E3=82=B3=E3=83=B3=E3=83=95=E3=82=A3=E3=82=B0=20(sakur?= =?UTF-8?q?a,=20sakura=5Flang=5Fen=5FUS)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + appveyor.yml | 1 + sakura.sln | 18 +++ sakura/.gitignore | 1 + sakura/sakura.vcxproj | 108 ++++++++++++++++++ sakura_lang_en_US/.gitignore | 1 + sakura_lang_en_US/sakura_lang_en_US.vcxproj | 120 ++++++++++++++++++++ 7 files changed, 250 insertions(+) diff --git a/.gitignore b/.gitignore index 1f906465c6..60517fbabd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ Backup *.ipdb UpgradeLog.htm /Win32 +/x64 diff --git a/appveyor.yml b/appveyor.yml index 3fb5397c8f..24840e59ef 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,6 +12,7 @@ configuration: platform: - Win32 + - x64 build_script: - cmd: >- diff --git a/sakura.sln b/sakura.sln index 1cbdc2d0b7..30d1388313 100644 --- a/sakura.sln +++ b/sakura.sln @@ -16,25 +16,43 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|Win32.ActiveCfg = Debug|Win32 {AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|Win32.Build.0 = Debug|Win32 + {AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|x64.ActiveCfg = Debug|x64 + {AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Debug|x64.Build.0 = Debug|x64 {AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|Win32.ActiveCfg = Release|Win32 {AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|Win32.Build.0 = Release|Win32 + {AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|x64.ActiveCfg = Release|x64 + {AF03508C-515E-4A0E-87BE-67ED1E254BD0}.Release|x64.Build.0 = Release|x64 {0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|Win32.ActiveCfg = Debug|Win32 {0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|Win32.Build.0 = Debug|Win32 + {0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|x64.ActiveCfg = Debug|Win32 + {0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Debug|x64.Build.0 = Debug|Win32 {0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|Win32.ActiveCfg = Release|Win32 {0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|Win32.Build.0 = Release|Win32 + {0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|x64.ActiveCfg = Release|Win32 + {0F2918B0-23E3-42E8-A1A8-8739F726A23E}.Release|x64.Build.0 = Release|Win32 {40735439-B12B-40AC-92F7-F1183D8B6862}.Debug|Win32.ActiveCfg = Debug|Win32 {40735439-B12B-40AC-92F7-F1183D8B6862}.Debug|Win32.Build.0 = Debug|Win32 + {40735439-B12B-40AC-92F7-F1183D8B6862}.Debug|x64.ActiveCfg = Debug|Win32 + {40735439-B12B-40AC-92F7-F1183D8B6862}.Debug|x64.Build.0 = Debug|Win32 {40735439-B12B-40AC-92F7-F1183D8B6862}.Release|Win32.ActiveCfg = Release|Win32 {40735439-B12B-40AC-92F7-F1183D8B6862}.Release|Win32.Build.0 = Release|Win32 + {40735439-B12B-40AC-92F7-F1183D8B6862}.Release|x64.ActiveCfg = Release|Win32 + {40735439-B12B-40AC-92F7-F1183D8B6862}.Release|x64.Build.0 = Release|Win32 {7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|Win32.ActiveCfg = Debug|Win32 {7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|Win32.Build.0 = Debug|Win32 + {7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|x64.ActiveCfg = Debug|x64 + {7A6D0F29-E560-4985-835B-5F92A08EB242}.Debug|x64.Build.0 = Debug|x64 {7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|Win32.ActiveCfg = Release|Win32 {7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|Win32.Build.0 = Release|Win32 + {7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|x64.ActiveCfg = Release|x64 + {7A6D0F29-E560-4985-835B-5F92A08EB242}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/sakura/.gitignore b/sakura/.gitignore index d8dde3c656..9df2552d32 100644 --- a/sakura/.gitignore +++ b/sakura/.gitignore @@ -21,6 +21,7 @@ /*.user # /*.vcxproj /Win32 +/x64 /Toolkit2003Env.bat /_UpgradeReport_Files /ipch diff --git a/sakura/sakura.vcxproj b/sakura/sakura.vcxproj index 411863f297..f950bc38b2 100644 --- a/sakura/sakura.vcxproj +++ b/sakura/sakura.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + sakura @@ -21,6 +29,12 @@ false Unicode + + Application + v141 + false + Unicode + Application v141 @@ -28,15 +42,28 @@ Unicode true + + Application + v141 + false + Unicode + true + + + + + + + <_ProjectFileVersion>15.0.27130.2020 @@ -46,11 +73,21 @@ $(Platform)\$(Configuration)\ false + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + MinSpace @@ -88,6 +125,42 @@ 0x0411 + + + MinSpace + OnlyExplicitInline + ..\sakura_core;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NOMINMAX;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;NDEBUG;%(PreprocessorDefinitions) + true + MultiThreaded + true + true + true + Use + StdAfx.h + Level3 + ProgramDatabase + /source-charset:shift_jis %(AdditionalOptions) + + + comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies) + true + Windows + true + true + true + + + call postBuild.bat "$(TargetPath).manifest" + + + call preBuild.bat + + + NDEBUG;%(PreprocessorDefinitions) + 0x0411 + + Disabled @@ -123,6 +196,39 @@ 0x0411 + + + Disabled + ..\sakura_core;%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;NOMINMAX;WINVER=0x0500;_WIN32_WINNT=0x0500;_WIN32_IE=0x0501;_DEBUG;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + true + true + true + Use + StdAfx.h + Level3 + ProgramDatabase + /source-charset:shift_jis %(AdditionalOptions) + + + comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies) + true + Windows + false + + + call postBuild.bat "$(TargetPath).manifest" + + + call preBuild.bat + + + _DEBUG;%(PreprocessorDefinitions) + 0x0411 + + @@ -722,7 +828,9 @@ Create + Create Create + Create diff --git a/sakura_lang_en_US/.gitignore b/sakura_lang_en_US/.gitignore index 3cfd67a6f0..205fe45deb 100644 --- a/sakura_lang_en_US/.gitignore +++ b/sakura_lang_en_US/.gitignore @@ -1 +1,2 @@ /Win32 +/x64 diff --git a/sakura_lang_en_US/sakura_lang_en_US.vcxproj b/sakura_lang_en_US/sakura_lang_en_US.vcxproj index 92e24f73aa..15acd2e043 100644 --- a/sakura_lang_en_US/sakura_lang_en_US.vcxproj +++ b/sakura_lang_en_US/sakura_lang_en_US.vcxproj @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {7A6D0F29-E560-4985-835B-5F92A08EB242} @@ -21,12 +29,24 @@ false Unicode + + DynamicLibrary + v141 + false + Unicode + DynamicLibrary v141 false Unicode + + DynamicLibrary + v141 + false + Unicode + @@ -34,10 +54,18 @@ + + + + + + + + <_ProjectFileVersion>15.0.27130.2020 @@ -48,12 +76,24 @@ true true + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + true + $(SolutionDir)$(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ true false + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + false + _DEBUG;%(PreprocessorDefinitions) @@ -96,6 +136,46 @@ $(OutDir)$(TargetName).bsc + + + _DEBUG;%(PreprocessorDefinitions) + true + true + $(OutDir)$(TargetName).tlb + + + + + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;SAKURA_LANG_EN_US_EXPORTS;%(PreprocessorDefinitions) + EnableFastChecks + MultiThreadedDebug + $(OutDir)$(TargetName).pch + $(OutDir) + $(Platform)\$(Configuration)\ + $(OutDir) + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0411 + + + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + true + true + $(OutDir)$(TargetName).pdb + true + $(OutDir)$(TargetName).lib + + + true + $(OutDir)$(TargetName).bsc + + NDEBUG;%(PreprocessorDefinitions) @@ -137,6 +217,46 @@ $(OutDir)$(TargetName).bsc + + + NDEBUG;%(PreprocessorDefinitions) + true + true + $(OutDir)$(TargetName).tlb + + + + + MaxSpeed + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;_USRDLL;SAKURA_LANG_EN_US_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreaded + true + $(OutDir)$(TargetName).pch + $(OutDir) + $(Platform)\$(Configuration)\ + $(OutDir) + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0411 + + + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + true + $(OutDir)$(TargetName).pdb + true + $(OutDir)$(TargetName).lib + + + true + $(OutDir)$(TargetName).bsc + + From 2a080d104bbf9f475043a632e02052c0a072d6db Mon Sep 17 00:00:00 2001 From: kobake Date: Sun, 10 Jun 2018 21:59:27 +0900 Subject: [PATCH 02/19] =?UTF-8?q?x64=20Release=20=E3=83=93=E3=83=AB?= =?UTF-8?q?=E3=83=89=E3=81=AE=20LargeAddressAware=20=E3=82=AA=E3=83=97?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE=E6=8C=87=E5=AE=9A=E3=82=92?= =?UTF-8?q?=E5=A4=96=E3=81=99=20(=E8=A6=8F=E5=AE=9A=E5=80=A4=E3=81=AB?= =?UTF-8?q?=E5=90=88=E3=82=8F=E3=81=9B=E3=82=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/sakura.vcxproj | 1 - 1 file changed, 1 deletion(-) diff --git a/sakura/sakura.vcxproj b/sakura/sakura.vcxproj index f950bc38b2..f6563d5f40 100644 --- a/sakura/sakura.vcxproj +++ b/sakura/sakura.vcxproj @@ -146,7 +146,6 @@ comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies) true Windows - true true true From e1c071764a701daecffdc992410ec19fddce2069 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Mon, 11 Jun 2018 08:17:10 +0900 Subject: [PATCH 03/19] =?UTF-8?q?#88:=20C4477=20=E3=81=AE=E8=AD=A6?= =?UTF-8?q?=E5=91=8A=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://msdn.microsoft.com/ja-jp/library/tcxf1dw6.aspx --- sakura_core/_os/CClipboard.cpp | 4 ++-- sakura_core/util/shell.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sakura_core/_os/CClipboard.cpp b/sakura_core/_os/CClipboard.cpp index af69462211..e302783ef3 100644 --- a/sakura_core/_os/CClipboard.cpp +++ b/sakura_core/_os/CClipboard.cpp @@ -227,10 +227,10 @@ bool CClipboard::SetHtmlText(const CNativeW& cmemBUf) size_t size = cmemUtf8.GetStringLength() + 134; cmemHeader.AppendString("Version:0.9\r\n"); cmemHeader.AppendString("StartHTML:00000097\r\n"); - sprintf( szFormat, "EndHTML:%08d\r\n", size + 36 ); + sprintf( szFormat, "EndHTML:%08Id\r\n", size + 36 ); cmemHeader.AppendString(szFormat); cmemHeader.AppendString("StartFragment:00000134\r\n"); - sprintf( szFormat, "EndFragment:%08d\r\n", size ); + sprintf( szFormat, "EndFragment:%08Id\r\n", size ); cmemHeader.AppendString(szFormat); cmemHeader.AppendString("\r\n\r\n"); CNativeA cmemFooter; diff --git a/sakura_core/util/shell.cpp b/sakura_core/util/shell.cpp index 481c360f30..cd9c3404d5 100644 --- a/sakura_core/util/shell.cpp +++ b/sakura_core/util/shell.cpp @@ -607,7 +607,7 @@ BOOL MyWinHelp(HWND hwndCaller, UINT uCommand, DWORD_PTR dwData) dwData = 1; // –ÚŽŸƒy[ƒW TCHAR buf[256]; - _stprintf( buf, _T("http://sakura-editor.sourceforge.net/cgi-bin/hid2.cgi?%d"), dwData ); + _stprintf( buf, _T("http://sakura-editor.sourceforge.net/cgi-bin/hid2.cgi?%Id"), dwData ); ShellExecute( ::GetActiveWindow(), NULL, buf, NULL, NULL, SW_SHOWNORMAL ); } From c470e1bb43db4f3ef6f39ed08075dc324dc14d22 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Mon, 11 Jun 2018 13:52:22 +0900 Subject: [PATCH 04/19] =?UTF-8?q?#88:=20MakefileMake.cpp=20=E3=81=A7?= =?UTF-8?q?=E3=81=AE=20C4477=20=E3=81=AE=E8=AD=A6=E5=91=8A=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ※ MakefileMake ã® x64 ã®ãƒ“ルド構æˆã¯ãªã„ã®ã§è¡¨é¢åŒ–ã—ãªã„ãŒæ½œåœ¨ãƒã‚°ãªã®ã§ä¿®æ­£ã—ã¦ãŠã --- MakefileMake/MakefileMake.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MakefileMake/MakefileMake.cpp b/MakefileMake/MakefileMake.cpp index 0cc7c4f749..a185e29f5b 100644 --- a/MakefileMake/MakefileMake.cpp +++ b/MakefileMake/MakefileMake.cpp @@ -386,7 +386,7 @@ int main(int argc, char* argv[]) fclose(out); #ifdef _DEBUG // %d個ã®ã‚ªãƒ–ジェクトファイルåãŒå‡ºåŠ›ã•ã‚Œã¾ã—㟠- printf("... Wrote %d object file lines to tmpfile[%s].\n", file_list.size(), tmp_file); + printf("... Wrote %Id object file lines to tmpfile[%s].\n", file_list.size(), tmp_file); #endif // ファイルã®å…¥æ›ãˆ From cfcfe58b8a24dde26281f75e1ce42a21e171b69b Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Thu, 14 Jun 2018 22:19:26 +0900 Subject: [PATCH 05/19] =?UTF-8?q?#108:=20x64=20=E3=81=AB=E3=82=82=20/MP=20?= =?UTF-8?q?=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92=E6=9C=89?= =?UTF-8?q?=E5=8A=B9=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/sakura.vcxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sakura/sakura.vcxproj b/sakura/sakura.vcxproj index 32eb02b8db..b68706fda1 100644 --- a/sakura/sakura.vcxproj +++ b/sakura/sakura.vcxproj @@ -142,6 +142,7 @@ Level3 ProgramDatabase /source-charset:shift_jis %(AdditionalOptions) + true comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies) @@ -211,6 +212,7 @@ Level3 ProgramDatabase /source-charset:shift_jis %(AdditionalOptions) + true comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies) From 6838932a385a4aa5fb9a2e8c1d9504cb8dd4ddda Mon Sep 17 00:00:00 2001 From: berryplus Date: Mon, 18 Jun 2018 21:10:50 +0900 Subject: [PATCH 06/19] =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=97=E5=88=A5?= =?UTF-8?q?=E4=B8=80=E8=A6=A7=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0?= =?UTF-8?q?=E3=81=AE=E3=82=A4=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=88=E6=A9=9F?= =?UTF-8?q?=E8=83=BD=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit タイプ別一覧画é¢ã®ã‚¿ã‚¤ãƒ—リストを「基本ã€ã ã‘ã®çŠ¶æ…‹ã§ã‚¤ãƒ³ãƒãƒ¼ãƒˆã™ã‚‹ã¨ã€å–り込んã æ–°è¦è¨­å®šã®å称ãŒã€ŒåŸºæœ¬ã€ã«ãªã‚Šã€å‰Šé™¤ã§ããªããªã‚‹ä¸å…·åˆã¸ã®å¯¾å¿œã€‚ 原因ã¯ã€èª­è¾¼ã‚“ã è¨­å®šãƒ•ã‚¡ã‚¤ãƒ«ã®è¨­å®šIDを判定ã™ã¹ãã¨ã“ã‚ã§ã€ãƒªã‚¹ãƒˆã§é¸æŠžã•ã‚Œã¦ã„る設定IDを使ã£ã¦ã„ãŸã“ã¨ã€‚ 「基本ã€ã—ã‹ãªã„状態ã§ã‚¤ãƒ³ãƒãƒ¼ãƒˆã‚’è¡Œã‚ãªã„é™ã‚Šç•°å¸¸ãªå‹•ä½œã‚’ã—ãªã„ã®ã§ã“ã‚Œã¾ã§é¡•åœ¨åŒ–ã—ãªã‹ã£ãŸã¨è€ƒãˆã‚‰ã‚Œã‚‹ã€‚ コードã®æ„図ãŒã‚„ã‚„ä¸æ˜Žçž­ãªã®ã§ã€å‘¨è¾ºã‚³ãƒ¼ãƒ‰ã«ã‚³ãƒ¡ãƒ³ãƒˆã‚‚追加。 --- sakura_core/typeprop/CImpExpManager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sakura_core/typeprop/CImpExpManager.cpp b/sakura_core/typeprop/CImpExpManager.cpp index c5c2842ace..634cc74f3c 100644 --- a/sakura_core/typeprop/CImpExpManager.cpp +++ b/sakura_core/typeprop/CImpExpManager.cpp @@ -322,13 +322,14 @@ bool CImpExpType::Import( const wstring& sFileName, wstring& sErrMsg ) // “Ç‚Ýž‚Ý CShareData_IO::ShareData_IO_Type_One( m_cProfile, m_Types, szSecTypes ); - m_Types.m_nIdx = m_nIdx; + m_nIdx = m_Types.m_nIdx; if (m_nIdx == 0) { // Šî–{‚Ìꇂ̖¼‘O‚ÆŠg’£Žq‚ð‰Šú‰» _tcscpy( m_Types.m_szTypeName, LS(STR_TYPE_NAME_BASIS) ); _tcscpy( m_Types.m_szTypeExts, _T("") ); m_Types.m_id = 0; }else{ + // Šî–{‚¶‚á‚È‚©‚Á‚½ê‡Aid”Ô†‚ðƒ‰ƒ“ƒ_ƒ€‚ɉ¼Ì”Ô(‚ ‚Æ‚ÅU‚è‚È‚¨‚·) m_Types.m_id = (::GetTickCount() & 0x3fffffff) + m_nIdx * 0x10000; } From 94f2706ca8d61013b2b1e653baf36305bf153a5f Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Sun, 24 Jun 2018 06:21:05 +0900 Subject: [PATCH 07/19] =?UTF-8?q?#162:=20x64=20=E7=89=88=E3=81=AB=20alpha?= =?UTF-8?q?=20=E3=81=A8=E3=82=8F=E3=81=8B=E3=82=8B=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AA=E5=90=8D=E5=89=8D=E3=82=92=20artifacts=20=E3=81=AB?= =?UTF-8?q?=E3=81=A4=E3=81=91=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zipArtifacts.bat | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/zipArtifacts.bat b/zipArtifacts.bat index 5acb16571f..3cee27f645 100644 --- a/zipArtifacts.bat +++ b/zipArtifacts.bat @@ -1,10 +1,21 @@ set platform=%1 set configuration=%2 -set WORKDIR=sakura-%platform%-%configuration% +if "%platform%" == "x64" ( + set ALPHA=1 +) else ( + set ALPHA=0 +) +if "%ALPHA%" == "1" ( + set SUFFIX=-alpha +) else ( + set SUFFIX="" +) +set BASENAME=sakura-%platform%-%configuration%%SUFFIX% +set WORKDIR=%BASENAME% set WORKDIR_LOG=%WORKDIR%\Log set WORKDIR_EXE=%WORKDIR%\EXE set WORKDIR_INST=%WORKDIR%\Installer -set OUTFILE=sakura-%platform%-%configuration%.zip +set OUTFILE=%BASENAME%.zip @rem cleanup for local testing if exist "%OUTFILE%" ( From 8c3112270500d880e07d2ce444524fc274ba1dbe Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Sun, 24 Jun 2018 06:43:15 +0900 Subject: [PATCH 08/19] =?UTF-8?q?#162:=20x64=20=E7=89=88=E3=81=8C=20alpha?= =?UTF-8?q?=20=E7=89=88=E3=81=A7=E3=81=82=E3=82=8B=E3=81=93=E3=81=A8?= =?UTF-8?q?=E3=81=AB=E5=AF=BE=E3=81=99=E3=82=8B=E6=B3=A8=E6=84=8F=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +++ installer/warning-alpha.txt | 4 ++++ zipArtifacts.bat | 3 +++ 3 files changed, 10 insertions(+) create mode 100644 installer/warning-alpha.txt diff --git a/README.md b/README.md index 32c64b8d84..a0eb46ca0e 100644 --- a/README.md +++ b/README.md @@ -32,5 +32,8 @@ https://ci.appveyor.com/project/sakuraeditor/sakura/branch/master https://ci.appveyor.com/project/sakuraeditor/sakura/branch/master/artifacts [`ã“ã‚Œ`](installer/warning.txt) を読んã§ã‹ã‚‰ã”利用ãã ã•ã„。 +[`x64 版㯠alpha 版`](installer/warning-alpha.txt)ã§ã™ã€‚ +対応中ã®ãŸã‚予期ã›ã¬ä¸å…·åˆãŒã‚ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ + 最新以外ã®ãƒ“ルドçµæžœã¯ä»¥ä¸‹ã‹ã‚‰å‚ç…§ã§ãã¾ã™ã€‚ https://ci.appveyor.com/project/sakuraeditor/sakura/history diff --git a/installer/warning-alpha.txt b/installer/warning-alpha.txt new file mode 100644 index 0000000000..f79ee3fc5f --- /dev/null +++ b/installer/warning-alpha.txt @@ -0,0 +1,4 @@ +Appveyor ã§å–å¾—ã™ã‚‹å®Ÿè¡Œãƒ•ã‚¡ã‚¤ãƒ«ã€ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ©ã«é–¢ã™ã‚‹æ³¨æ„事項ã§ã™ã€‚ + +x64 版㯠alpha 版ã§ã™ã€‚ +対応中ã®ãŸã‚予期ã›ã¬ä¸å…·åˆãŒã‚ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ diff --git a/zipArtifacts.bat b/zipArtifacts.bat index 3cee27f645..54abdee60d 100644 --- a/zipArtifacts.bat +++ b/zipArtifacts.bat @@ -38,6 +38,9 @@ copy help\plugin\plugin.chm %WORKDIR_EXE%\ copy help\sakura\sakura.chm %WORKDIR_EXE%\ copy installer\warning.txt %WORKDIR%\ +if "%ALPHA%" == "1" ( + copy installer\warning-alpha.txt %WORKDIR%\ +) copy installer\Output\*.exe %WORKDIR_INST%\ copy msbuild-%platform%-%configuration%.log %WORKDIR_LOG%\ From 6d9e32150819febd2c49cab80497e9214db768ae Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Sun, 24 Jun 2018 17:21:03 +0900 Subject: [PATCH 09/19] =?UTF-8?q?#162:=20artifacts=20=E3=81=AE=E3=83=AB?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=81=AE=E9=96=93=E9=81=95=E3=81=84=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index dd2c8d6250..663f654af0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,4 +30,4 @@ build_script: echo appveyor_yml artifacts: -- path: 'sakura-$(platform)-$(configuration).zip' +- path: 'sakura-$(platform)-$(configuration)*.zip' From 3aeec3db12b3775c40aeadc30c21e4c4c8488feb Mon Sep 17 00:00:00 2001 From: kobake Date: Mon, 11 Jun 2018 08:32:30 +0900 Subject: [PATCH 10/19] =?UTF-8?q?gitrev.h=20=E3=81=AB=20#pragma=20once=20?= =?UTF-8?q?=E5=9F=8B=E3=82=81=E8=BE=BC=E3=81=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/preBuild.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/sakura/preBuild.bat b/sakura/preBuild.bat index d3055d4b81..fe3eb61359 100644 --- a/sakura/preBuild.bat +++ b/sakura/preBuild.bat @@ -50,6 +50,7 @@ if "%GIT_ENABLED%" == "1" ( : Output gitrev.h set GITREV_H=..\sakura_core\gitrev.h type nul > %GITREV_H% +echo #pragma once >> %GITREV_H% if "%COMMITID%" == "" ( type nul >> %GITREV_H% ) else ( From 00f3c6abbef6a8c17e18e2adda8e6de0f2e0ed08 Mon Sep 17 00:00:00 2001 From: kobake Date: Mon, 11 Jun 2018 08:52:30 +0900 Subject: [PATCH 11/19] =?UTF-8?q?exe,=20dll=20=E3=81=AE=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E6=83=85=E5=A0=B1=E3=81=ABPlatform?= =?UTF-8?q?=E6=83=85=E5=A0=B1=E3=82=92=E5=9F=8B=E3=82=81=E8=BE=BC=E3=81=BF?= =?UTF-8?q?=20(32bit/64bit)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/sakura.vcxproj | 1 + sakura/sakura.vcxproj.filters | 3 +++ sakura_core/sakura_rc.rc | 12 ++-------- sakura_core/version.h | 25 +++++++++++++++++++++ sakura_lang_en_US/sakura_lang.h | 2 ++ sakura_lang_en_US/sakura_lang_en_US.vcxproj | 2 +- sakura_lang_en_US/sakura_lang_rc.rc | 12 +--------- 7 files changed, 35 insertions(+), 22 deletions(-) create mode 100644 sakura_core/version.h diff --git a/sakura/sakura.vcxproj b/sakura/sakura.vcxproj index b68706fda1..6e2d033c80 100644 --- a/sakura/sakura.vcxproj +++ b/sakura/sakura.vcxproj @@ -502,6 +502,7 @@ + diff --git a/sakura/sakura.vcxproj.filters b/sakura/sakura.vcxproj.filters index 0b8eef990c..85387fc925 100644 --- a/sakura/sakura.vcxproj.filters +++ b/sakura/sakura.vcxproj.filters @@ -1085,6 +1085,9 @@ Cpp Source Files\uiparts + + Other Files + diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index 6800bce4e7..b47f2045cb 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -10,6 +10,7 @@ #include "sakura_lang.h" #endif #include "gitrev.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -2814,16 +2815,7 @@ BEGIN VALUE "LegalTrademarks", " \0" VALUE "OriginalFilename", "sakura.exe\0" VALUE "ProductName", "ƒTƒNƒ‰ƒGƒfƒBƒ^\0" - VALUE "ProductVersion", PR_VER_STR -#if defined(GIT_SHORT_COMMIT_HASH) - " (GitHash " GIT_SHORT_COMMIT_HASH ")" -#endif -#ifdef _DEBUG - " Debug version" -#endif -#ifndef _UNICODE - " ANSI" -#endif + VALUE "ProductVersion", RESOURCE_VERSION_STRING(PR_VER_STR) // e.g. "2.3.2.0 (4a0de579) UNICODE 64bit DEBUG" END END BLOCK "VarFileInfo" diff --git a/sakura_core/version.h b/sakura_core/version.h new file mode 100644 index 0000000000..970cb42653 --- /dev/null +++ b/sakura_core/version.h @@ -0,0 +1,25 @@ +#pragma once + +#include "gitrev.h" + +#ifdef _UNICODE +#define VER_CHARSET "UNICODE" +#else +#define VER_CHARSET "ANSI" +#endif + +#ifdef _WIN64 +#define VER_PLATFORM "64bit" +#else +#define VER_PLATFORM "32bit" +#endif + +#ifdef _DEBUG +#define VER_CONFIG "DEBUG" +#else +#define VER_CONFIG "" +#endif + +// リソース埋ã‚è¾¼ã¿ç”¨ãƒãƒ¼ã‚¸ãƒ§ãƒ³æ–‡å­—列 +// e.g. "2.3.2.0 (4a0de579) UNICODE 64bit DEBUG" +#define RESOURCE_VERSION_STRING(VERSION_STRING) VERSION_STRING " (" GIT_SHORT_COMMIT_HASH ") " VER_CHARSET " " VER_PLATFORM " " VER_CONFIG diff --git a/sakura_lang_en_US/sakura_lang.h b/sakura_lang_en_US/sakura_lang.h index d211d6f4d9..c8c5abe583 100644 --- a/sakura_lang_en_US/sakura_lang.h +++ b/sakura_lang_en_US/sakura_lang.h @@ -46,5 +46,7 @@ #include "../sakura_core/String_define.h" #endif +#include "../sakura_core/version.h" // #define RESOURCE_VERSION_STRING(VERSION_STRING) + #endif /* SAKURA_SAKURA_LANG_C627B14F_9909_441B_B510_9BBB2D3F078B_H_ */ /*[EOF]*/ diff --git a/sakura_lang_en_US/sakura_lang_en_US.vcxproj b/sakura_lang_en_US/sakura_lang_en_US.vcxproj index 15acd2e043..9960f3a605 100644 --- a/sakura_lang_en_US/sakura_lang_en_US.vcxproj +++ b/sakura_lang_en_US/sakura_lang_en_US.vcxproj @@ -261,7 +261,7 @@ - + diff --git a/sakura_lang_en_US/sakura_lang_rc.rc b/sakura_lang_en_US/sakura_lang_rc.rc index 6a1e363547..52adc4a6fc 100644 --- a/sakura_lang_en_US/sakura_lang_rc.rc +++ b/sakura_lang_en_US/sakura_lang_rc.rc @@ -2790,7 +2790,6 @@ END // // Version // - VS_VERSION_INFO VERSIONINFO FILEVERSION FL_VER PRODUCTVERSION PR_VER @@ -2817,16 +2816,7 @@ BEGIN VALUE "LegalTrademarks", " \0" VALUE "OriginalFilename", "sakura.exe\0" VALUE "ProductName", "Sakura Editor Language DLL\0" - VALUE "ProductVersion", PR_VER_STR -#if defined(GIT_SHORT_COMMIT_HASH) - " (GitHash " GIT_SHORT_COMMIT_HASH ")" -#endif -#ifdef _DEBUG - " Debug version" -#endif -#ifndef _UNICODE - " ANSI" -#endif + VALUE "ProductVersion", RESOURCE_VERSION_STRING(PR_VER_STR) // e.g. "2.3.2.0 4a0de579 UNICODE 64bit DEBUG" END END BLOCK "VarFileInfo" From 3d4302638315b53fa21484afce6365182212e7fd Mon Sep 17 00:00:00 2001 From: kobake Date: Mon, 11 Jun 2018 08:58:37 +0900 Subject: [PATCH 12/19] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E3=81=ABPlatform=E6=83=85=E5=A0=B1=E3=82=92=E5=9F=8B?= =?UTF-8?q?=E3=82=81=E8=BE=BC=E3=81=BF=20(32bit/64bit)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/dlg/CDlgAbout.cpp | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/sakura_core/dlg/CDlgAbout.cpp b/sakura_core/dlg/CDlgAbout.cpp index 3369615f0f..8a85c2d308 100644 --- a/sakura_core/dlg/CDlgAbout.cpp +++ b/sakura_core/dlg/CDlgAbout.cpp @@ -26,6 +26,7 @@ #include "util/module.h" #include "gitrev.h" #include "sakura_rc.h" // 2002/2/10 aroka 復帰 +#include "version.h" #include "sakura.hh" // ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…å ± CDlgAbout.cpp //@@@ 2002.01.07 add start MIK @@ -160,22 +161,28 @@ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) // Last Modified: 1999/9/9 00:00:00 // (ã‚ã‚Œã°SKR_PATCH_INFOã®æ–‡å­—列ãŒãã®ã¾ã¾è¡¨ç¤º) CNativeT cmemMsg; - cmemMsg.AppendString(LS(STR_DLGABOUT_APPNAME)); + cmemMsg.AppendString(LS(STR_DLGABOUT_APPNAME)); // e.g. "サクラエディタ", "Sakura Editor" cmemMsg.AppendString(_T(" ")); - // ãƒãƒ¼ã‚¸ãƒ§ãƒ³&リビジョン情報 + // ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…報・コンフィグ情報 // +#ifdef GIT_COMMIT_HASH +#define VER_GITHASH "(GitHash " GIT_COMMIT_HASH ")\r\n" +#else +#define VER_GITHASH "" +#endif DWORD dwVersionMS, dwVersionLS; GetAppVersionInfo( NULL, VS_VERSION_INFO, &dwVersionMS, &dwVersionLS ); - auto_sprintf(szMsg, _T("Ver. %d.%d.%d.%d\r\n"), - HIWORD(dwVersionMS), - LOWORD(dwVersionMS), - HIWORD(dwVersionLS), - LOWORD(dwVersionLS) + auto_sprintf(szMsg, + _T( + "v%d.%d.%d.%d %hs %hs\r\n" + "%hs" + ), + HIWORD(dwVersionMS), LOWORD(dwVersionMS), HIWORD(dwVersionLS), LOWORD(dwVersionLS), // e.g. {2, 3, 2, 0} + VER_PLATFORM, // e.g. "64bit", "32bit" + VER_CONFIG, // e.g. "DEBUG", "" + VER_GITHASH // e.g. "(GitHash 4a0de5798394409af14ec69c310ba0c86efdfc05)\r\n", "" ); - cmemMsg.AppendString(szMsg); -#if defined(GIT_COMMIT_HASH) - cmemMsg.AppendString(_T("(GitHash " GIT_COMMIT_HASH ")\r\n")); -#endif + cmemMsg.AppendString( szMsg ); #if defined(GIT_URL) cmemMsg.AppendString(_T("(GitURL " GIT_URL ")\r\n")); #endif From 28ff6f8cbb2ad2c9dcc3d4dad5fefe717f1b4031 Mon Sep 17 00:00:00 2001 From: kobake Date: Wed, 13 Jun 2018 10:52:34 +0900 Subject: [PATCH 13/19] =?UTF-8?q?RESOURCE=5FVERSION=5FSTRING=20=E3=83=9E?= =?UTF-8?q?=E3=82=AF=E3=83=AD=E3=81=AE=E5=BC=95=E6=95=B0=E3=82=92=20=5FPas?= =?UTF-8?q?calCase=20=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/version.h | 2 +- sakura_lang_en_US/sakura_lang.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sakura_core/version.h b/sakura_core/version.h index 970cb42653..028c3da204 100644 --- a/sakura_core/version.h +++ b/sakura_core/version.h @@ -22,4 +22,4 @@ // リソース埋ã‚è¾¼ã¿ç”¨ãƒãƒ¼ã‚¸ãƒ§ãƒ³æ–‡å­—列 // e.g. "2.3.2.0 (4a0de579) UNICODE 64bit DEBUG" -#define RESOURCE_VERSION_STRING(VERSION_STRING) VERSION_STRING " (" GIT_SHORT_COMMIT_HASH ") " VER_CHARSET " " VER_PLATFORM " " VER_CONFIG +#define RESOURCE_VERSION_STRING(_VersionString) _VersionString " (" GIT_SHORT_COMMIT_HASH ") " VER_CHARSET " " VER_PLATFORM " " VER_CONFIG diff --git a/sakura_lang_en_US/sakura_lang.h b/sakura_lang_en_US/sakura_lang.h index c8c5abe583..e73a16ca78 100644 --- a/sakura_lang_en_US/sakura_lang.h +++ b/sakura_lang_en_US/sakura_lang.h @@ -46,7 +46,7 @@ #include "../sakura_core/String_define.h" #endif -#include "../sakura_core/version.h" // #define RESOURCE_VERSION_STRING(VERSION_STRING) +#include "../sakura_core/version.h" // #define RESOURCE_VERSION_STRING(_VersionString) #endif /* SAKURA_SAKURA_LANG_C627B14F_9909_441B_B510_9BBB2D3F078B_H_ */ /*[EOF]*/ From a104e05a06efb142d44830279648f011f2ab4cb5 Mon Sep 17 00:00:00 2001 From: kobake Date: Sun, 24 Jun 2018 17:25:10 +0900 Subject: [PATCH 14/19] =?UTF-8?q?=E3=83=AA=E3=82=BD=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=91=E3=82=A4=E3=83=AB=E6=99=82=E3=81=AB?= =?UTF-8?q?=E3=82=82=20x64=20=E7=89=88=E3=81=A7=E3=81=AF=20=5FWIN64=20?= =?UTF-8?q?=E5=AE=9A=E6=95=B0=E3=82=92=E5=AE=9A=E7=BE=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura/sakura.vcxproj | 4 ++-- sakura_lang_en_US/sakura_lang_en_US.vcxproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sakura/sakura.vcxproj b/sakura/sakura.vcxproj index 6e2d033c80..7d416a4bed 100644 --- a/sakura/sakura.vcxproj +++ b/sakura/sakura.vcxproj @@ -158,7 +158,7 @@ call preBuild.bat - NDEBUG;%(PreprocessorDefinitions) + NDEBUG;_WIN64;%(PreprocessorDefinitions) 0x0411 @@ -227,7 +227,7 @@ call preBuild.bat - _DEBUG;%(PreprocessorDefinitions) + _DEBUG;_WIN64;%(PreprocessorDefinitions) 0x0411 diff --git a/sakura_lang_en_US/sakura_lang_en_US.vcxproj b/sakura_lang_en_US/sakura_lang_en_US.vcxproj index 9960f3a605..32ad30e575 100644 --- a/sakura_lang_en_US/sakura_lang_en_US.vcxproj +++ b/sakura_lang_en_US/sakura_lang_en_US.vcxproj @@ -159,7 +159,7 @@ ProgramDatabase - _DEBUG;%(PreprocessorDefinitions) + _DEBUG;_WIN64;%(PreprocessorDefinitions) 0x0411 @@ -241,7 +241,7 @@ true - NDEBUG;%(PreprocessorDefinitions) + NDEBUG;_WIN64;%(PreprocessorDefinitions) 0x0411 From 3815d94910f99606dc3a447a3714253a541ba630 Mon Sep 17 00:00:00 2001 From: kobake Date: Sun, 24 Jun 2018 18:07:56 +0900 Subject: [PATCH 15/19] =?UTF-8?q?=E5=86=97=E9=95=B7=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=82=AF=E3=83=AB=E3=83=BC=E3=83=89=E9=99=A4=E5=A4=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/dlg/CDlgAbout.cpp | 1 - sakura_core/sakura_rc.rc | 1 - 2 files changed, 2 deletions(-) diff --git a/sakura_core/dlg/CDlgAbout.cpp b/sakura_core/dlg/CDlgAbout.cpp index 8a85c2d308..cf5f53e1ce 100644 --- a/sakura_core/dlg/CDlgAbout.cpp +++ b/sakura_core/dlg/CDlgAbout.cpp @@ -24,7 +24,6 @@ #include "uiparts/HandCursor.h" #include "util/file.h" #include "util/module.h" -#include "gitrev.h" #include "sakura_rc.h" // 2002/2/10 aroka 復帰 #include "version.h" #include "sakura.hh" diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index b47f2045cb..929f892c1f 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -9,7 +9,6 @@ #else #include "sakura_lang.h" #endif -#include "gitrev.h" #include "version.h" #define APSTUDIO_READONLY_SYMBOLS From 9ece0002d692a29db94c0a8f790d6432a05ff160 Mon Sep 17 00:00:00 2001 From: kobake Date: Mon, 25 Jun 2018 10:52:40 +0900 Subject: [PATCH 16/19] =?UTF-8?q?sakura=5Flang=20=E5=81=B4=E3=81=A7?= =?UTF-8?q?=E3=82=82=20version.h=20=E3=82=92=E5=88=A9=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_lang_en_US/sakura_lang_rc.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sakura_lang_en_US/sakura_lang_rc.rc b/sakura_lang_en_US/sakura_lang_rc.rc index 52adc4a6fc..b37a7c9ec3 100644 --- a/sakura_lang_en_US/sakura_lang_rc.rc +++ b/sakura_lang_en_US/sakura_lang_rc.rc @@ -9,7 +9,7 @@ #else #include "sakura_lang.h" #endif -#include "../sakura_core/gitrev.h" +#include "../sakura_core/version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// From 25619c070e8d67956760ea1d852fb7873faa52c3 Mon Sep 17 00:00:00 2001 From: kobake Date: Mon, 25 Jun 2018 10:56:55 +0900 Subject: [PATCH 17/19] =?UTF-8?q?=E3=83=AA=E3=83=AA=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E6=99=82=E3=81=AB=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E6=96=87=E5=AD=97=E5=88=97=E6=9C=AB?= =?UTF-8?q?=E5=B0=BE=E3=81=AB=E7=A9=BA=E7=99=BD=E3=81=8C=E5=85=A5=E3=82=8B?= =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/version.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sakura_core/version.h b/sakura_core/version.h index 028c3da204..59b9e25cc8 100644 --- a/sakura_core/version.h +++ b/sakura_core/version.h @@ -20,6 +20,13 @@ #define VER_CONFIG "" #endif +#ifdef _DEBUG +#define SPACE_WHEN_DEBUG " " +#else +#define SPACE_WHEN_DEBUG "" +#endif + // リソース埋ã‚è¾¼ã¿ç”¨ãƒãƒ¼ã‚¸ãƒ§ãƒ³æ–‡å­—列 // e.g. "2.3.2.0 (4a0de579) UNICODE 64bit DEBUG" -#define RESOURCE_VERSION_STRING(_VersionString) _VersionString " (" GIT_SHORT_COMMIT_HASH ") " VER_CHARSET " " VER_PLATFORM " " VER_CONFIG +// e.g. "2.3.2.0 (4a0de579) UNICODE 64bit" +#define RESOURCE_VERSION_STRING(_VersionString) _VersionString " (" GIT_SHORT_COMMIT_HASH ") " VER_CHARSET " " VER_PLATFORM SPACE_WHEN_DEBUG VER_CONFIG From 75d3548ecacce05d559a67dc10fe832cec932675 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Mon, 25 Jun 2018 22:40:29 +0900 Subject: [PATCH 18/19] =?UTF-8?q?#162:=20x64=20=E7=89=88=E3=81=A7=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E6=83=85=E5=A0=B1=E3=81=AB?= =?UTF-8?q?=E3=82=A2=E3=83=AB=E3=83=95=E3=82=A1=E7=89=88=E3=81=AE=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=E3=82=92=E8=A1=8C=E3=81=86=20(x64=20=E3=83=96?= =?UTF-8?q?=E3=83=A9=E3=83=B3=E3=83=81=E3=82=92=E3=83=99=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/StdAfx.h | 10 +++++++++ sakura_core/config/app_constants.h | 9 +++++++- sakura_core/dlg/CDlgAbout.cpp | 35 +++++++++++++++++++----------- sakura_core/version.h | 9 +++++++- 4 files changed, 48 insertions(+), 15 deletions(-) diff --git a/sakura_core/StdAfx.h b/sakura_core/StdAfx.h index 87bfb8fdd0..2ea3a2282e 100644 --- a/sakura_core/StdAfx.h +++ b/sakura_core/StdAfx.h @@ -16,6 +16,16 @@ #define STRICT 1 #endif +#if _WIN64 +#define ALPHA_VERSION +#endif + +#if defined(ALPHA_VERSION) +#pragma message("----------------------------------------------------------------------------------------") +#pragma message("--- This is an alpha version and under development. Be careful to use this version. ---") +#pragma message("----------------------------------------------------------------------------------------") +#endif + #if defined(_MSC_VER) && _MSC_VER >= 1400 //#pragma warning(disable: 4786) diff --git a/sakura_core/config/app_constants.h b/sakura_core/config/app_constants.h index cec530a9aa..07f1f5e8de 100644 --- a/sakura_core/config/app_constants.h +++ b/sakura_core/config/app_constants.h @@ -41,7 +41,14 @@ #define _APP_NAME_2_(TYPE) TYPE("") #endif -#define _GSTR_APPNAME_(TYPE) _APP_NAME_(TYPE) _APP_NAME_2_(TYPE) //—á:UNICODEƒfƒoƒbƒO¨_T("sakura(ƒfƒoƒbƒO”Å)") +#ifdef ALPHA_VERSION + #define _APP_NAME_3_(TYPE) TYPE("(Alpha Version)") +#else + #define _APP_NAME_3_(TYPE) TYPE("") +#endif + +//—á:UNICODEƒfƒoƒbƒO¨_T("sakura(ƒfƒoƒbƒO”Å)") +#define _GSTR_APPNAME_(TYPE) _APP_NAME_(TYPE) _APP_NAME_2_(TYPE) _APP_NAME_3_(TYPE) #define GSTR_APPNAME (_GSTR_APPNAME_(_T) ) #define GSTR_APPNAME_A (_GSTR_APPNAME_(ATEXT)) diff --git a/sakura_core/dlg/CDlgAbout.cpp b/sakura_core/dlg/CDlgAbout.cpp index cf5f53e1ce..3aa0573765 100644 --- a/sakura_core/dlg/CDlgAbout.cpp +++ b/sakura_core/dlg/CDlgAbout.cpp @@ -165,26 +165,35 @@ BOOL CDlgAbout::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam ) // ãƒãƒ¼ã‚¸ãƒ§ãƒ³æƒ…報・コンフィグ情報 // #ifdef GIT_COMMIT_HASH -#define VER_GITHASH "(GitHash " GIT_COMMIT_HASH ")\r\n" -#else -#define VER_GITHASH "" +#define VER_GITHASH "(GitHash " GIT_COMMIT_HASH ")" #endif DWORD dwVersionMS, dwVersionLS; GetAppVersionInfo( NULL, VS_VERSION_INFO, &dwVersionMS, &dwVersionLS ); auto_sprintf(szMsg, - _T( - "v%d.%d.%d.%d %hs %hs\r\n" - "%hs" - ), - HIWORD(dwVersionMS), LOWORD(dwVersionMS), HIWORD(dwVersionLS), LOWORD(dwVersionLS), // e.g. {2, 3, 2, 0} - VER_PLATFORM, // e.g. "64bit", "32bit" - VER_CONFIG, // e.g. "DEBUG", "" - VER_GITHASH // e.g. "(GitHash 4a0de5798394409af14ec69c310ba0c86efdfc05)\r\n", "" + _T("v%d.%d.%d.%d"), + HIWORD(dwVersionMS), LOWORD(dwVersionMS), HIWORD(dwVersionLS), LOWORD(dwVersionLS) // e.g. {2, 3, 2, 0} ); + + // 1行目 cmemMsg.AppendString( szMsg ); -#if defined(GIT_URL) - cmemMsg.AppendString(_T("(GitURL " GIT_URL ")\r\n")); + cmemMsg.AppendString( _T(" ") _T(VER_PLATFORM) ); + cmemMsg.AppendString( _T(SPACE_WHEN_DEBUG) _T(VER_CONFIG) ); +#ifdef ALPHA_VERSION + cmemMsg.AppendString( _T(" ") _T(ALPHA_VERSION_STR)); +#endif + cmemMsg.AppendString( _T("\r\n") ); + + // 2行目 +#ifdef VER_GITHASH + cmemMsg.AppendString( _T(VER_GITHASH) _T("\r\n")); #endif + + // 3行目 +#ifdef GIT_URL + cmemMsg.AppendString( _T("(GitURL ") _T(GIT_URL) _T(")\r\n")); +#endif + + // 段è½åŒºåˆ‡ã‚Š cmemMsg.AppendString( _T("\r\n") ); // 共有メモリ情報 diff --git a/sakura_core/version.h b/sakura_core/version.h index 59b9e25cc8..fb0d5b4fb0 100644 --- a/sakura_core/version.h +++ b/sakura_core/version.h @@ -26,7 +26,14 @@ #define SPACE_WHEN_DEBUG "" #endif +#ifdef ALPHA_VERSION +#define ALPHA_VERSION_STR "Alpha Version" +#define ALPHA_VERSION_VER_STR " " ALPHA_VERSION_STR +#else +#define ALPHA_VERSION_VER_STR "" +#endif + // リソース埋ã‚è¾¼ã¿ç”¨ãƒãƒ¼ã‚¸ãƒ§ãƒ³æ–‡å­—列 // e.g. "2.3.2.0 (4a0de579) UNICODE 64bit DEBUG" // e.g. "2.3.2.0 (4a0de579) UNICODE 64bit" -#define RESOURCE_VERSION_STRING(_VersionString) _VersionString " (" GIT_SHORT_COMMIT_HASH ") " VER_CHARSET " " VER_PLATFORM SPACE_WHEN_DEBUG VER_CONFIG +#define RESOURCE_VERSION_STRING(_VersionString) _VersionString " (" GIT_SHORT_COMMIT_HASH ") " VER_CHARSET " " VER_PLATFORM SPACE_WHEN_DEBUG VER_CONFIG ALPHA_VERSION_VER_STR From 5b38c43fa3903552011983cc9a4ac4a36b353339 Mon Sep 17 00:00:00 2001 From: Masaru Tsuchiyama Date: Tue, 26 Jun 2018 20:29:16 +0900 Subject: [PATCH 19/19] =?UTF-8?q?#162:=20=E3=83=AA=E3=82=BD=E3=83=BC?= =?UTF-8?q?=E3=82=B9=E3=81=AB=20Alpha=20=E3=81=AE=E6=96=87=E5=AD=97?= =?UTF-8?q?=E5=88=97=E3=81=8C=E5=8F=8D=E6=98=A0=E3=81=95=E3=82=8C=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/StdAfx.h | 10 ---------- sakura_core/config/app_constants.h | 2 ++ sakura_core/version.h | 18 ++++++++++++++---- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/sakura_core/StdAfx.h b/sakura_core/StdAfx.h index 2ea3a2282e..87bfb8fdd0 100644 --- a/sakura_core/StdAfx.h +++ b/sakura_core/StdAfx.h @@ -16,16 +16,6 @@ #define STRICT 1 #endif -#if _WIN64 -#define ALPHA_VERSION -#endif - -#if defined(ALPHA_VERSION) -#pragma message("----------------------------------------------------------------------------------------") -#pragma message("--- This is an alpha version and under development. Be careful to use this version. ---") -#pragma message("----------------------------------------------------------------------------------------") -#endif - #if defined(_MSC_VER) && _MSC_VER >= 1400 //#pragma warning(disable: 4786) diff --git a/sakura_core/config/app_constants.h b/sakura_core/config/app_constants.h index 07f1f5e8de..9fea801ba2 100644 --- a/sakura_core/config/app_constants.h +++ b/sakura_core/config/app_constants.h @@ -24,6 +24,8 @@ #ifndef SAKURA_APP_CONSTANTS_AD36E2CE_B62E_497D_806F_6B9738310127_H_ #define SAKURA_APP_CONSTANTS_AD36E2CE_B62E_497D_806F_6B9738310127_H_ +#include "version.h" + // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // // –¼‘O // // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // diff --git a/sakura_core/version.h b/sakura_core/version.h index fb0d5b4fb0..3d2448e14b 100644 --- a/sakura_core/version.h +++ b/sakura_core/version.h @@ -26,14 +26,24 @@ #define SPACE_WHEN_DEBUG "" #endif +#if _WIN64 +#define ALPHA_VERSION +#endif + +#if defined(ALPHA_VERSION) +#pragma message("----------------------------------------------------------------------------------------") +#pragma message("--- This is an alpha version and under development. Be careful to use this version. ---") +#pragma message("----------------------------------------------------------------------------------------") +#endif + #ifdef ALPHA_VERSION -#define ALPHA_VERSION_STR "Alpha Version" -#define ALPHA_VERSION_VER_STR " " ALPHA_VERSION_STR +#define ALPHA_VERSION_STR "Alpha Version" +#define ALPHA_VERSION_STR_WITH_SPACE " " ALPHA_VERSION_STR #else -#define ALPHA_VERSION_VER_STR "" +#define ALPHA_VERSION_STR_WITH_SPACE "" #endif // リソース埋ã‚è¾¼ã¿ç”¨ãƒãƒ¼ã‚¸ãƒ§ãƒ³æ–‡å­—列 // e.g. "2.3.2.0 (4a0de579) UNICODE 64bit DEBUG" // e.g. "2.3.2.0 (4a0de579) UNICODE 64bit" -#define RESOURCE_VERSION_STRING(_VersionString) _VersionString " (" GIT_SHORT_COMMIT_HASH ") " VER_CHARSET " " VER_PLATFORM SPACE_WHEN_DEBUG VER_CONFIG ALPHA_VERSION_VER_STR +#define RESOURCE_VERSION_STRING(_VersionString) _VersionString " (" GIT_SHORT_COMMIT_HASH ") " VER_CHARSET " " VER_PLATFORM SPACE_WHEN_DEBUG VER_CONFIG ALPHA_VERSION_STR_WITH_SPACE