Tera Term

[ttssh2-commit] [10540] svnversion.h を teraterm/common/ に移動した

• 前の記事 (スレッド) [ttssh2-commit] [10539] UnRAR の更新に対応した
• 次の記事 (スレッド) [ttssh2-commit] [10541] cmakeビルド用 svnversion.h 移動修正
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 10540
          https://osdn.net/projects/ttssh2/scm/svn/commits/10540
Author:   zmatsuo
Date:     2023-01-29 00:26:00 +0900 (Sun, 29 Jan 2023)
Log Message:
-----------
svnversion.h を teraterm/common/ に移動した

- svnversion.h は buildtools/svnrev/svnrev.bat で生成されるファイル
- teraterm/ttpdlg/ にあった
- 共有ファイルを置く teraterm/common/ にあるほうが妥当

Modified Paths:
--------------
    trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v16.vcxproj
    trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v17.vcxproj
    trunk/buildtools/svnrev/readme.md
    trunk/buildtools/svnrev/svnrev.bat

-------------- next part --------------
Modified: trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v16.vcxproj
===================================================================
--- trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v16.vcxproj	2023-01-28 15:25:51 UTC (rev 10539)
+++ trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v16.vcxproj	2023-01-28 15:26:00 UTC (rev 10540)
@@ -55,7 +55,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\ttpdlg;$(SolutionDir)..\libs\cJSON;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\cJSON;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CJSON_HIDE_SYMBOLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -74,7 +74,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\ttpdlg;$(SolutionDir)..\libs\cJSON;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\cJSON;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CJSON_HIDE_SYMBOLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
@@ -109,4 +109,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v17.vcxproj
===================================================================
--- trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v17.vcxproj	2023-01-28 15:25:51 UTC (rev 10539)
+++ trunk/TTXSamples/TTXCheckUpdate/TTXCheckUpdate.v17.vcxproj	2023-01-28 15:26:00 UTC (rev 10540)
@@ -55,7 +55,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\ttpdlg;$(SolutionDir)..\libs\cJSON;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\cJSON;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CJSON_HIDE_SYMBOLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -74,7 +74,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\teraterm\ttpdlg;$(SolutionDir)..\libs\cJSON;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\teraterm\common;$(SolutionDir)..\teraterm\teraterm;$(SolutionDir)..\libs\cJSON;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CJSON_HIDE_SYMBOLS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader />
@@ -109,4 +109,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/buildtools/svnrev/readme.md
===================================================================
--- trunk/buildtools/svnrev/readme.md	2023-01-28 15:25:51 UTC (rev 10539)
+++ trunk/buildtools/svnrev/readme.md	2023-01-28 15:26:00 UTC (rev 10540)
@@ -2,7 +2,7 @@
 
 - ソースツリーのsvn(又は git)の情報をヘッダファイル等に書き出すためのツール
   - ソース用のヘッダフィル
-    - 例 `../teraterm/ttpdlg/svnversion.h`
+    - 例 `../teraterm/common/svnversion.h`
   - CI用のbatファイル
     - 例 `sourcetree_info.bat`
   - cmake用ファイル
@@ -42,7 +42,7 @@
   - ビルド用のファイルをジェネレート時に自動で生成される
   - build フォルダの build_config.cmake を削除してビルドすると再生成される
 - コマンドラインで直接実行する場合
-  - `perl svnrev.pl --root ../.. --header ../../teraterm/ttpdlg/svnversion.h`
+  - `perl svnrev.pl --root ../.. --header ../../teraterm/common/svnversion.h`
 
 ## svnrev.pl のオプション
 

Modified: trunk/buildtools/svnrev/svnrev.bat
===================================================================
--- trunk/buildtools/svnrev/svnrev.bat	2023-01-28 15:25:51 UTC (rev 10539)
+++ trunk/buildtools/svnrev/svnrev.bat	2023-01-28 15:26:00 UTC (rev 10540)
@@ -3,8 +3,8 @@
 cd /d %~dp0
 set BAT=%~n0%~x0
 
-set SVNVERSION_H=../../teraterm/ttpdlg/svnversion.h
-set SVNVERSION_H_DOS=..\..\teraterm\ttpdlg\svnversion.h
+set SVNVERSION_H=../../teraterm/common/svnversion.h
+set SVNVERSION_H_DOS=..\..\teraterm\common\svnversion.h
 set DO_NOT_RUN_SVNREV=do_not_run_svnrev.txt
 
 if NOT EXIST %SVNVERSION_H% goto env_perl

• 前の記事 (スレッド) [ttssh2-commit] [10539] UnRAR の更新に対応した
• 次の記事 (スレッド) [ttssh2-commit] [10541] cmakeビルド用 svnversion.h 移動修正
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]