Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Standardize Various Visual Studio File Names #29

Merged
merged 4 commits into from
Jun 15, 2017

Conversation

GreyMerlin
Copy link
Contributor

Standardize Various Visual Studio File Names

Symptoms

Within the various independant repositories that are associated with the WinMerge-v2 repo, the file names for build commands (.cmd), solution files (.sln) and project files (.vcxproj) are not cleanly standardized from one repo to the next. Some aspects of the repos are not really set up to handle multiple versions of VS. This becomes more noticable as we move toward migrating these repos to use the new VS2017 environment.

Solution

This Pull Request is one in a collection of three, one Pull Request for each of the repositories:

  • FreeImage
  • WinIMerge
  • WinMerge-v2

If any one of these Pull Request are merged, then it is really necessary to merge the other two Pulls as well.

I have replicated this exact explanatory text identically into all three Pull Requests.

The repositories frhed and sevenzip are also components of the overall WinMerge-v2 project, but I have not (yet?) spent any effort to update these two repos to use VS2015. frhed appears to already use VS2015. sevenzip does not have VS solution or project files.

Likewise, I have not yet made any modifications to the Merge7z or ShellExtension solutions within the WinMerge-v2 repo. These were already setup to use VS2015 before I began modernizing the other solutions and projects.

Note

A number of files are committed that simply have changed file names. Git and GitHub handle this correctly, noting that the file name has changed. However, sometimes GitHub's file comparison still presents a full comparison of every line of the file, not simply the very few subsequently changed lines, making it hard to find those few changes. This confusion can be largly eliminated by looking at each single commit. A bit frustrating, sorry...


FreeImage

  • Three commits
  • All solution file names are changed from *.2015.sln to *.vs2015.sln
  • All project file names are changed from *.2015.vcxproj to *.vs2015.vcxproj
  • All project filter file names are changed from *.2015.vcxproj.filters to *.vs2015.vcxproj.filters
  • All usages of these file names within the .sln and .vcxproj files are updated appropriatly.

Miscellaneous

  • A .pdb file is now copied into the final Dist\ folder for the two (x32 and x64) Debug builds.

WinIMerge

  • Seven commits
  • The solution file name is changed from WinIMerge.sln to WinIMerge.vs2015.sln
  • The three project file names are changed from *.vcxproj to *.vs2015.vcxproj
  • All project filter file names are changed from *.vcxproj.filters to *.vs2015.vcxproj.filters
  • All usages of these file names within the .sln and .vcxproj files are updated appropriatly.
  • All usages of the new standardized file names from the FreeImage repo are now appropriatly updated within the .sln and .vcxproj files of this repo.
  • Change the BuildBin.cmd file to BuildBin.vs2015.cmd. Update project references in this file from *.vcxproj and *.2015.vcxproj (into the FreeImage repo) to be uniformly to the new *.vs2015.vcxproj .

Miscellaneous

  • a .gitignore file is added.
  • Set 'Link Time Code Generation' compilation property to "Use Link Time Code Generation" for Release builds of cidiff, WinIMerge and WinImergeLib projects.

WinMerge-v2

  • Four commits
  • All solution file names are changed from *_2015.sln to *.vs2015.sln.
  • All project file names are changed from *_2015.vcxproj to *.vs2015.vcxproj
  • All usages of these file names within the .sln and .vcxproj files are updated appropriatly.
  • All project filter file names are changed from *_2015.vcxproj.filters to *.vs2015.vcxproj.filters`
  • Add new files BuildBin.vs2015.cmd (copied from BuildBin.cmd) and BuildAll.vs2015.cmd (copied from BuildAll2.cmd). Add these files to the WinMerge.vs2015.sln file with previously existing .cmd files.
  • Update new BuildBin.vs2015.cmd file to use VisualStudio 14.0 (i.e. VS2015) and to use new WinMerge.vs2015.sln file.
  • Update new BuildAll.vs2015.cmd file to call the new BuildBin.vs2015.cmd file.

Miscellaneous

  • generalize some .gitignore file patterns.

* copy BuildBin.cmd as BuildBin.vs2015.cmd
* copy BuildAll2.cmd as BuildAll.vs2015.cmd
* change all *_vs2015.vcxproj to *.vs2015.vcxproj
* change WinMerge_vs2015.sln to WinMerge.vs2015.sln
* using *.vs2015.* file names from related projects and solutions.

* This commit simply handles file name changes, detailed content
	changes will be applied in the next commit
* Adapt WinMerge.vs2015.sln to new *.vs2015.vcxproj file names
* Adapt new BuildBin.vs2015.cmd to proper .sln name
* Adapt new BuildAll.vs2015.cmd to new BuildBin.vs2015 name
* Adapt BuildAll.vs2015.cmd to use VS140 (i.e. VS2015)
* Add new BuildBin.vs2015.cmd and BuildAll.vs2015.cmd added
	to WinMerge.vs2015.sln file
* Change *.vcxproj.filters file names to *.vs2015.vcxproj.filters
@sdottaka sdottaka merged commit 76df86d into WinMerge:master Jun 15, 2017
@sdottaka
Copy link
Member

Thank you!

@GreyMerlin
Copy link
Contributor Author

GreyMerlin commented Jun 15, 2017 via email

sdottaka added a commit that referenced this pull request Mar 12, 2019
…itbucket-1552411107927 (pull request #29)

Catalan.po edited online with Bitbucket
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