Skip to content

Update to VS2017#3

Merged
selgas merged 7 commits intomasterfrom
vs2017
Aug 3, 2018
Merged

Update to VS2017#3
selgas merged 7 commits intomasterfrom
vs2017

Conversation

@selgas
Copy link
Copy Markdown

@selgas selgas commented Aug 3, 2018

https://github.com/TechSmith/CamtasiaWin/issues/9202

This repo has several different folders for building with different versions of Visual Studio, so I added a "v15" folder and updated all the vcxproj files to version 15, then updated the nuget autopkg to build with the v141 toolset.

nuspec
{
id = zlib-tsc-package;
version: 1.2.11.1;
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to add a release note to the description?

Build instructions for Visual Studio 2017 (32 bits or 64 bits)
--------------------------------------------------------------
- Decompress current zlib, including all contrib/* files
- Open contrib\vstudio\vc15\zlibvc.sln with Microsoft Visual C++ 2017
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if vc here stands for VisualC++, 15 might technically be wrong? It's confusing but it looks like 2017 is v14.x ( https://en.wikipedia.org/wiki/Microsoft_Visual_C%2B%2B )?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's the value for the MSVC macro, but it does say Visual Studio itself is version 15:

MSVC++ 14.1 _MSC_VER == 1910 (Visual Studio 2017 version 15.0)

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh hang on, I see what you mean, you're looking at vc. I can change it to 14.14 if you feel strongly about it.

Copy link
Copy Markdown

@sgarske sgarske Aug 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I looked to see if anyone tried to do similar changes on the main repo and found this
https://github.com/madler/zlib/pull/243

They had the same debate and seemed like they were leaning towards vc15 since vc14 doesn't make a lot of sense anyways so I'm good with 15 👍

#define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
FILEVERSION 1, 2, 11, 0
PRODUCTVERSION 1, 2, 11, 0
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it matter that these don't match the version number? Will upgrades work?

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIRC, these version numbers are for zlib, the version numbers I upgraded are for the nuget package only.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was concerned that if this repo was making a dll we would fail to replace it with our installer if the version didn't actually change on the file. However, it looks like this repo just makes static .libs so I think we're ok

@sgarske
Copy link
Copy Markdown

sgarske commented Aug 3, 2018

I think I'm 👍 but you should get a successful Continuous (with the 2017 changes) before merging this

@selgas
Copy link
Copy Markdown
Author

selgas commented Aug 3, 2018

@sgarske yep, my next plan is to update the team city builds and try pulling in the updated package

@selgas selgas merged commit 5c0f390 into master Aug 3, 2018
@selgas selgas deleted the vs2017 branch August 3, 2018 18:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants