Skip to content

Commit 44c2231

Browse files
jet2jetjet2jet
committed
Change version management (use versions.props)
1 parent ff4f68c commit 44c2231

16 files changed

Lines changed: 148 additions & 19 deletions

‎Common/Common.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@
199199
<None Include="..\.gitignore" />
200200
<None Include="..\MuiResourceCompile.props" />
201201
<None Include="..\MuiResourceCompile.targets" />
202+
<None Include="..\versions.props" />
202203
<None Include="ReadMe.txt" />
203204
</ItemGroup>
204205
<ItemGroup>

‎Common/Common.vcxproj.filters‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@
152152
<None Include="..\.gitignore" />
153153
<None Include="..\MuiResourceCompile.targets" />
154154
<None Include="..\MuiResourceCompile.props" />
155+
<None Include="..\versions.props" />
155156
</ItemGroup>
156157
<ItemGroup>
157158
<Xml Include="..\MuiResourceCompile.xml" />

‎EasySFTP/EasySFTP.rc‎

128 Bytes
Binary file not shown.

‎EasySFTP/EasySFTP.vcxproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
</PropertyGroup>
5151
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5252
<Import Project="$(MSBuildThisFileDirectory)..\MuiResourceCompile.props" />
53+
<Import Project="$(MSBuildThisFileDirectory)..\versions.props" />
5354
<ImportGroup Label="ExtensionSettings">
5455
</ImportGroup>
5556
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
@@ -112,7 +113,6 @@
112113
</ClCompile>
113114
<Link>
114115
<AdditionalDependencies>$(TargetDir)Common.lib;$(TargetDir)EasySFTP.lib;kernel32.lib;comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
115-
<Version>0.14</Version>
116116
<GenerateDebugInformation>true</GenerateDebugInformation>
117117
<SubSystem>Windows</SubSystem>
118118
<TargetMachine>MachineX86</TargetMachine>
@@ -148,7 +148,6 @@
148148
</ClCompile>
149149
<Link>
150150
<AdditionalDependencies>$(TargetDir)Common.lib;$(TargetDir)EasySFTP.lib;kernel32.lib;comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
151-
<Version>0.14</Version>
152151
<GenerateDebugInformation>true</GenerateDebugInformation>
153152
<SubSystem>Windows</SubSystem>
154153
<TargetMachine>MachineX64</TargetMachine>
@@ -183,7 +182,6 @@
183182
</ClCompile>
184183
<Link>
185184
<AdditionalDependencies>$(TargetDir)Common.lib;$(TargetDir)EasySFTP.lib;kernel32.lib;comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
186-
<Version>0.14</Version>
187185
<GenerateDebugInformation>true</GenerateDebugInformation>
188186
<SubSystem>Windows</SubSystem>
189187
<OptimizeReferences>true</OptimizeReferences>
@@ -221,7 +219,6 @@
221219
</ClCompile>
222220
<Link>
223221
<AdditionalDependencies>$(TargetDir)Common.lib;$(TargetDir)EasySFTP.lib;kernel32.lib;comctl32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
224-
<Version>0.14</Version>
225222
<GenerateDebugInformation>true</GenerateDebugInformation>
226223
<SubSystem>Windows</SubSystem>
227224
<OptimizeReferences>true</OptimizeReferences>
@@ -290,6 +287,7 @@
290287
<None Include="..\README.md" />
291288
<None Include="AddrBtns.bmp" />
292289
<None Include="EasySFTP.ico" />
290+
<None Include="EasySFTP.version.rc2" />
293291
<None Include="EasySFTP_2.ico" />
294292
<None Include="prntfldr.ico" />
295293
<None Include="secure.ico" />

‎EasySFTP/EasySFTP.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@
139139
<None Include="..\.github\lib-versions.env">
140140
<Filter>GitHub Workflows</Filter>
141141
</None>
142+
<None Include="EasySFTP.version.rc2">
143+
<Filter>リソース ファイル</Filter>
144+
</None>
142145
</ItemGroup>
143146
<ItemGroup>
144147
<ResourceCompile Include="EasySFTP.rc">

‎EasySFTP/EasySFTP.version.rc2‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#if !defined(VERSION_MAJOR) || !defined(VERSION_MINOR) || !defined(VERSION_PATCH) || !defined(VERSION_REVISION) || !defined(VERSION_STRING)
2+
#error VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_REVISION, and VERSION_STRING must be defined
3+
#endif
4+
5+
VS_VERSION_INFO VERSIONINFO
6+
FILEVERSION VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_REVISION
7+
PRODUCTVERSION VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_REVISION
8+
FILEFLAGSMASK 0x17L
9+
#ifdef _DEBUG
10+
FILEFLAGS 0x1L
11+
#else
12+
FILEFLAGS 0x0L
13+
#endif
14+
FILEOS 0x40004L
15+
FILETYPE 0x1L
16+
FILESUBTYPE 0x0L
17+
BEGIN
18+
BLOCK "StringFileInfo"
19+
BEGIN
20+
BLOCK "041104b0"
21+
BEGIN
22+
VALUE "FileDescription", "EasySFTP - SFTP/FTP client application"
23+
VALUE "FileVersion", VERSION_STRING
24+
VALUE "InternalName", "EasySFTP"
25+
VALUE "LegalCopyright", "Original created by jet"
26+
VALUE "OriginalFilename", "EasySFTP.exe"
27+
VALUE "ProductName", "EasySFTP"
28+
VALUE "ProductVersion", VERSION_STRING
29+
END
30+
END
31+
BLOCK "VarFileInfo"
32+
BEGIN
33+
VALUE "Translation", 0x411, 1200
34+
END
35+
END

