зеркало из https://github.com/mozilla/pjs.git
Bug 461542 - consolidate the (unix) start scripts for our applications; mozilla-central patch v3; r=benjamin
This commit is contained in:
Marco Perez
Родитель
c27ae47997
Коммит
843b91dd45
|
|
@ -271,8 +271,9 @@ endif
|
||||||
|
|
||||||
ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
|
ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH)))
|
||||||
|
|
||||||
$(MOZ_APP_NAME):: mozilla.in $(GLOBAL_DEPS)
|
$(MOZ_APP_NAME):: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
|
||||||
cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" > $@
|
cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
|
||||||
|
-e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" > $@
|
||||||
chmod +x $@
|
chmod +x $@
|
||||||
|
|
||||||
libs:: $(MOZ_APP_NAME)
|
libs:: $(MOZ_APP_NAME)
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
# for the specific language governing rights and limitations under the
|
# for the specific language governing rights and limitations under the
|
||||||
# License.
|
# License.
|
||||||
#
|
#
|
||||||
# The Original Code is mozilla.org Code.
|
# The Original Code is mozilla.org code.
|
||||||
#
|
#
|
||||||
# The Initial Developer of the Original Code is
|
# The Initial Developer of the Original Code is
|
||||||
# Netscape Communications Corporation.
|
# Netscape Communications Corporation.
|
||||||
|
|
@ -36,17 +36,15 @@
|
||||||
#
|
#
|
||||||
# ***** END LICENSE BLOCK *****
|
# ***** END LICENSE BLOCK *****
|
||||||
|
|
||||||
## $Id: mozilla.in,v 1.16 2007/10/05 07:29:26 reed%reedloden.com Exp $
|
|
||||||
##
|
##
|
||||||
## Usage:
|
## Usage:
|
||||||
##
|
##
|
||||||
## $ mozilla [args]
|
## $ mozilla [args]
|
||||||
##
|
##
|
||||||
## This script is meant to run the mozilla-bin binary from either
|
## This script is meant to run the application binary from mozilla/dist/bin.
|
||||||
## mozilla/xpfe/bootstrap or mozilla/dist/bin.
|
|
||||||
##
|
##
|
||||||
## The script will setup all the environment voodoo needed to make
|
## The script will setup all the environment voodoo needed to make
|
||||||
## the mozilla-bin binary to work.
|
## the application binary to work.
|
||||||
##
|
##
|
||||||
|
|
||||||
#uncomment for debugging
|
#uncomment for debugging
|
||||||
|
|
@ -90,8 +88,9 @@ if [ $found = 0 ]; then
|
||||||
# Check default compile-time libdir
|
# Check default compile-time libdir
|
||||||
if [ -x "$moz_libdir/run-mozilla.sh" ]; then
|
if [ -x "$moz_libdir/run-mozilla.sh" ]; then
|
||||||
dist_bin="$moz_libdir"
|
dist_bin="$moz_libdir"
|
||||||
else
|
run_moz="$moz_libdir/run-mozilla.sh"
|
||||||
echo "Cannot find mozilla runtime directory. Exiting."
|
else
|
||||||
|
echo "Cannot find %MOZ_APP_DISPLAYNAME% runtime directory. Exiting."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
@ -208,10 +208,10 @@ endif
|
||||||
|
|
||||||
ifneq (,$(filter-out OS2 WINCE WINNT Darwin BeOS,$(OS_ARCH)))
|
ifneq (,$(filter-out OS2 WINCE WINNT Darwin BeOS,$(OS_ARCH)))
|
||||||
|
|
||||||
xulrunner:: mozilla.in $(GLOBAL_DEPS)
|
xulrunner:: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
|
||||||
cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
|
cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
|
||||||
-e "s|%MOZ_USER_DIR%|.mozilla/xulrunner|" \
|
-e "s|%MOZ_USER_DIR%|.mozilla/xulrunner|" \
|
||||||
-e "s|%MREDIR%|$(mredir)|" > $@
|
-e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" > $@
|
||||||
chmod +x $@
|
chmod +x $@
|
||||||
|
|
||||||
libs:: xulrunner
|
libs:: xulrunner
|
||||||
|
|
|
||||||
|
|
@ -1,289 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# ***** BEGIN LICENSE BLOCK *****
|
|
||||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
|
||||||
#
|
|
||||||
# The contents of this file are subject to the Mozilla Public License Version
|
|
||||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
|
||||||
# the License. You may obtain a copy of the License at
|
|
||||||
# http://www.mozilla.org/MPL/
|
|
||||||
#
|
|
||||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
|
||||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
|
||||||
# for the specific language governing rights and limitations under the
|
|
||||||
# License.
|
|
||||||
#
|
|
||||||
# The Original Code is mozilla.org code.
|
|
||||||
#
|
|
||||||
# The Initial Developer of the Original Code is
|
|
||||||
# Netscape Communications Corporation.
|
|
||||||
# Portions created by the Initial Developer are Copyright (C) 1998
|
|
||||||
# the Initial Developer. All Rights Reserved.
|
|
||||||
#
|
|
||||||
# Contributor(s):
|
|
||||||
#
|
|
||||||
# Alternatively, the contents of this file may be used under the terms of
|
|
||||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
|
||||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
|
||||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
|
||||||
# of those above. If you wish to allow use of your version of this file only
|
|
||||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
|
||||||
# use your version of this file under the terms of the MPL, indicate your
|
|
||||||
# decision by deleting the provisions above and replace them with the notice
|
|
||||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
|
||||||
# the provisions above, a recipient may use your version of this file under
|
|
||||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
|
||||||
#
|
|
||||||
# ***** END LICENSE BLOCK *****
|
|
||||||
|
|
||||||
## $Id: mozilla.in,v 1.4 2008/01/07 23:17:05 reed%reedloden.com Exp $
|
|
||||||
##
|
|
||||||
## Usage:
|
|
||||||
##
|
|
||||||
## $ mozilla [args]
|
|
||||||
##
|
|
||||||
## This script is meant to run the mozilla-bin binary from either
|
|
||||||
## mozilla/xpfe/bootstrap or mozilla/dist/bin.
|
|
||||||
##
|
|
||||||
## The script will setup all the environment voodoo needed to make
|
|
||||||
## the mozilla-bin binary to work.
|
|
||||||
##
|
|
||||||
|
|
||||||
moz_pis_startstop_scripts()
|
|
||||||
{
|
|
||||||
MOZ_USER_DIR="%MOZ_USER_DIR%"
|
|
||||||
# MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts"
|
|
||||||
# These variables and there meaning are specified in
|
|
||||||
# mozilla/xpfe/bootstrap/init.d/README
|
|
||||||
MOZ_PIS_API=2
|
|
||||||
MOZ_PIS_MOZBINDIR="${dist_bin}"
|
|
||||||
MOZ_PIS_SESSION_PID="$$"
|
|
||||||
MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
|
|
||||||
export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
|
|
||||||
|
|
||||||
case "${1}" in
|
|
||||||
"start")
|
|
||||||
for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do
|
|
||||||
if [ -x "${curr_pis}" ] ; then
|
|
||||||
case "${curr_pis}" in
|
|
||||||
*.sh) . "${curr_pis}" ;;
|
|
||||||
*) "${curr_pis}" "start" ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
;;
|
|
||||||
"stop")
|
|
||||||
for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do
|
|
||||||
if [ -x "${curr_pis}" ] ; then
|
|
||||||
case "${curr_pis}" in
|
|
||||||
*.sh) . "${curr_pis}" ;;
|
|
||||||
*) "${curr_pis}" "stop" ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts."
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
#uncomment for debugging
|
|
||||||
#set -x
|
|
||||||
|
|
||||||
moz_libdir=%MOZAPPDIR%
|
|
||||||
MRE_HOME=%MREDIR%
|
|
||||||
|
|
||||||
# Use run-mozilla.sh in the current dir if it exists
|
|
||||||
# If not, then start resolving symlinks until we find run-mozilla.sh
|
|
||||||
found=0
|
|
||||||
progname="$0"
|
|
||||||
curdir=`dirname "$progname"`
|
|
||||||
progbase=`basename "$progname"`
|
|
||||||
profile=""
|
|
||||||
run_moz="$curdir/run-mozilla.sh"
|
|
||||||
if test -x "$run_moz"; then
|
|
||||||
dist_bin="$curdir"
|
|
||||||
found=1
|
|
||||||
else
|
|
||||||
here=`/bin/pwd`
|
|
||||||
while [ -h "$progname" ]; do
|
|
||||||
bn=`basename "$progname"`
|
|
||||||
cd `dirname "$progname"`
|
|
||||||
progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' `
|
|
||||||
progbase=`basename "$progname"`
|
|
||||||
if [ ! -x "$progname" ]; then
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
curdir=`dirname "$progname"`
|
|
||||||
run_moz="$curdir/run-mozilla.sh"
|
|
||||||
if [ -x "$run_moz" ]; then
|
|
||||||
cd "$curdir"
|
|
||||||
dist_bin=`pwd`
|
|
||||||
found=1
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
cd "$here"
|
|
||||||
fi
|
|
||||||
if [ $found = 0 ]; then
|
|
||||||
# Check default compile-time libdir
|
|
||||||
if [ -x "$moz_libdir/run-mozilla.sh" ]; then
|
|
||||||
dist_bin="$moz_libdir"
|
|
||||||
else
|
|
||||||
echo "Cannot find mozilla runtime directory. Exiting."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
script_args=""
|
|
||||||
debugging=0
|
|
||||||
MOZILLA_BIN="${progbase}-bin"
|
|
||||||
MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client"
|
|
||||||
|
|
||||||
run_xremote_client() {
|
|
||||||
if [ -n "${profile}" ]; then
|
|
||||||
"${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" -p "${profile}" "$1"
|
|
||||||
else
|
|
||||||
"${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "$1"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# The following is to check for a currently running instance.
|
|
||||||
# This is taken almost verbatim from the Mozilla RPM package's launch script.
|
|
||||||
check_running() {
|
|
||||||
run_xremote_client 'ping()' 2>/dev/null >/dev/null
|
|
||||||
RETURN_VAL=$?
|
|
||||||
if [ $RETURN_VAL -eq 0 ]; then
|
|
||||||
echo 1
|
|
||||||
return 1
|
|
||||||
else
|
|
||||||
echo 0
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
if [ "$OSTYPE" = "beos" ]; then
|
|
||||||
mimeset -F "$MOZILLA_BIN"
|
|
||||||
fi
|
|
||||||
|
|
||||||
################################################################ Parse Arguments
|
|
||||||
# If there's a command line argument but it doesn't begin with a -
|
|
||||||
# it's probably a url. Try to send it to a running instance.
|
|
||||||
_USE_EXIST=0
|
|
||||||
_NEW_WINDOW=
|
|
||||||
_optOne="$1"
|
|
||||||
case "${_optOne}" in
|
|
||||||
-*)
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
_USE_EXIST=1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
_optOthers=
|
|
||||||
_optLast=
|
|
||||||
for i in "$@"; do
|
|
||||||
_optLast="${i}"
|
|
||||||
done #last arg
|
|
||||||
|
|
||||||
for i in "$@"; do
|
|
||||||
[ "$i" = "${_optLast}" ] && break
|
|
||||||
_optOthers="${_optOthers} ${i}"
|
|
||||||
done #others arg
|
|
||||||
|
|
||||||
#???: needs check if othersopt begin with -* ?
|
|
||||||
if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
|
|
||||||
# Last argument seems to be a local file/directory
|
|
||||||
# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
|
|
||||||
# If it is just "relatively" (./file) specified, make it absolutely
|
|
||||||
[ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
|
|
||||||
elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
|
|
||||||
_NEW_WINDOW=1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# check for -P argument used to select a user profile
|
|
||||||
_expectProfileName=0
|
|
||||||
for i in "$@"; do
|
|
||||||
if [ "$i" = "-P" ]; then
|
|
||||||
_expectProfileName=1
|
|
||||||
profile=""
|
|
||||||
elif [ ${_expectProfileName} = 1 ]; then
|
|
||||||
_expectProfileName=0
|
|
||||||
profile="$i"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
################################################################ Parse Arguments
|
|
||||||
|
|
||||||
########################################################################### Main
|
|
||||||
ALREADY_RUNNING=`check_running`
|
|
||||||
|
|
||||||
if [ $ALREADY_RUNNING -eq 1 ]; then
|
|
||||||
# There's an instance already running. Use it.
|
|
||||||
# Any command line args passed in?
|
|
||||||
if [ $# -gt 0 ]; then
|
|
||||||
# There were "some" command line args.
|
|
||||||
if [ ${_USE_EXIST} -eq 1 ]; then
|
|
||||||
# We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1
|
|
||||||
_open_type="window"
|
|
||||||
#_open_type="tab"
|
|
||||||
_remote_cmd="openURL(${_optLast} , new-${_open_type})"
|
|
||||||
run_xremote_client "${_remote_cmd}"
|
|
||||||
unset _remote_cmd _open_type
|
|
||||||
exit $?
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
# No command line args. Open new window/tab
|
|
||||||
run_xremote_client "xfeDoCommand(openBrowser)"
|
|
||||||
exit $?
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1
|
|
||||||
########################################################################### Main
|
|
||||||
|
|
||||||
pass_arg_count=0
|
|
||||||
while [ $# -gt $pass_arg_count ]
|
|
||||||
do
|
|
||||||
case "$1" in
|
|
||||||
-p | --pure | -pure)
|
|
||||||
MOZILLA_BIN="${MOZILLA_BIN}.pure"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
-g | --debug)
|
|
||||||
script_args="$script_args -g"
|
|
||||||
debugging=1
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
-d | --debugger)
|
|
||||||
script_args="$script_args -d $2"
|
|
||||||
shift 2
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
# Move the unrecognized argument to the end of the list.
|
|
||||||
arg="$1"
|
|
||||||
shift
|
|
||||||
set -- "$@" "$arg"
|
|
||||||
pass_arg_count=`expr $pass_arg_count + 1`
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
export MRE_HOME
|
|
||||||
|
|
||||||
## Start addon scripts
|
|
||||||
moz_pis_startstop_scripts "start"
|
|
||||||
|
|
||||||
if [ $debugging = 1 ]
|
|
||||||
then
|
|
||||||
echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
|
|
||||||
fi
|
|
||||||
"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
|
|
||||||
exitcode=$?
|
|
||||||
|
|
||||||
## Stop addon scripts
|
|
||||||
moz_pis_startstop_scripts "stop"
|
|
||||||
|
|
||||||
exit $exitcode
|
|
||||||
# EOF.
|
|
||||||
Загрузка…
Ссылка в новой задаче