Tera TermRevision: 9761
https://osdn.net/projects/ttssh2/scm/svn/commits/9761
Author: zmatsuo
Date: 2022-02-21 00:09:14 +0900 (Mon, 21 Feb 2022)
Log Message:
-----------
svnrev_perl プロジェクトを削除
- ビルド前イベントでsvnrev.bat を呼び出すようにした
- svnrev_perl プロジェクト依存を削除
- 常に svnrev.bat から svnrev.pl を呼び出すようにした
- 従来 svnversion.h が存在していたら呼び出さなかった
- 従来 svnrev.pl は svnversion.h を常に更新されていた
- 現在は必要な時のみ svnversion.h が更新される
- r9759
- ビルドは最小となる
ttssh2-dev 257
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/9759
Modified Paths:
--------------
trunk/svnrev_perl/svnrev.bat
trunk/teraterm/teraterm/ttermpro.v16.vcxproj
trunk/teraterm/ttermpro.v16.sln
Removed Paths:
-------------
trunk/svnrev_perl/svnrev_perl.v16.vcxproj
trunk/svnrev_perl/svnrev_perl.v8.vcproj
-------------- next part --------------
Modified: trunk/svnrev_perl/svnrev.bat
===================================================================
--- trunk/svnrev_perl/svnrev.bat 2022-02-20 05:45:23 UTC (rev 9760)
+++ trunk/svnrev_perl/svnrev.bat 2022-02-20 15:09:14 UTC (rev 9761)
@@ -5,9 +5,11 @@
set SVNVERSION_H=../teraterm/ttpdlg/svnversion.h
set SVNVERSION_H_DOS=..\teraterm\ttpdlg\svnversion.h
+set DO_NOT_RUN_SVNREV=do_not_run_svnrev.txt
if NOT EXIST %SVNVERSION_H% goto env_perl
- ＠ echo %BAT%: already exist %SVNVERSION_H%
+if NOT EXIST %DO_NOT_RUN_SVNREV% goto env_perl
+ ＠ echo %BAT%: Find %DO_NOT_RUN_SVNREV%, Do not run svnrev.pl
goto finish
:env_perl
Deleted: trunk/svnrev_perl/svnrev_perl.v16.vcxproj
===================================================================
--- trunk/svnrev_perl/svnrev_perl.v16.vcxproj 2022-02-20 05:45:23 UTC (rev 9760)
+++ trunk/svnrev_perl/svnrev_perl.v16.vcxproj 2022-02-20 15:09:14 UTC (rev 9761)
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <VCProjectVersion>16.0</VCProjectVersion>
- <ProjectGuid>{53DB5F02-7F9E-4E29-9751-B0DAC6A8EEBA}</ProjectGuid>
- <RootNamespace>svnrevperl</RootNamespace>
- <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
- <ProjectName>svnrev_perl</ProjectName>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Utility</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v142</PlatformToolset>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Utility</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v142</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v142</PlatformToolset>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v142</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="Shared">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <LinkIncremental>true</LinkIncremental>
- <CustomBuildBeforeTargets>Build</CustomBuildBeforeTargets>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <LinkIncremental>true</LinkIncremental>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <SDLCheck>true</SDLCheck>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ConformanceMode>true</ConformanceMode>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- <CustomBuildStep>
- <Command>$(ProjectDir)svnrev.bat</Command>
- <Outputs>$(ProjectDir)..\teraterm\ttpdlg\svnversion.h</Outputs>
- </CustomBuildStep>
- <PreBuildEvent>
- <Command>$(ProjectDir)svnrev.bat</Command>
- <Message>Create $(ProjectDir)..\teraterm\ttpdlg\svnversion.h</Message>
- </PreBuildEvent>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <LinkIncremental>false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <SDLCheck>true</SDLCheck>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ConformanceMode>true</ConformanceMode>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- <CustomBuildStep>
- <Command>$(ProjectDir)svnrev.bat</Command>
- <Outputs>$(ProjectDir)..\teraterm\ttpdlg\svnversion.h</Outputs>
- </CustomBuildStep>
- <PreBuildEvent>
- <Command>"$(ProjectDir)svnrev.bat"</Command>
- <Message>Create $(ProjectDir)..\teraterm\ttpdlg\svnversion.h</Message>
- </PreBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <SDLCheck>true</SDLCheck>
- <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ConformanceMode>true</ConformanceMode>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <SDLCheck>true</SDLCheck>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ConformanceMode>true</ConformanceMode>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- <CustomBuildStep>
- <Command>$(ProjectDir)svnrev.bat</Command>
- <Outputs>$(ProjectDir)..\teraterm\ttpdlg\svnversion.h</Outputs>
- </CustomBuildStep>
- <PreBuildEvent>
- <Command>"$(ProjectDir)svnrev.bat"</Command>
- <Message>Create $(ProjectDir)..\teraterm\ttpdlg\svnversion.h</Message>
- </PreBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <SDLCheck>true</SDLCheck>
- <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ConformanceMode>true</ConformanceMode>
- </ClCompile>
- <Link>
- <SubSystem>Console</SubSystem>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <None Include="svnrev.bat" />
- <None Include="svnrev.pl" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
Deleted: trunk/svnrev_perl/svnrev_perl.v8.vcproj
===================================================================
--- trunk/svnrev_perl/svnrev_perl.v8.vcproj 2022-02-20 05:45:23 UTC (rev 9760)
+++ trunk/svnrev_perl/svnrev_perl.v8.vcproj 2022-02-20 15:09:14 UTC (rev 9761)
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="svnrev_perl"
- ProjectGUID="{1D9096FC-EC94-4913-B14A-9D97AAB88E7F}"
- RootNamespace="svnrev_perl"
- Keyword="Win32Proj"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="10"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- Description="Create $(ProjectDir)..\teraterm\ttpdlg\svnversion.h"
- CommandLine=""$(ProjectDir)svnrev.bat""
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="10"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- Description="Create $(ProjectDir)..\teraterm\ttpdlg\svnversion.h"
- CommandLine=""$(ProjectDir)svnrev.bat""
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <File
- RelativePath=".\svnrev.bat"
- >
- </File>
- <File
- RelativePath=".\svnrev.pl"
- >
- </File>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Modified: trunk/teraterm/teraterm/ttermpro.v16.vcxproj
===================================================================
--- trunk/teraterm/teraterm/ttermpro.v16.vcxproj 2022-02-20 05:45:23 UTC (rev 9760)
+++ trunk/teraterm/teraterm/ttermpro.v16.vcxproj 2022-02-20 15:09:14 UTC (rev 9761)
@@ -133,6 +133,9 @@
<Manifest>
<AdditionalManifestFiles>.\teraterm.manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
</Manifest>
+ <PreBuildEvent>
+ <Command>$(SolutionDir)..\svnrev_perl\svnrev.bat</Command>
+ </PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\common\ttlib.c" />
@@ -286,9 +289,6 @@
<ProjectReference Include="..\..\cygwin\cyglib\cyglib.v16.vcxproj">
<Project>{a171f48c-bfb2-4766-97c3-9b8b7be9d548}</Project>
</ProjectReference>
- <ProjectReference Include="..\..\svnrev_perl\svnrev_perl.v16.vcxproj">
- <Project>{53db5f02-7f9e-4e29-9751-b0dac6a8eeba}</Project>
- </ProjectReference>
<ProjectReference Include="..\common\common_static.v16.vcxproj">
<Project>{ac42387d-23ec-45db-81f9-8933c7efa52a}</Project>
</ProjectReference>
Modified: trunk/teraterm/ttermpro.v16.sln
===================================================================
--- trunk/teraterm/ttermpro.v16.sln 2022-02-20 05:45:23 UTC (rev 9760)
+++ trunk/teraterm/ttermpro.v16.sln 2022-02-20 15:09:14 UTC (rev 9761)
@@ -16,8 +16,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common_static", "common\common_static.v16.vcxproj", "{AC42387D-23EC-45DB-81F9-8933C7EFA52A}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "svnrev_perl", "..\svnrev_perl\svnrev_perl.v16.vcxproj", "{53DB5F02-7F9E-4E29-9751-B0DAC6A8EEBA}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cyglib", "..\cygwin\cyglib\cyglib.v16.vcxproj", "{A171F48C-BFB2-4766-97C3-9B8B7BE9D548}"
EndProject
Global
@@ -70,14 +68,6 @@
{AC42387D-23EC-45DB-81F9-8933C7EFA52A}.Release|Win32.ActiveCfg = Release|Win32
{AC42387D-23EC-45DB-81F9-8933C7EFA52A}.Release|Win32.Build.0 = Release|Win32
{AC42387D-23EC-45DB-81F9-8933C7EFA52A}.Release|x64.ActiveCfg = Release|Win32
- {53DB5F02-7F9E-4E29-9751-B0DAC6A8EEBA}.Debug|Win32.ActiveCfg = Debug|Win32
- {53DB5F02-7F9E-4E29-9751-B0DAC6A8EEBA}.Debug|Win32.Build.0 = Debug|Win32
- {53DB5F02-7F9E-4E29-9751-B0DAC6A8EEBA}.Debug|x64.ActiveCfg = Debug|x64
- {53DB5F02-7F9E-4E29-9751-B0DAC6A8EEBA}.Debug|x64.Build.0 = Debug|x64
- {53DB5F02-7F9E-4E29-9751-B0DAC6A8EEBA}.Release|Win32.ActiveCfg = Release|Win32
- {53DB5F02-7F9E-4E29-9751-B0DAC6A8EEBA}.Release|Win32.Build.0 = Release|Win32
- {53DB5F02-7F9E-4E29-9751-B0DAC6A8EEBA}.Release|x64.ActiveCfg = Release|x64
- {53DB5F02-7F9E-4E29-9751-B0DAC6A8EEBA}.Release|x64.Build.0 = Release|x64
{A171F48C-BFB2-4766-97C3-9B8B7BE9D548}.Debug|Win32.ActiveCfg = Debug|Win32
{A171F48C-BFB2-4766-97C3-9B8B7BE9D548}.Debug|Win32.Build.0 = Debug|Win32
{A171F48C-BFB2-4766-97C3-9B8B7BE9D548}.Debug|x64.ActiveCfg = Debug|Win32