Commit 179c617c authored by Maren Hachmann's avatar Maren Hachmann

Merge branch 'menu_entries'

parents 777c3e4e a5b31ad1
......@@ -26,7 +26,7 @@ To execute this script, you will need:
As of 2018-11-7, this means that you need to execute this installation command on the command line (tested for Ubuntu 16.04, Ubuntu 17.10 and Ubuntu 18.04):
`sudo apt-get install git libnotify-bin checkinstall intltool pkg-config python-dev libtool ccache libart-2.0-dev libaspell-dev libboost-dev libcdr-dev libgc-dev libgdl-3-dev libglib2.0-dev libgnomevfs2-dev libgsl-dev libgtk-3-dev libgtkmm-3.0-dev libgtkspell-dev libgtkspell3-3-dev libjemalloc-dev liblcms2-dev libmagick++-dev libpango1.0-dev libpng-dev libpoppler-glib-dev libpoppler-private-dev libpopt-dev libpotrace-dev librevenge-dev libsigc++-2.0-dev libsoup2.4-dev libvisio-dev libwpg-dev libxml-parser-perl libxml2-dev libxslt1-dev libyaml-dev python-lxml zlib1g-dev cmake libgtkmm-2.4-dev gdb adwaita-icon-theme-full`
`sudo apt-get install git libnotify-bin checkinstall intltool pkg-config python-dev libtool ccache libart-2.0-dev libaspell-dev libboost-dev libcdr-dev libgc-dev libgdl-3-dev libglib2.0-dev libgnomevfs2-dev libgsl-dev libgtk-3-dev libgtkmm-3.0-dev libgtkspell-dev libgtkspell3-3-dev libjemalloc-dev liblcms2-dev libmagick++-dev libpango1.0-dev libpng-dev libpoppler-glib-dev libpoppler-private-dev libpopt-dev libpotrace-dev librevenge-dev libsigc++-2.0-dev libsoup2.4-dev libvisio-dev libwpg-dev libxml-parser-perl libxml2-dev libxslt1-dev libyaml-dev python-lxml zlib1g-dev cmake libgtkmm-2.4-dev gdb adwaita-icon-theme-full build-essential`
This will install up to 650 Mb of software.
......
......@@ -21,6 +21,7 @@
# THE SOFTWARE.
# -------------------
# --- GLOBALS ---
# Determine the real location of the script (this is for running via symlink)
SCRIPT_PATH="${BASH_SOURCE[0]}"
......@@ -36,6 +37,8 @@ SCRIPT_DIR="$( cd -P "$( dirname "$SCRIPT_PATH" )" >/dev/null && pwd )"
# import settings
source $SCRIPT_DIR/make_ink_config
MENU_ENTRIES_DIR="$HOME/.local/share/applications"
# Needed for version numbers and unique directories
DATE=$(date +%Y.%m.%d.%H.%M.%S)
......@@ -44,6 +47,31 @@ MARKER="-->"
# Do we want to do a full rebuild? This also allows to build Inkscape if the branch has not changed.
FORCE=0
# --- FUNCTIONS ---
# Create menu entries
# arguments:
# $1 name
# $2 comment,
# $3 script to execute,
# $4 terminal: true or false
# $5 file name for desktop file (without file extension)
function create_menu_entry () {
echo "[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=$1
Comment=$2
Exec=$3
Icon=application.png
Terminal=$4
" > $MENU_ENTRIES_DIR/$5
}
# --- ACTUAL SCRIPT ---
# Get into correct directory
cd $SOURCE_DIR
......@@ -152,6 +180,9 @@ INK_DIR="$INSTALL_DIR/bin"
STARTER_FILE=$STARTER_FILE_PATH/Run_Ink_$BRANCH
STARTER_FILE_DEBUG=$STARTER_FILE_PATH/Db_Ink_$BRANCH
# create directory for menu entries if it doesn't exist yet
mkdir -p $MENU_ENTRIES_DIR
# 1. Create start script (no debug)
echo "#!/bin/bash
......@@ -199,6 +230,10 @@ exec gdb -batch-silent \\
chmod +x $STARTER_FILE
chmod +x $STARTER_FILE_DEBUG
create_menu_entry "Inkscape ($BRANCH)" "Inkscape Custom Build ($DATE, revision $REVISION)" $STARTER_FILE false inkscape-$BRANCH.desktop
create_menu_entry "Inkscape Debug ($BRANCH)" "Inkscape Custom Debug Build ($DATE, revision $REVISION)" $STARTER_FILE false inkscape-$BRANCH-debug.desktop
echo "Start your Inkscape installation by executing
$STARTER_FILE (or $STARTER_FILE_DEBUG)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment