Skip to content

Refactor Mac installer generation #776

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
remixz wants to merge 12 commits into from
Closed

Refactor Mac installer generation #776

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
97e79f5
Refactor Mac .pkg generation
remixz Feb 10, 2015
f186d1c
Add symlink step to Mac installer
remixz Feb 12, 2015
8491b02
Merge remote-tracking branch 'origin/v1.x' into refactor-mac-installer
remixz Feb 12, 2015
e08d2df
Create empty files on pre-pkg, set up uninstall
remixz Feb 12, 2015
2fb6c21
Add pre-pkg to .PHONY in makefile
remixz Feb 13, 2015
5580022
Wrap Makefile lines at 80 characters
remixz Feb 13, 2015
d1c2ac7
Wrap osx-pkg README at 80 characters
remixz Feb 13, 2015
1755cc8
Simplify `no_symlink` check in tools/install.py
remixz Feb 13, 2015
1434328
Add uninstaller
remixz Feb 14, 2015
5e2c01c
Change codesign to sign iojs, not node
remixz Feb 14, 2015
cb069d4
Merge remote-tracking branch 'origin/v1.x' into refactor-mac-installer
remixz Mar 4, 2015
2526e1d
Remove node_modules if folder is empty
remixz Mar 5, 2015
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
Add symlink step to Mac installer
  • Loading branch information
@remixz
remixz committed Feb 12, 2015
commit f186d1c11bdb502499a478f2dea7bcaaeb1cfa32
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ PYTHON ?= python
DESTDIR ?=
SIGN ?=
PREFIX ?= /usr/local
NO_SYMLINK ?= false

# Determine EXEEXT
EXEEXT := $(shell $(PYTHON) -c \
Expand Down Expand Up @@ -50,7 +51,7 @@ config.gypi: configure
fi

install: all
$(PYTHON) tools/install.py $@ '$(DESTDIR)' '$(PREFIX)'
$(PYTHON) tools/install.py $@ '$(DESTDIR)' '$(PREFIX)' '$(NO_SYMLINK)'

uninstall:
$(PYTHON) tools/install.py $@ '$(DESTDIR)' '$(PREFIX)'
Expand Down Expand Up @@ -269,7 +270,7 @@ $(PKG): release-only pre-pkg
$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)/32
rm -rf out/deps out/Release
$(PYTHON) ./configure --dest-cpu=x64 --tag=$(TAG)
$(MAKE) install V=$(V) DESTDIR=$(PKGDIR)
$(MAKE) install V=$(V) DESTDIR=$(PKGDIR) NO_SYMLINK=true
SIGN="$(APP_SIGN)" PKGDIR="$(PKGDIR)" bash tools/osx-codesign.sh
lipo $(PKGDIR)/32/usr/local/bin/iojs \
$(PKGDIR)/usr/local/bin/iojs \
Expand Down
7 changes: 5 additions & 2 deletions tools/install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
install_path = None # base target directory (DESTDIR + PREFIX from Makefile)
target_defaults = None
variables = None
no_symlink = False

def abspath(*args):
path = os.path.join(*args)
Expand Down Expand Up @@ -132,7 +133,7 @@ def files(action):
exeext = '.exe' if is_windows else ''
action(['out/Release/iojs' + exeext], 'bin/iojs' + exeext)

if not is_windows:
if not is_windows and not no_symlink:
# Install iojs -> node compatibility symlink.
link_target = 'bin/node'
link_path = abspath(install_path, link_target)
Expand Down Expand Up @@ -186,14 +187,16 @@ def files(action):
], 'include/node/')

def run(args):
global node_prefix, install_path, target_defaults, variables
global node_prefix, install_path, target_defaults, variables, no_symlink

# chdir to the project's top-level directory
os.chdir(abspath(os.path.dirname(__file__), '..'))

conf = load_config()
variables = conf['variables']
target_defaults = conf['target_defaults']
# argv[4] is a variable representing whether a symlink should be made
no_symlink = True if len(args) > 4 and args[4] == 'true' else False
Copy link
Copy Markdown
Member

@bnoordhuis bnoordhuis Feb 13, 2015

Choose a reason for hiding this comment

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

no_symlink = len(args) > 4 and args[4] == 'true'?


# argv[2] is a custom install prefix for packagers (think DESTDIR)
# argv[3] is a custom install prefix (think PREFIX)
Expand Down
Loading