Skip to content

Refactor mac installer (built on #2571) #5656

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

Closed
rvagg wants to merge 22 commits into from
Closed

Refactor mac installer (built on #2571) #5656

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
553dec2
Revert "test: change duration_ms to duration"
rvagg Jun 8, 2016
12bccda
Refactor Mac .pkg generation
remixz Feb 10, 2015
0ed035d
Add symlink step to Mac installer
remixz Feb 12, 2015
86c5357
Create empty files on pre-pkg, set up uninstall
remixz Feb 12, 2015
5559798
Wrap osx-pkg README at 80 characters
remixz Feb 13, 2015
69cfb04
Add uninstaller
remixz Feb 14, 2015
453c0ad
Remove node_modules if folder is empty
remixz Mar 5, 2015
1db12f4
Replace iojs -> nodejs, remove symlink
fhemberger Aug 27, 2015
8027c2e
build: Update OS X installer logo
fhemberger Sep 9, 2015
a828c74
Rename package: nodejs-* -> node-*
fhemberger Oct 23, 2015
d876918
Add npm preinstall script
fhemberger Dec 26, 2015
6c673b6
Move .pkg to top-level
rvagg Mar 11, 2016
6f17f1e
build: separate node, npm, headers install options
rvagg Mar 11, 2016
fe8c6c7
build: fix osx uninstaller script
rvagg Mar 11, 2016
bee2989
build: fix npm in pkg config
rvagg Mar 11, 2016
ed5d909
Use new separate installer directories for pkg
rvagg Mar 11, 2016
1ac41d9
remove uninstaller
rvagg Mar 11, 2016
f06d845
Fix installer options, tweak intro and summary
rvagg Mar 11, 2016
00baf29
build: update Node.js logo on OSX installer
rvagg Feb 24, 2016
5671878
change background
rvagg Mar 11, 2016
e943c43
undo temporary debug make stuff
rvagg Mar 11, 2016
5313db4
PACKAGESBUILD?=, don't run pre-pkg before building
rvagg Mar 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix installer options, tweak intro and summary
  • Loading branch information
@rvagg
rvagg committed Jun 8, 2016
commit f06d845ca8fd1fd6f7e52926ffb4bb2fc1e3b7ef
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,6 @@ test.tap

# mac installer files
/tools/osx-pkg/osx-pkg-out.pkgproj
/tools/osx-pkg/strings/LICENSE.txt
/tools/osx-pkg/strings/license.rtf
/tools/osx-pkg/strings/**/*.out.rtf
/tools/osx-pkg/scripts/nodejs-run-uninstall
31 changes: 18 additions & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,28 +466,33 @@ release-only:

pre-pkg:
touch tools/osx-pkg/scripts/nodejs-run-uninstall # empty file for uninstall step
cp LICENSE tools/osx-pkg/strings/LICENSE.txt
$(NODE) tools/license2rtf.js < LICENSE > tools/osx-pkg/strings/license.rtf
cat tools/osx-pkg/osx-pkg.pkgproj | \
sed -e 's|__nodeversion__|'$(FULLVERSION)'|g' | \
sed -e 's|introduction.rtf|introduction.out.rtf|g' > \
sed -e 's|__nodeversion__|'$(FULLVERSION)'|g' \
-e 's|introduction.rtf|introduction.out.rtf|g' \
-e 's|summary.rtf|summary.out.rtf|g' > \
tools/osx-pkg/osx-pkg-out.pkgproj
$(foreach dir, \
$(shell echo tools/osx-pkg/strings/*/), \
cat $(dir)introduction.rtf | \
sed -e 's|__nodeversion__|'$(FULLVERSION)'|g' | \
sed -e 's|__npmversion__|'$(NPMVERSION)'|g' > \
$(dir)introduction.out.rtf; \
$(dir)introduction.out.rtf && \
cat $(dir)summary.rtf | \
sed -e 's|__nodeversion__|'$(FULLVERSION)'|g' | \
sed -e 's|__npmversion__|'$(NPMVERSION)'|g' > \
$(dir)summary.out.rtf; \
)

$(PKG): release-only pre-pkg
rm -rf $(PKGDIR)
rm -rf out/deps out/Release
$(PYTHON) ./configure \
--dest-cpu=x64 \
--tag=$(TAG) \
--release-urlbase=$(RELEASE_URLBASE) \
$(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS)
$(MAKE) all V=$(V)
$(PKG): pre-pkg # release-only pre-pkg
# rm -rf $(PKGDIR)
# rm -rf out/deps out/Release
# $(PYTHON) ./configure \
# --dest-cpu=x64 \
# --tag=$(TAG) \
# --release-urlbase=$(RELEASE_URLBASE) \
# $(CONFIG_FLAGS) $(BUILD_RELEASE_FLAGS)
# $(MAKE) all V=$(V)
NODE_INSTALL_NODE_ONLY=1 $(PYTHON) tools/install.py install '$(PKGDIR)/node' '$(PREFIX)'
NODE_INSTALL_HEADERS_ONLY=1 $(PYTHON) tools/install.py install '$(PKGDIR)/node' '$(PREFIX)'
NODE_INSTALL_NPM_ONLY=1 $(PYTHON) tools/install.py install '$(PKGDIR)/npm' '$(PREFIX)'
Expand Down
36 changes: 9 additions & 27 deletions tools/osx-pkg/osx-pkg.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1650,7 +1650,7 @@
<key>HIDDEN</key>
<false/>
<key>STATE</key>
<integer>1</integer>
<integer>0</integer>
</dict>
<key>PACKAGE_UUID</key>
<string>F15133E4-7140-467A-90C3-BB6B53A9C79E</string>
Expand All @@ -1677,33 +1677,10 @@
<array/>
<key>OPTIONS</key>
<dict>
<key>DEPENDENCY</key>
<dict>
<key>ENABLED_DEPENDENCY</key>
<dict>
<key>COMPARATOR</key>
<integer>0</integer>
<key>OBJECT</key>
<integer>1</integer>
<key>UUID</key>
<string>95681E96-6FC4-494B-8901-D85A1178E7D4</string>
</dict>
<key>ENABLED_MODE</key>
<integer>2</integer>
<key>SELECTED_DEPENDENCY</key>
<dict>
<key>COMPARATOR</key>
<integer>0</integer>
<key>OBJECT</key>
<integer>0</integer>
<key>UUID</key>
<string>95681E96-6FC4-494B-8901-D85A1178E7D4</string>
</dict>
</dict>
<key>HIDDEN</key>
<false/>
<key>STATE</key>
<integer>3</integer>
<integer>1</integer>
</dict>
<key>PACKAGE_UUID</key>
<string>2D16FD51-8800-422D-9E9B-EC59D2157FE8</string>
Expand Down Expand Up @@ -1765,7 +1742,7 @@
<key>INSTALLATION TYPE</key>
<integer>0</integer>
<key>MODE</key>
<integer>1</integer>
<integer>0</integer>
</dict>
<key>INSTALLATION_STEPS</key>
<array>
Expand Down Expand Up @@ -1855,7 +1832,7 @@
<key>VALUE</key>
<dict>
<key>PATH</key>
<string>strings/LICENSE.txt</string>
<string>strings/license.rtf</string>
<key>PATH_TYPE</key>
<integer>1</integer>
</dict>
Expand Down Expand Up @@ -2099,6 +2076,11 @@
<string>node-__nodeversion__</string>
</dict>
</dict>
<key>SHARED_GLOBAL_DATA</key>
<dict>
<key>IC_REQUIREMENT_JAVASCRIPT_SHARED_SOURCE_CODE</key>
<string></string>
</dict>
<key>TYPE</key>
<integer>0</integer>
<key>VERSION</key>
Expand Down
13 changes: 9 additions & 4 deletions tools/osx-pkg/strings/en/introduction.rtf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
{\rtf1\ansi\ansicpg1252\cocoartf1348\cocoasubrtf170
\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
\vieww10800\viewh8400\viewkind0
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural

\f0\fs26 \cf0 This package will install Node.js __nodeversion__ and npm __npmversion__ into /usr/local/.}
\f0\fs26 \cf0 This package will install
\b Node.js __nodeversion__
\b0 and
\b npm __npmversion__
\b0 into /usr/local/}
16 changes: 10 additions & 6 deletions tools/osx-pkg/strings/en/summary.rtf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf360
{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
{\rtf1\ansi\ansicpg1252\cocoartf1348\cocoasubrtf170
\cocoascreenfonts1{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
{\colortbl;\red255\green255\blue255;}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
\vieww10800\viewh8400\viewkind0
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural

\f0\fs26 \cf0 Node.js was installed at\
\f0\b\fs26 \cf0 Node.js __nodeversion__
\b0 was installed at\
\
/usr/local/bin/node\
\
npm was installed at\
If selected,
\b npm __npmversion__
\b0 was installed at\
\
/usr/local/bin/npm\
\
Make sure that /usr/local/bin is in your $PATH.}
Make sure that /usr/local/bin is in your $PATH.}