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.

Sign up for GitHub

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

Jump to bottom

Refactor mac installer (built on #2571) #5656

Closed
wants to merge 22 commits into from
Closed

Refactor mac installer (built on #2571) #5656

wants to merge 22 commits into from

Conversation

rvagg
Copy link
Member

@rvagg rvagg commented Mar 11, 2016

I've spent some more quality time with Packages today, trying to wrangle this into something closer to ready. Building on the work of @remixz work in #776 and @fhemberger's work in #2571.

  • Remove the uninstall option - while I got it to work nicely and cleaned up the script to fully remove everything, the installer that Packages makes is not really suitable for an uninstall option, it still says it's "installing", the button is "install", the summary at the end still says it's installed Node & npm, it's basically a hack to make an uninstaller possible. We should consider putting this option on the wiki or even installing it somewhere in /usr/local/ that's not in PATH but we can point users to so they can run it themselves.
  • Switched to the new logo using the commit on master already
  • Made the "Install Node.js" option mandatory, Packages has some depend-on functionality for selecting options but there is no way to make it so you have to have Node.js if you select npm, you can make the select box turn on but you can turn it off.
  • Changed install.py to add new NODE_INSTALL_NODE_ONLY, NODE_INSTALL_NPM_ONLY and NODE_INSTALL_HEADERS_ONLY (was HEADERS_ONLY) env vars so it can install npm to a different location to node so that the options work properly and you can actually opt to not install npm (yes, it works now!).
  • Made it so you have to click "Customize" to get to the checkboxes to optionally install npm.
  • Made the LICENSE an RTF, it looks so so much nicer now that it's formatted.
  • Moved the .pkg to the top-level instead of out/, which is what the current installer does and what Jenkins expects.

Commits are all over the place and need to be compacted obviously.

Will post a test build soon, got to sort out the slaves again.

@mscdex mscdex added install Issues and PRs related to the installers. macos Issues and PRs related to the macOS platform / OSX. labels Mar 11, 2016
Fishrock123
Fishrock123 reviewed Mar 11, 2016
View reviewed changes
Makefile Outdated
@@ -369,7 +369,7 @@ BINARYTAR=$(BINARYNAME).tar
XZ=$(shell which xz > /dev/null 2>&1; echo $$?)
XZ_COMPRESSION ?= 9
PKG=$(TARNAME).pkg
PACKAGEMAKER ?= /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker
PACKAGESBUILD=/usr/local/bin/packagesbuild
Copy link
Contributor

Choose a reason for hiding this comment

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

no ?=?

@Fishrock123
Copy link
Contributor

As a note, I got a few whitespace errors when applying.

@fhemberger fhemberger mentioned this pull request Mar 12, 2016
Closed
@rvagg
Copy link
Member Author

rvagg commented Mar 16, 2016

OK, some more adjustments and I've put Packages on both OSX build machines now (was only on one before). Now I have a test package to share! Grab it at https://nodejs.org/download/test/v6.0.0-test20160316798c9dc5b3/node-v6.0.0-test20160316798c9dc5b3.pkg to experience the new goodness.

@rvagg rvagg mentioned this pull request Mar 16, 2016
Closed
@fhemberger fhemberger mentioned this pull request May 24, 2016
Closed
@eljefedelrodeodeljefe
Copy link
Contributor

Looks reasonable to me. Build worked like a charm. thanks @fhemberger for pointing at this one (have missed it)

@MylesBorins MylesBorins mentioned this pull request May 27, 2016
Closed
rvagg and others added 17 commits June 8, 2016 16:32
@rvagg
Revert "test: change duration_ms to duration"
553dec2 
This reverts commit d413378.
@remixz @rvagg
Refactor Mac .pkg generation
12bccda 
This refactors the Mac .pkg generation to use Packages. This moves io.js
away from using the deprecated Package Maker, and allows for easy
localization of the installer.
@remixz @rvagg
Add symlink step to Mac installer
0ed035d
@remixz @rvagg
Create empty files on pre-pkg, set up uninstall
86c5357
@remixz @rvagg
Wrap osx-pkg README at 80 characters
5559798
@remixz @rvagg
Add uninstaller
69cfb04
@remixz @rvagg
Remove node_modules if folder is empty
453c0ad
@fhemberger @rvagg
Replace iojs -> nodejs, remove symlink
1db12f4
@fhemberger @rvagg
build: Update OS X installer logo
8027c2e
@fhemberger @rvagg
Rename package: nodejs-* -> node-*
a828c74
@fhemberger @rvagg
Add npm preinstall script
d876918 
See nodejs#3986
@rvagg
Move .pkg to top-level
6c673b6
@rvagg
build: separate node, npm, headers install options
6f17f1e
@rvagg
build: fix osx uninstaller script
fe8c6c7
@rvagg
build: fix npm in pkg config
bee2989
@rvagg
Use new separate installer directories for pkg
ed5d909 
Needs splitting up, headers install bit needs to go with the install.py
changes
@rvagg
remove uninstaller
1ac41d9
@jasnell
Copy link
Member

jasnell commented Feb 28, 2017

ping @rvagg

@jasnell jasnell added the stalled Issues and PRs that are stalled. label Feb 28, 2017
@lance lance mentioned this pull request Aug 24, 2017
Closed
@jasnell
Copy link
Member

jasnell commented Aug 24, 2017

Closing due to lack of forward progress on this.

@jasnell jasnell closed this Aug 24, 2017
@jpwesselink jpwesselink mentioned this pull request Sep 4, 2017
Closed
4 tasks
jpwesselink added a commit to jpwesselink/node that referenced this pull request Sep 15, 2017
@jpwesselink
tools, build: macOS installer
bf9157f 
Creates macOS pkg installer by using `pkgbuild` and `productbuild`.
Removes previous npm installation before installing npm.
Packages carry correct version attributes.
Support for intl installer features, defaults to `en`.
Fancy formatted license.
Renamed `osx` references to `macOS`.
Optional installation of npm

PR-URL: nodejs#15179
Fixes: nodejs#15012
Refs: nodejs#5656
Refs: nodejs#2571
Refs: nodejs#7097
BridgeAR pushed a commit that referenced this pull request Sep 28, 2017
@jpwesselink @BridgeAR
tools, build: refactor macOS installer
03954f7 
Creates macOS pkg installer by using `pkgbuild` and `productbuild`.
Removes previous npm installation before installing npm.
Packages carry correct version attributes.
Support for intl installer features, defaults to `en`.
Fancy formatted license.
Renamed `osx` references to `macOS`.
Optional installation of npm.

PR-URL: #15179
Fixes: #15012
Refs: #5656
Refs: #2571
Refs: #7097
Reviewed-By: Lance Ball <[email protected]>
Reviewed-By: Daijiro Wachi <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Joyee Cheung <[email protected]>
MylesBorins pushed a commit that referenced this pull request Sep 29, 2017
@jpwesselink @MylesBorins
tools, build: refactor macOS installer
803d9c1 
Creates macOS pkg installer by using `pkgbuild` and `productbuild`.
Removes previous npm installation before installing npm.
Packages carry correct version attributes.
Support for intl installer features, defaults to `en`.
Fancy formatted license.
Renamed `osx` references to `macOS`.
Optional installation of npm.

PR-URL: #15179
Fixes: #15012
Refs: #5656
Refs: #2571
Refs: #7097
Reviewed-By: Lance Ball <[email protected]>
Reviewed-By: Daijiro Wachi <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Joyee Cheung <[email protected]>
addaleax pushed a commit to addaleax/ayo that referenced this pull request Sep 30, 2017
@jpwesselink @addaleax
tools, build: refactor macOS installer
29a3b3a 
Creates macOS pkg installer by using `pkgbuild` and `productbuild`.
Removes previous npm installation before installing npm.
Packages carry correct version attributes.
Support for intl installer features, defaults to `en`.
Fancy formatted license.
Renamed `osx` references to `macOS`.
Optional installation of npm.

PR-URL: nodejs/node#15179
Fixes: nodejs/node#15012
Refs: nodejs/node#5656
Refs: nodejs/node#2571
Refs: nodejs/node#7097
Reviewed-By: Lance Ball <[email protected]>
Reviewed-By: Daijiro Wachi <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Joyee Cheung <[email protected]>
MylesBorins pushed a commit that referenced this pull request Oct 3, 2017
@jpwesselink @MylesBorins
tools, build: refactor macOS installer
7e8c0fd 
Creates macOS pkg installer by using `pkgbuild` and `productbuild`.
Removes previous npm installation before installing npm.
Packages carry correct version attributes.
Support for intl installer features, defaults to `en`.
Fancy formatted license.
Renamed `osx` references to `macOS`.
Optional installation of npm.

PR-URL: #15179
Fixes: #15012
Refs: #5656
Refs: #2571
Refs: #7097
Reviewed-By: Lance Ball <[email protected]>
Reviewed-By: Daijiro Wachi <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Joyee Cheung <[email protected]>
MylesBorins pushed a commit that referenced this pull request Oct 3, 2017
@jpwesselink @MylesBorins
tools, build: refactor macOS installer
eebb2d7 
Creates macOS pkg installer by using `pkgbuild` and `productbuild`.
Removes previous npm installation before installing npm.
Packages carry correct version attributes.
Support for intl installer features, defaults to `en`.
Fancy formatted license.
Renamed `osx` references to `macOS`.
Optional installation of npm.

PR-URL: #15179
Fixes: #15012
Refs: #5656
Refs: #2571
Refs: #7097
Reviewed-By: Lance Ball <[email protected]>
Reviewed-By: Daijiro Wachi <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Joyee Cheung <[email protected]>
MylesBorins pushed a commit that referenced this pull request Jan 16, 2018
@jpwesselink @MylesBorins
tools, build: refactor macOS installer
2400fc2 
Creates macOS pkg installer by using `pkgbuild` and `productbuild`.
Removes previous npm installation before installing npm.
Packages carry correct version attributes.
Support for intl installer features, defaults to `en`.
Fancy formatted license.
Renamed `osx` references to `macOS`.
Optional installation of npm.

PR-URL: #15179
Fixes: #15012
Refs: #5656
Refs: #2571
Refs: #7097
Reviewed-By: Lance Ball <[email protected]>
Reviewed-By: Daijiro Wachi <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Joyee Cheung <[email protected]>
MylesBorins pushed a commit that referenced this pull request Jan 17, 2018
@jpwesselink @MylesBorins
tools, build: refactor macOS installer
23ad5cb 
Creates macOS pkg installer by using `pkgbuild` and `productbuild`.
Removes previous npm installation before installing npm.
Packages carry correct version attributes.
Support for intl installer features, defaults to `en`.
Fancy formatted license.
Renamed `osx` references to `macOS`.
Optional installation of npm.

PR-URL: #15179
Fixes: #15012
Refs: #5656
Refs: #2571
Refs: #7097
Reviewed-By: Lance Ball <[email protected]>
Reviewed-By: Daijiro Wachi <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Joyee Cheung <[email protected]>
MylesBorins pushed a commit that referenced this pull request Feb 11, 2018
@jpwesselink @MylesBorins
tools, build: refactor macOS installer
7bab6bc 
Creates macOS pkg installer by using `pkgbuild` and `productbuild`.
Removes previous npm installation before installing npm.
Packages carry correct version attributes.
Support for intl installer features, defaults to `en`.
Fancy formatted license.
Renamed `osx` references to `macOS`.
Optional installation of npm.

PR-URL: #15179
Fixes: #15012
Refs: #5656
Refs: #2571
Refs: #7097
Reviewed-By: Lance Ball <[email protected]>
Reviewed-By: Daijiro Wachi <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Joyee Cheung <[email protected]>
MylesBorins pushed a commit that referenced this pull request Feb 12, 2018
@jpwesselink @MylesBorins
tools, build: refactor macOS installer
3a12b46 
Creates macOS pkg installer by using `pkgbuild` and `productbuild`.
Removes previous npm installation before installing npm.
Packages carry correct version attributes.
Support for intl installer features, defaults to `en`.
Fancy formatted license.
Renamed `osx` references to `macOS`.
Optional installation of npm.

PR-URL: #15179
Fixes: #15012
Refs: #5656
Refs: #2571
Refs: #7097
Reviewed-By: Lance Ball <[email protected]>
Reviewed-By: Daijiro Wachi <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Joyee Cheung <[email protected]>
MylesBorins pushed a commit that referenced this pull request Feb 13, 2018
@jpwesselink @MylesBorins
tools, build: refactor macOS installer
18803bc 
Creates macOS pkg installer by using `pkgbuild` and `productbuild`.
Removes previous npm installation before installing npm.
Packages carry correct version attributes.
Support for intl installer features, defaults to `en`.
Fancy formatted license.
Renamed `osx` references to `macOS`.
Optional installation of npm.

PR-URL: #15179
Fixes: #15012
Refs: #5656
Refs: #2571
Refs: #7097
Reviewed-By: Lance Ball <[email protected]>
Reviewed-By: Daijiro Wachi <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Joyee Cheung <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
install Issues and PRs related to the installers. macos Issues and PRs related to the macOS platform / OSX. stalled Issues and PRs that are stalled.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@rvagg @Fishrock123 @eljefedelrodeodeljefe @fhemberger @jasnell @mscdex @remixz