Merge pull request #6 from chcg/appveyor2

v2.1
Megabyteceer · Jun 6, 2018 · e0f3e6e · e0f3e6e
2 parents 708c023 + 5b996d3
commit e0f3e6e
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 27 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,11 +1,11 @@
-version: 1.0.{build}
-image: Visual Studio 2015
+version: 2.1.{build}
+image: Visual Studio 2017
 
 
 environment:
   matrix:
-    - PlatformToolset: v120_xp
     - PlatformToolset: v140_xp
+    - PlatformToolset: v141_xp
 
 platform:
     - x64
@@ -18,37 +18,45 @@ configuration:
 
 install:
     - if "%platform%"=="x64" set archi=amd64
+    - if "%platform%"=="x64" set platform_input=x64
+
     - if "%platform%"=="Win32" set archi=x86
-    - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi%
+    - if "%platform%"=="Win32" set platform_input=Win32
+
+    - if "%PlatformToolset%"=="v140_xp" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %archi%
+    - if "%PlatformToolset%"=="v141_xp" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %archi%
+
 
 build:
     parallel: true                  # enable MSBuild parallel builds
     verbosity: minimal
 
 build_script:
     - cd "%APPVEYOR_BUILD_FOLDER%"
-    - msbuild NppTaskList.sln /m /p:configuration="%configuration%" /p:platform="%platform%" /p:PlatformToolset="%PlatformToolset%"
+    - msbuild NppTaskList.sln /m /p:configuration="%configuration%" /p:platform="%platform_input%" /p:PlatformToolset="%PlatformToolset%" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
 after_build:
     - cd "%APPVEYOR_BUILD_FOLDER%"
     - ps: >-
 
-        if ($env:PLATFORM -eq "x64") {
-            #Push-AppveyorArtifact "$env:PLATFORM\$env:CONFIGURATION\NppTaskList.dll" -FileName NppTaskList.dll
+        if ($env:PLATFORM_INPUT -eq "x64" -and $env:CONFIGURATION -eq "Release") {
+            #Push-AppveyorArtifact "bin\$env:PLATFORM_INPUT\NppTaskList.dll" -FileName NppTaskList.dll
         }
 
-        if ($env:PLATFORM -eq "Win32" ) {
-            #Push-AppveyorArtifact "$env:CONFIGURATION\NppTaskList.dll" -FileName NppTaskList.dll
+        if ($env:PLATFORM_INPUT -eq "Win32" -and $env:CONFIGURATION -eq "Release") {
+            #Push-AppveyorArtifact "bin\$env:PLATFORM_INPUT\NppTaskList.dll" -FileName NppTaskList.dll
         }
 
         if ($($env:APPVEYOR_REPO_TAG) -eq "true" -and $env:CONFIGURATION -eq "Release" -and $env:PLATFORMTOOLSET -eq "v140_xp") {
-            if($env:PLATFORM -eq "x64"){
-            $ZipFileName = "NppTaskList_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip"
-            7z a $ZipFileName $env:PLATFORM\$env:CONFIGURATION\NppTaskList.dll
+            if($env:PLATFORM_INPUT -eq "x64"){
+                $ZipFileName = "NppTaskList_$($env:APPVEYOR_REPO_TAG_NAME)_x64.zip"
+                7z a $ZipFileName .\bin\$env:PLATFORM_INPUT\NppTaskList.dll
+                7z a $ZipFileName config\npp_task_list.cfg
             }
-            if($env:PLATFORM -eq "Win32"){
-            $ZipFileName = "NppTaskList_$($env:APPVEYOR_REPO_TAG_NAME)_x86.zip"
-            7z a $ZipFileName $env:CONFIGURATION\NppTaskList.dll
+            if($env:PLATFORM_INPUT -eq "Win32"){
+                $ZipFileName = "NppTaskList_$($env:APPVEYOR_REPO_TAG_NAME)_x86.zip"
+                7z a $ZipFileName .\bin\$env:PLATFORM_INPUT\NppTaskList.dll
+                7z a $ZipFileName config\npp_task_list.cfg
             }
         }
 
@@ -66,5 +74,5 @@ deploy:
     force_update: true
     on:
         appveyor_repo_tag: true
-        PlatformToolset: v120_xp
+        PlatformToolset: v140_xp
         configuration: Release
diff --git a/bin/v1.0.4/Win32/NppTaskList.dll b/bin/v1.0.4/Win32/NppTaskList.dll
diff --git a/bin/v1.0.4/x64/NppTaskList.dll b/bin/v1.0.4/x64/NppTaskList.dll
diff --git a/bin/v1.0.4/x64/config/npp_task_list.cfg b/bin/v1.0.4/x64/config/npp_task_list.cfg
diff --git a/bin/v1.0.4/Win32/config/npp_task_list.cfg → config/npp_task_list.cfg b/bin/v1.0.4/Win32/config/npp_task_list.cfg → config/npp_task_list.cfg
diff --git a/resources/TaskList.rc b/resources/TaskList.rc
@@ -28,7 +28,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_BORDER | WS_SYSMENU
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "&Ok",1,110,120,50,14
-    CTEXT           "Task List v1.0.4",IDC_ABOUT_TITLE,7,7,257,17,SS_CENTERIMAGE,WS_EX_DLGMODALFRAME | WS_EX_TRANSPARENT
+    CTEXT           "Task List v2.1.0",IDC_ABOUT_TITLE,7,7,257,17,SS_CENTERIMAGE,WS_EX_DLGMODALFRAME | WS_EX_TRANSPARENT
     LTEXT           "Url:",IDC_ABOUT_URL_PREFIX,12,34,27,9
     LTEXT           "https://github.com/Megabyteceer/npp-task-list",IDC_ABOUT_URL,39,34,220,9
     LTEXT           "Contributors:",IDC_ABOUT_CONTRIBUTORS,12,50,247,9
@@ -64,6 +64,43 @@ END
 #endif    // Neutral resources
 /////////////////////////////////////////////////////////////////////////////
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 2,1,0,0
+ PRODUCTVERSION 2,1,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription", "Task List for Notepad++"
+            VALUE "FileVersion", "2.1.0.0"
+            VALUE "InternalName", "NppTaskList.dll"
+            VALUE "LegalCopyright", "Copyright 2018"
+            VALUE "OriginalFilename", "NppTaskList.dll"
+            VALUE "ProductName", "Task List for Notepad++"
+            VALUE "ProductVersion", "2.1.0.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
 
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////