Skip to content
This repository has been archived by the owner on Apr 22, 2023. It is now read-only.

Fix msi installer for Visual Studio versions != 2013 #25569

Closed
wants to merge 4 commits into from
Closed

Fix msi installer for Visual Studio versions != 2013 #25569

wants to merge 4 commits into from

Commits on Jul 23, 2015

  1. win: backport set env before generating projects 

    Backport commit a58b174 from branch
v0.12.

Original commit message:

  vcbuild.bat calls python configure before setting GYP_MSVS_VERSION,
  so SelectVisualStudioVersion (tools\gyp\pylib\gyp\MSVSVersion.py)
  defaults to 'auto' and selects VS 2005.

  vcbuild sets the environment in the current shell, so this issue
  would manifest itself only on the first invocation of the script
  in any given shell windows.

  Reviewed-By: Julien Gilli <jgilli@fastmail.fm>
  PR-URL: nodejs#20109

Conflicts:
	vcbuild.bat
    @orangemocha
    orangemocha authored and Julien Gilli committed Jul 23, 2015
    Configuration menu
    Copy the full SHA
    f90c228 View commit details
    Browse the repository at this point in the history

  2. win: backport bringing back xp/2k3 support 

    Issue: nodejs#25348
The gyp/project files don't explicitly specify a subsystem version,
which results in the default being used. The default changed from
VS 2010 to VS 2012 and later.

Backport 3122052, which itself
backports e8d0850 from io.js.
Original commit message follows:

  Chrome still runs on Windows XP, so there is no reason that iojs
  couldn't.

  PR: nodejs/node#512
  (cherry picked from commit e8d0850)

  Reviewed-By: Julien Gilli <julien.gilli@joyent.com>
  PR-URL: nodejs#25367

Conflicts:
	node.gyp
    @piscisaureus
    piscisaureus authored and Julien Gilli committed Jul 23, 2015
    Configuration menu
    Copy the full SHA
    ee6d270 View commit details
    Browse the repository at this point in the history

  3. win: fix custom actions on Visual Studio != 2013 

    The original change that added support for running custom actions during
the install process (e7c84f8) assumed
that Visual Studio 2013 is used to generate the installer file.

However, that is not always the case, and older versions of Visual
Studio should allow users to generate Windows installer files. This
change makes the custom actions visual studio project use the visual
studio version that is found by vcbuild.bat.
    Julien Gilli committed Jul 23, 2015
    Configuration menu
    Copy the full SHA
    c1670ff View commit details
    Browse the repository at this point in the history

  4. win: fix custom actions for WiX older than 3.9 

    Older WiX versions included a header with extern "C" declaration,
hence the custom action source must be C++.
    @joaocgreis
    joaocgreis authored and Julien Gilli committed Jul 23, 2015
    Configuration menu
    Copy the full SHA
    24a7113 View commit details
    Browse the repository at this point in the history