# HG changeset patch # User Sascha Wilde # Date 1404146122 -7200 # Node ID 5e25159d702504d74a3e6808796c5cc80b090da3 # Parent a5a709c6ce93eb146d04c908d8cbfe560042522b# Parent 75cd2fbf9ac6fa190845acfee18d67fddf4fa749 Merged diff -r 75cd2fbf9ac6 -r 5e25159d7025 CMakeLists.txt --- a/CMakeLists.txt Mon Jun 30 17:21:44 2014 +0200 +++ b/CMakeLists.txt Mon Jun 30 18:35:22 2014 +0200 @@ -118,6 +118,8 @@ set(NSS_BASE_DIR "${NSS_BASE_DIR}/..") configure_file (packaging/tmp-createpackage.sh.in packaging/tmp-createpackage.sh) +configure_file (packaging/linux-createpackage.sh.in packaging/linux-createpackage.sh @ONLY) +configure_file (packaging/linux-installer.inc.in packaging/linux-installer.inc @ONLY) if (ENABLE_PROFILING) configure_file (make-coverage.sh.in make-coverage.sh) diff -r 75cd2fbf9ac6 -r 5e25159d7025 packaging/linux-createpackage.sh.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/packaging/linux-createpackage.sh.in Mon Jun 30 18:35:22 2014 +0200 @@ -0,0 +1,30 @@ +#!/bin/bash +# Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik +# Software engineering by Intevation GmbH +# +# This file is Free Software under the GNU GPL (v>=2) +# and comes with ABSOLUTELY NO WARRANTY! +# See LICENSE.txt for details. + +TMPDIR=$(mktemp -d) + +INSTALLER="@CMAKE_BINARY_DIR@/TrustBridge-@PROJECT_VERSION@.sh" + +EXEFILES=("@CMAKE_BINARY_DIR@/cinst/cinst" + "@CMAKE_BINARY_DIR@/cinst/mozilla" + "@CMAKE_BINARY_DIR@/ui/trustbridge") + +# Make installation in TMPDIR, this is what we will put into the +# shar-archive. +echo "Using $TMPDIR for temporary installation to build installer..." +install -d "$TMPDIR/bin" +install "${EXEFILES[@]}" "$TMPDIR/bin" + +echo "Building $INSTALLER..." +cat "@CMAKE_BINARY_DIR@/packaging/linux-installer.inc" >"$INSTALLER" +cd "$TMPDIR" +shar -z -B bin/* >>"$INSTALLER" +chmod +x "$INSTALLER" + +echo "Cleaning up..." +rm -r "$TMPDIR" diff -r 75cd2fbf9ac6 -r 5e25159d7025 packaging/linux-installer.inc.in --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/packaging/linux-installer.inc.in Mon Jun 30 18:35:22 2014 +0200 @@ -0,0 +1,35 @@ +#!/bin/bash + +PREFIX=/usr/local + +fatal() +{ + echo "$1" >&2 + echo "Installation failed." >&2 + exit 1 +} + +cat <