update xp build and version auto management in appveyor.yml

Author: rexdf

.gitignore

@@ -15,6 +15,7 @@
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
+XP-Release/
 x64/
 x86/
 bld/

CommandTrayHost.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27004.2009
+VisualStudioVersion = 15.0.27004.2010
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommandTrayHost", "CommandTrayHost\CommandTrayHost.vcxproj", "{18FC42B7-89B4-4972-9D65-C4322F6CC817}"
 EndProject
@@ -11,6 +11,8 @@ Global
 		Debug|x86 = Debug|x86
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
+		XP-Release|x64 = XP-Release|x64
+		XP-Release|x86 = XP-Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{18FC42B7-89B4-4972-9D65-C4322F6CC817}.Debug|x64.ActiveCfg = Debug|x64
@@ -21,6 +23,10 @@ Global
 		{18FC42B7-89B4-4972-9D65-C4322F6CC817}.Release|x64.Build.0 = Release|x64
 		{18FC42B7-89B4-4972-9D65-C4322F6CC817}.Release|x86.ActiveCfg = Release|Win32
 		{18FC42B7-89B4-4972-9D65-C4322F6CC817}.Release|x86.Build.0 = Release|Win32
+		{18FC42B7-89B4-4972-9D65-C4322F6CC817}.XP-Release|x64.ActiveCfg = XP-Release|x64
+		{18FC42B7-89B4-4972-9D65-C4322F6CC817}.XP-Release|x64.Build.0 = XP-Release|x64
+		{18FC42B7-89B4-4972-9D65-C4322F6CC817}.XP-Release|x86.ActiveCfg = XP-Release|Win32
+		{18FC42B7-89B4-4972-9D65-C4322F6CC817}.XP-Release|x86.Build.0 = XP-Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

CommandTrayHost/CommandTrayHost.vcxproj

@@ -17,6 +17,14 @@
       <Configuration>Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="XP-Release|Win32">
+      <Configuration>XP-Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="XP-Release|x64">
+      <Configuration>XP-Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
@@ -25,6 +33,9 @@
     <RootNamespace>CommandTrayHost</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
+  <PropertyGroup>
+    <VcpkgConfiguration Condition="'$(Configuration)' == 'XP-Release'">Release</VcpkgConfiguration>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -39,6 +50,13 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='XP-Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141_xp</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
@@ -52,6 +70,13 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='XP-Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141_xp</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -63,12 +88,18 @@
   <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 Condition="'$(Configuration)|$(Platform)'=='XP-Release|Win32'" Label="PropertySheets">
+    <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>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='XP-Release|x64'" Label="PropertySheets">
+    <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>
@@ -79,9 +110,15 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='XP-Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='XP-Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -127,6 +164,24 @@
       <GenerateDebugInformation>false</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='XP-Release|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -145,6 +200,24 @@
       <GenerateDebugInformation>false</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='XP-Release|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="CommandTrayHost.h" />
     <ClInclude Include="configure.h" />
@@ -159,7 +232,9 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='XP-Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='XP-Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>

CommandTrayHost/stdafx.h

@@ -63,4 +63,5 @@ void LOGMESSAGE(wchar_t* pszFormat, ...);
 
 #define CommandTrayHost (L"Command_Tray_Host")
 
-#define VERSION_NUMS L"0.6.0"
+#define VERSION_NUMS L"0.6.0"
+

appveyor.yml

@@ -11,25 +11,31 @@ clone_folder: c:\projects\CommandTrayHost
 install:
 - cmd: >-
     vcpkg install rapidjson rapidjson:x64-windows nlohmann-json nlohmann-json:x64-windows
-# before_build:
-#   - cmd: cd c:\projects\CommandTrayHost
-#   - cmd: dir /a CommandTrayHost
+before_build:
+    - cmd: >-
+        cd c:\projects\CommandTrayHost
+        C:\Python36\python.exe version_set.py %APPVEYOR_BUILD_NUMBER%
 build:
   project: c:\projects\CommandTrayHost\CommandTrayHost.sln
   verbosity: minimal
 after_build:
 - cmd: msbuild "c:\projects\CommandTrayHost\CommandTrayHost.sln" /verbosity:minimal /p:Configuration=Release /p:Platform=x64 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+- cmd: msbuild "c:\projects\CommandTrayHost\CommandTrayHost.sln" /verbosity:minimal /p:Configuration=XP-Release /p:Platform=x86 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 - cmd: >-
     cd c:\projects\CommandTrayHost
 
     mkdir CommandTrayHost-x64
 
     mkdir CommandTrayHost-x86
 
+    mkdir CommandTrayHost-xp-x86
+
     copy x64\Release\CommandTrayHost.exe CommandTrayHost-x64\
 
     copy Release\CommandTrayHost.exe CommandTrayHost-x86\
 
