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/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 // ファイルの入換え 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/appveyor.yml b/appveyor.yml index dd2c8d6250..94836773b5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,6 +12,7 @@ configuration: platform: - Win32 + - x64 build_script: - cmd: >- @@ -30,4 +31,4 @@ build_script: echo appveyor_yml artifacts: -- path: 'sakura-$(platform)-$(configuration).zip' +- path: 'sakura-$(platform)-$(configuration)*.zip' 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/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/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 ( diff --git a/sakura/sakura.vcxproj b/sakura/sakura.vcxproj index d457ba99e8..7d416a4bed 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 @@ -89,6 +126,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) + true + + + comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies) + true + Windows + true + true + + + call postBuild.bat "$(TargetPath).manifest" + + + call preBuild.bat + + + NDEBUG;_WIN64;%(PreprocessorDefinitions) + 0x0411 + + Disabled @@ -124,6 +197,40 @@ 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) + true + + + comctl32.lib;Imm32.lib;mpr.lib;imagehlp.lib;Shlwapi.lib;%(AdditionalDependencies) + true + Windows + false + + + call postBuild.bat "$(TargetPath).manifest" + + + call preBuild.bat + + + _DEBUG;_WIN64;%(PreprocessorDefinitions) + 0x0411 + + @@ -395,6 +502,7 @@ + @@ -723,7 +831,9 @@ Create + Create Create + Create 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/_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/config/app_constants.h b/sakura_core/config/app_constants.h index cec530a9aa..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 // // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- // @@ -41,7 +43,14 @@ #define _APP_NAME_2_(TYPE) TYPE("") #endif -#define _GSTR_APPNAME_(TYPE) _APP_NAME_(TYPE) _APP_NAME_2_(TYPE) //:UNICODEfobO_T("sakura(fobO)") +#ifdef ALPHA_VERSION + #define _APP_NAME_3_(TYPE) TYPE("(Alpha Version)") +#else + #define _APP_NAME_3_(TYPE) TYPE("") +#endif + +//:UNICODEfobO_T("sakura(fobO)") +#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 3369615f0f..3aa0573765 100644 --- a/sakura_core/dlg/CDlgAbout.cpp +++ b/sakura_core/dlg/CDlgAbout.cpp @@ -24,8 +24,8 @@ #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" // バージョン情報 CDlgAbout.cpp //@@@ 2002.01.07 add start MIK @@ -160,25 +160,40 @@ 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 ")" +#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"), + HIWORD(dwVersionMS), LOWORD(dwVersionMS), HIWORD(dwVersionLS), LOWORD(dwVersionLS) // e.g. {2, 3, 2, 0} ); - cmemMsg.AppendString(szMsg); -#if defined(GIT_COMMIT_HASH) - cmemMsg.AppendString(_T("(GitHash " GIT_COMMIT_HASH ")\r\n")); + + // 1行目 + cmemMsg.AppendString( szMsg ); + 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 -#if defined(GIT_URL) - cmemMsg.AppendString(_T("(GitURL " GIT_URL ")\r\n")); + 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/sakura_rc.rc b/sakura_core/sakura_rc.rc index 6800bce4e7..929f892c1f 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -9,7 +9,7 @@ #else #include "sakura_lang.h" #endif -#include "gitrev.h" +#include "version.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -2814,16 +2814,7 @@ BEGIN VALUE "LegalTrademarks", " \0" VALUE "OriginalFilename", "sakura.exe\0" VALUE "ProductName", "TNGfB^\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/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Ɗgq _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; } 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 ); } diff --git a/sakura_core/version.h b/sakura_core/version.h new file mode 100644 index 0000000000..3d2448e14b --- /dev/null +++ b/sakura_core/version.h @@ -0,0 +1,49 @@ +#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 + +#ifdef _DEBUG +#define SPACE_WHEN_DEBUG " " +#else +#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_STR_WITH_SPACE " " ALPHA_VERSION_STR +#else +#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_STR_WITH_SPACE 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.h b/sakura_lang_en_US/sakura_lang.h index d211d6f4d9..e73a16ca78 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(_VersionString) + #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 92e24f73aa..32ad30e575 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;_WIN64;%(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,11 +217,51 @@ $(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;_WIN64;%(PreprocessorDefinitions) + 0x0411 + + + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + true + $(OutDir)$(TargetName).pdb + true + $(OutDir)$(TargetName).lib + + + true + $(OutDir)$(TargetName).bsc + + - + diff --git a/sakura_lang_en_US/sakura_lang_rc.rc b/sakura_lang_en_US/sakura_lang_rc.rc index 6a1e363547..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 ///////////////////////////////////////////////////////////////////////////// @@ -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" diff --git a/zipArtifacts.bat b/zipArtifacts.bat index 5acb16571f..54abdee60d 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%" ( @@ -27,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%\