‎RegESFTP/RegESFTP.rc‎

-1.65 KB
Binary file not shown.

‎RegESFTP/RegESFTP.vcxproj‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
</PropertyGroup>
6161
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
6262
<Import Project="$(MSBuildThisFileDirectory)..\MuiResourceCompile.props" />
63+
<Import Project="$(MSBuildThisFileDirectory)..\versions.props" />
6364
<ImportGroup Label="ExtensionSettings">
6465
</ImportGroup>
6566
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -106,7 +107,6 @@
106107
<AdditionalOptions>/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
107108
</ClCompile>
108109
<Link>
109-
<Version>0.14</Version>
110110
<GenerateDebugInformation>true</GenerateDebugInformation>
111111
<OptimizeReferences>false</OptimizeReferences>
112112
<EnableCOMDATFolding>false</EnableCOMDATFolding>
@@ -132,11 +132,9 @@
132132
<Link>
133133
<SubSystem>Windows</SubSystem>
134134
<GenerateDebugInformation>true</GenerateDebugInformation>
135-
<Version>0.1</Version>
136135
<OptimizeReferences>false</OptimizeReferences>
137136
<EnableCOMDATFolding>false</EnableCOMDATFolding>
138137
<AdditionalDependencies>$(TargetDir)Common.lib;$(TargetDir)EasySFTP.lib;%(AdditionalDependencies)</AdditionalDependencies>
139-
<Version>0.14</Version>
140138
</Link>
141139
<Manifest>
142140
<AdditionalManifestFiles>$(TargetFileName).manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -154,12 +152,10 @@
154152
<AdditionalOptions>/source-charset:utf-8 %(AdditionalOptions)</AdditionalOptions>
155153
</ClCompile>
156154
<Link>
157-
<Version>0.1</Version>
158155
<GenerateDebugInformation>true</GenerateDebugInformation>
159156
<OptimizeReferences>true</OptimizeReferences>
160157
<EnableCOMDATFolding>true</EnableCOMDATFolding>
161158
<AdditionalDependencies>$(TargetDir)Common.lib;$(TargetDir)EasySFTP.lib;%(AdditionalDependencies)</AdditionalDependencies>
162-
<Version>0.14</Version>
163159
</Link>
164160
<MuiResourceCompile>
165161
<IncludeNeutralResourceToLink>false</IncludeNeutralResourceToLink>
@@ -184,9 +180,7 @@
184180
<GenerateDebugInformation>true</GenerateDebugInformation>
185181
<EnableCOMDATFolding>true</EnableCOMDATFolding>
186182
<OptimizeReferences>true</OptimizeReferences>
187-
<Version>0.1</Version>
188183
<AdditionalDependencies>$(TargetDir)Common.lib;$(TargetDir)EasySFTP.lib;%(AdditionalDependencies)</AdditionalDependencies>
189-
<Version>0.14</Version>
190184
</Link>
191185
<Manifest>
192186
<AdditionalManifestFiles>$(TargetFileName).manifest %(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -223,10 +217,11 @@
223217
</ItemGroup>
224218
<ItemGroup>
225219
<None Include="RegESFTP.rcconfig" />
220+
<None Include="RegESFTP.version.rc2" />
226221
</ItemGroup>
227222
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
228223
<Import Project="$(MSBuildThisFileDirectory)..\MuiResourceCompile.targets" />
229224
<ImportGroup Label="ExtensionTargets">
230225
</ImportGroup>
231226
<Import Project="..\Common.props" />
232-
</Project>
227+
</Project>

‎RegESFTP/RegESFTP.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,8 @@
4444
<None Include="RegESFTP.rcconfig">
4545
<Filter>リソース ファイル</Filter>
4646
</None>
47+
<None Include="RegESFTP.version.rc2">
48+
<Filter>リソース ファイル</Filter>
49+
</None>
4750
</ItemGroup>
4851
</Project>

‎RegESFTP/RegESFTP.version.rc2‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#if !defined(VERSION_MAJOR) || !defined(VERSION_MINOR) || !defined(VERSION_PATCH) || !defined(VERSION_REVISION) || !defined(VERSION_STRING)
2+
#error VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_REVISION, and VERSION_STRING must be defined
3+
#endif
4+
5+
VS_VERSION_INFO VERSIONINFO
6+
FILEVERSION VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_REVISION
7+
PRODUCTVERSION VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_REVISION
8+
FILEFLAGSMASK 0x17L
9+
#ifdef _DEBUG
10+
FILEFLAGS 0x1L
11+
#else
12+
FILEFLAGS 0x0L
13+
#endif
14+
FILEOS 0x40004L
15+
FILETYPE 0x2L
16+
FILESUBTYPE 0x0L
17+
BEGIN
18+
BLOCK "StringFileInfo"
19+
BEGIN
20+
BLOCK "041104b0"
21+
BEGIN
22+
VALUE "FileDescription", "RegESFTP - utility for registering EasySFTP"
23+
VALUE "FileVersion", VERSION_STRING
24+
VALUE "InternalName", "RegESFTP"
25+
VALUE "LegalCopyright", "Original created by jet"
26+
VALUE "OriginalFilename", "RegESFTP.dll"
27+
VALUE "ProductName", "EasySFTP"
28+
VALUE "ProductVersion", VERSION_STRING
29+
END
30+
END
31+
BLOCK "VarFileInfo"
32+
BEGIN
33+
VALUE "Translation", 0x411, 1200
34+
END
35+
END

0 commit comments

Comments
 (0)