+    copy XP-Release\CommandTrayHost.exe CommandTrayHost-xp-x86\
+
     curl -L -o upx.zip https://github.com/upx/upx/releases/download/v3.94/upx394w.zip
 
     7z e upx.zip *.exe -r
@@ -38,7 +44,9 @@ after_build:
 
     upx CommandTrayHost-x86\CommandTrayHost.exe
 
-    7z a -tzip CommandTrayHost-%APPVEYOR_BUILD_VERSION%.zip .\CommandTrayHost-x64\ .\CommandTrayHost-x86\
+    upx CommandTrayHost-xp-x86\CommandTrayHost.exe
+
+    7z a -tzip CommandTrayHost-%APPVEYOR_BUILD_VERSION%.zip .\CommandTrayHost-x64\ .\CommandTrayHost-x86\ .CommandTrayHost-xp-x86\
 artifacts:
 - path: CommandTrayHost-%APPVEYOR_BUILD_VERSION%.zip
   name: CommandTrayHost

version_set.py

@@ -0,0 +1,93 @@
+# /usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+import os
+import re
+import sys
+import codecs
+
+MAJOR_VERSION = '0'
+MINOR_VERSION = '6'
+FIX_VERSION = '0'
+
+'''
+    git checkout HEAD -- CommandTrayHost/CommandTrayHost.rc CommandTrayHost/stdafx.h
+'''
+
+
+def main():
+    global MAJOR_VERSION, MINOR_VERSION, FIX_VERSION
+    print(sys.argv)
+    if len(sys.argv) < 2:
+        print("must input build version")
+        return False
+    argc = len(sys.argv)
+    if(argc > 1):
+        build_version_number = sys.argv[1]
+    print("build_version_number: ", build_version_number)
+    if(argc > 2):
+        MAJOR_VERSION = sys.argv[2]
+    if(argc > 3):
+        MINOR_VERSION = sys.argv[3]
+    if(argc > 4):
+        FIX_VERSION = sys.argv[4]
+    # \r\n will have trouble with $ to match end
+    pattern_rc = re.compile(
+        r'^VALUE "ProductVersion", "\d+, \d+, \d+, \d+[\\]0"', re.M)
+    rc_string = r'VALUE "ProductVersion", "{}, {}, {}, {}\\0"'.format(
+        MAJOR_VERSION, MINOR_VERSION, FIX_VERSION, build_version_number)  # .encode('utf-8')
+
+    pattern_stdafx_h = re.compile(
+        r'^#define VERSION_NUMS L"\d+[.]\d+[.][0-9b-]+"', re.M)
+    stdafx_h_string = r'#define VERSION_NUMS L"{}.{}.{}-b{}"'.format(
+        MAJOR_VERSION, MINOR_VERSION, FIX_VERSION, build_version_number)  # .encode('utf-16le')
+
+    base_dir = os.path.dirname(os.path.abspath(__file__))
+    rc_file = os.path.join(base_dir, "CommandTrayHost", "CommandTrayHost.rc")
+    stdafx_h_file = os.path.join(base_dir, "CommandTrayHost", "stdafx.h")
+
+    print(stdafx_h_string, '\n', rc_string)
+
+    for file_name, pattern_re, replace_string, encoding in (
+        (stdafx_h_file, pattern_stdafx_h, stdafx_h_string, 'utf-16le'),
+        (rc_file, pattern_rc, rc_string, 'utf-8'),
+    ):
+        # CommandTrayHost.rc # stdafx.h
+        try:
+            with open(file_name, "rb") as f:
+                content = f.read()
+        except:
+            return False
+        print(len(content), end=" ")
+        if encoding == 'utf-16le':
+            bom = codecs.BOM_UTF16_LE
+        else:
+            bom = codecs.BOM_UTF8
+        if content.startswith(bom):
+            content = content[len(bom):]
+        content = content.decode(encoding)
+
+        if pattern_re.search(content) is None:
+            return False
+        print(len(content), end=" ")
+        content = pattern_re.sub(replace_string, content)
+        print(len(content), end=" ")
+        if encoding == 'utf-16le':
+            content = bom + content.encode(encoding)
+        else:
+            content = content.encode(encoding)
+        print(len(content))
+        with open(file_name, "wb") as f:
+            f.write(content)
+        print(file_name, "repalced!\n")
+
+    return True
+
+
+if __name__ == '__main__':
+    print(f"""{__file__} <build_number> [MAJOR_VERSION] [MINOR_VERSION] [FIX_VERSION]
+[MAJOR_VERSION] [MINOR_VERSION] [FIX_VERSION] are optional.""")
+    if (sys.version_info < (3, 0)):
+        sys.exit(2)
+    if not main():
+        sys.exit(1)