[Ttssh2-commit] [7548] svnversion.h を .\ttpdlg\ に生成するようにした

scmno****@osdn***** scmno****@osdn*****
2019年 4月 5日 (金) 02:00:22 JST


Revision: 7548
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7548
Author:   zmatsuo
Date:     2019-04-05 02:00:21 +0900 (Fri, 05 Apr 2019)
Log Message:
-----------
svnversion.h を .\ttpdlg\ に生成するようにした

Modified Paths:
--------------
    trunk/teraterm/teraterm/CMakeLists.txt
    trunk/teraterm/teraterm/ttermpro.v10.vcxproj
    trunk/teraterm/teraterm/ttermpro.v11.vcxproj
    trunk/teraterm/teraterm/ttermpro.v12.vcxproj
    trunk/teraterm/teraterm/ttermpro.v14.vcxproj
    trunk/teraterm/teraterm/ttermpro.v15.vcxproj
    trunk/teraterm/teraterm/ttermpro.v9.vcproj
    trunk/teraterm/teraterm/ttermpro.vcproj

-------------- next part --------------
Modified: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt	2019-04-04 12:29:00 UTC (rev 7547)
+++ trunk/teraterm/teraterm/CMakeLists.txt	2019-04-04 17:00:21 UTC (rev 7548)
@@ -136,7 +136,7 @@
   teraterm.manifest
   #
   svnversion.h.in
-  ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
+  ${CMAKE_CURRENT_BINARY_DIR}/../ttpdlg/svnversion.h
   #
   ${COMMON_SRC}
   ${TTDLG_SRC}
@@ -197,10 +197,6 @@
   ttptek
   )
 
-configure_file(
-  svnversion.h.in
-  svnversion.h @ONLY)
-
 # copy .lng files
 if(${CMAKE_GENERATOR} MATCHES "Visual Studio 15 2017")
   add_custom_target(
@@ -260,4 +256,4 @@
 ####
 configure_file(
   svnversion.h.in
-  svnversion.h @ONLY)
+  ../ttpdlg/svnversion.h @ONLY)

Modified: trunk/teraterm/teraterm/ttermpro.v10.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v10.vcxproj	2019-04-04 12:29:00 UTC (rev 7547)
+++ trunk/teraterm/teraterm/ttermpro.v10.vcxproj	2019-04-04 17:00:21 UTC (rev 7548)
@@ -90,6 +90,10 @@
     <Manifest>
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
+    <PreBuildEvent>
+      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h"</Command>
+      <Message>creating "$(ProjectDir)..\ttpdlg\svnversion.h"</Message>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
@@ -131,6 +135,10 @@
     <Manifest>
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
+    <PreBuildEvent>
+      <Message>creating "$(ProjectDir)..\ttpdlg\svnversion.h"</Message>
+      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h"</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\common\dlglib.c" />
@@ -190,6 +198,9 @@
     <ClInclude Include="ttfileio.h" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\svnrev\svnrev.v10.vcxproj">
+      <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v10.vcxproj">
       <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Modified: trunk/teraterm/teraterm/ttermpro.v11.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v11.vcxproj	2019-04-04 12:29:00 UTC (rev 7547)
+++ trunk/teraterm/teraterm/ttermpro.v11.vcxproj	2019-04-04 17:00:21 UTC (rev 7548)
@@ -88,6 +88,10 @@
     <Manifest>
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
+    <PreBuildEvent>
+      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h"</Command>
+      <Message>creating "$(ProjectDir)..\ttpdlg\svnversion.h"</Message>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
@@ -128,6 +132,10 @@
     <Manifest>
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
+    <PreBuildEvent>
+      <Message>creating "$(ProjectDir)..\ttpdlg\svnversion.h"</Message>
+      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h"</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\common\dlglib.c" />
@@ -187,6 +195,9 @@
     <ClInclude Include="ttfileio.h" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\svnrev\svnrev.v11.vcxproj">
+      <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v11.vcxproj">
       <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Modified: trunk/teraterm/teraterm/ttermpro.v12.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v12.vcxproj	2019-04-04 12:29:00 UTC (rev 7547)
+++ trunk/teraterm/teraterm/ttermpro.v12.vcxproj	2019-04-04 17:00:21 UTC (rev 7548)
@@ -89,6 +89,10 @@
     <Manifest>
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
+    <PreBuildEvent>
+      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h"</Command>
+      <Message>creating "$(ProjectDir)..\ttpdlg\svnversion.h"</Message>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
@@ -130,6 +134,10 @@
     <Manifest>
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
+    <PreBuildEvent>
+      <Message>creating "$(ProjectDir)..\ttpdlg\svnversion.h"</Message>
+      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h"</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\common\dlglib.c" />
@@ -189,6 +197,9 @@
     <ClInclude Include="ttfileio.h" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\svnrev\svnrev.v12.vcxproj">
