Skip to content

OSX cli tools #468

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

Merged
cfrogjump merged 3 commits into from
Dec 5, 2018
Merged

OSX cli tools #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7214b75
Added options to include osx cli tools to Raven-Qt.app
cfrogjump Nov 24, 2018
6227da0
Added osx cli install script
cfrogjump Nov 24, 2018
714c410
Modified to include install script for os x cli tools
cfrogjump Nov 24, 2018
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
16 changes: 15 additions & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ RAVEND_BIN=$(top_builddir)/src/$(RAVEN_DAEMON_NAME)$(EXEEXT)
RAVEN_QT_BIN=$(top_builddir)/src/qt/$(RAVEN_GUI_NAME)$(EXEEXT)
RAVEN_CLI_BIN=$(top_builddir)/src/$(RAVEN_CLI_NAME)$(EXEEXT)
RAVEN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
RAVEN_CLI_INSTALL=$(top_builddir)/contrib/install_cli.sh

empty :=
space := $(empty) $(empty)
Expand Down Expand Up @@ -96,17 +97,30 @@ $(OSX_APP)/Contents/Resources/raven.icns: $(OSX_INSTALLER_ICONS)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@

$(OSX_APP)/Contents/MacOS/install_cli.sh: $(RAVEN_CLI_INSTALL)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@

$(OSX_APP)/Contents/MacOS/Raven-Qt: $(RAVEN_QT_BIN)
$(MKDIR_P) $(@D)
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@

$(OSX_APP)/Contents/MacOS/ravend: $(RAVEND_BIN)
$(MKDIR_P) $(@D)
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@

$(OSX_APP)/Contents/MacOS/raven-cli: $(RAVEN_CLI_BIN)
$(MKDIR_P) $(@D)
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@

$(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings:
$(MKDIR_P) $(@D)
echo '{ CFBundleDisplayName = "$(PACKAGE_NAME)"; CFBundleName = "$(PACKAGE_NAME)"; }' > $@

OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
$(OSX_APP)/Contents/Resources/raven.icns $(OSX_APP)/Contents/Info.plist \
$(OSX_APP)/Contents/MacOS/Raven-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
$(OSX_APP)/Contents/MacOS/Raven-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings \
$(OSX_APP)/Contents/MacOS/ravend $(OSX_APP)/Contents/MacOS/raven-cli $(OSX_APP)/Contents/MacOS/install_cli.sh

osx_volname:
echo $(OSX_VOLNAME) >$@
Expand Down
13 changes: 13 additions & 0 deletions contrib/install_cli.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/usr/bin/env bash

# Execute this file to install the raven cli tools into your path on OS X

CURRENT_LOC="$( cd "$(dirname "$0")" ; pwd -P )"
LOCATION=${CURRENT_LOC%Raven-Qt.app*}

# Ensure that the directory to symlink to exists
sudo mkdir -p /usr/local/bin

# Create symlinks to the cli tools
sudo ln -s ${LOCATION}/Raven-Qt.app/Contents/MacOS/ravend /usr/local/bin/ravend
sudo ln -s ${LOCATION}/Raven-Qt.app/Contents/MacOS/raven-cli /usr/local/bin/raven-cli