+      <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v12.vcxproj">
       <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Modified: trunk/teraterm/teraterm/ttermpro.v14.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v14.vcxproj	2019-04-04 12:29:00 UTC (rev 7547)
+++ trunk/teraterm/teraterm/ttermpro.v14.vcxproj	2019-04-04 17:00:21 UTC (rev 7548)
@@ -91,6 +91,10 @@
     <Manifest>
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
+    <PreBuildEvent>
+      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h"</Command>
+      <Message>creating "$(ProjectDir)..\ttpdlg\svnversion.h"</Message>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
@@ -132,6 +136,10 @@
     <Manifest>
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
+    <PreBuildEvent>
+      <Message>creating "$(ProjectDir)..\ttpdlg\svnversion.h"</Message>
+      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h"</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\common\dlglib.c" />
@@ -191,6 +199,9 @@
     <ClInclude Include="ttfileio.h" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\svnrev\svnrev.v14.vcxproj">
+      <Project>{80f1c3f0-a213-4d48-85c8-a265990d19a7}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\ttpcmn\ttpcmn.v14.vcxproj">
       <Project>{118e0d32-5553-4f73-9927-e873c1c500e4}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

Modified: trunk/teraterm/teraterm/ttermpro.v15.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v15.vcxproj	2019-04-04 12:29:00 UTC (rev 7547)
+++ trunk/teraterm/teraterm/ttermpro.v15.vcxproj	2019-04-04 17:00:21 UTC (rev 7548)
@@ -65,7 +65,7 @@
     <ClCompile>
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <BrowseInformation />
@@ -78,7 +78,7 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0411</Culture>
-      <AdditionalIncludeDirectories>.;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
       <AdditionalDependencies>LIBCMTD.lib;onig_sd.lib;comctl32.lib;ws2_32.lib;imagehlp.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -94,8 +94,8 @@
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
     <PreBuildEvent>
-      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
-      <Message>creating "$(ProjectDir)svnversion.h"</Message>
+      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h"</Command>
+      <Message>creating "$(ProjectDir)..\ttpdlg\svnversion.h"</Message>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -111,7 +111,7 @@
       <AdditionalOptions>/D"_CRT_SECURE_NO_DEPRECATE" %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>.;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -141,8 +141,8 @@
       <AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
     <PreBuildEvent>
-      <Message>creating "$(ProjectDir)svnversion.h"</Message>
-      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h"</Command>
+      <Message>creating "$(ProjectDir)..\ttpdlg\svnversion.h"</Message>
+      <Command>"$(OutDir)svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h"</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>

Modified: trunk/teraterm/teraterm/ttermpro.v9.vcproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v9.vcproj	2019-04-04 12:29:00 UTC (rev 7547)
+++ trunk/teraterm/teraterm/ttermpro.v9.vcproj	2019-04-04 17:00:21 UTC (rev 7548)
@@ -26,6 +26,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="creating "$(ProjectDir)..\ttpdlg\svnversion.h""
+				CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -49,7 +51,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE""
 				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)common;$(SolutionDir)ttpfile"
+				AdditionalIncludeDirectories="$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				RuntimeLibrary="1"
 				BrowseInformation="0"
@@ -117,6 +119,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
+				Description="creating "$(ProjectDir)..\ttpdlg\svnversion.h""
+				CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -141,7 +145,7 @@
 				AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE""
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(SolutionDir)common;$(SolutionDir)ttpfile"
+				AdditionalIncludeDirectories="$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="0"

Modified: trunk/teraterm/teraterm/ttermpro.vcproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.vcproj	2019-04-04 12:29:00 UTC (rev 7547)
+++ trunk/teraterm/teraterm/ttermpro.vcproj	2019-04-04 17:00:21 UTC (rev 7548)
@@ -25,8 +25,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="creating "$(ProjectDir)svnversion.h""
-				CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h""
+				Description="creating "$(ProjectDir)..\ttpdlg\svnversion.h""
+				CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -50,7 +50,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE""
 				Optimization="0"
-				AdditionalIncludeDirectories=".;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
+				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
 				RuntimeLibrary="1"
 				BrowseInformation="0"
@@ -119,8 +119,8 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				Description="creating "$(ProjectDir)svnversion.h""
-				CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)svnversion.h""
+				Description="creating "$(ProjectDir)..\ttpdlg\svnversion.h""
+				CommandLine=""$(OutDir)\svnrev.exe" "$(SolutionDir)..\libs\svn\bin\svnversion.exe" "$(SolutionDir).." "$(ProjectDir)..\ttpdlg\svnversion.h""
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -145,7 +145,7 @@
 				AdditionalOptions="/D"_CRT_SECURE_NO_DEPRECATE""
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".;$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
+				AdditionalIncludeDirectories="$(SolutionDir)..\libs\oniguruma\src;$(SolutionDir)common;$(SolutionDir)ttpfile;$(SolutionDir)ttpdlg"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
 				StringPooling="true"
 				RuntimeLibrary="0"


Ttssh2-commit メーリングリストの案内