зеркало из https://github.com/mozilla/gecko-dev.git
Move unix specific build hacks/scripts/etc into their own little place:
build/unix.
This commit is contained in:
ramiro%netscape.com
Родитель
660e4a4953
Коммит
3638cc03ab
|
|
@ -26,6 +26,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
# nglayout test program. The order is important.
|
||||
DIRS = \
|
||||
config \
|
||||
build \
|
||||
$(NULL)
|
||||
|
||||
ifndef MOZ_NATIVE_NSPR
|
||||
|
|
|
|||
|
|
@ -48,7 +48,9 @@ base/src/rhapsody/Makefile
|
|||
base/src/gtk/Makefile
|
||||
base/src/xlib/Makefile
|
||||
base/tests/Makefile
|
||||
build/nsprenv.mk
|
||||
build/Makefile
|
||||
build/unix/Makefile
|
||||
build/unix/nsprenv.mk
|
||||
build/package/rpm/mozilla.spec
|
||||
build/package/rpm/nspr-pthreads.spec
|
||||
config/Makefile
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
Makefile
|
||||
nsprenv.mk
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
#!gmake
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (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/NPL/
|
||||
#
|
||||
# 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 Communicator client code,
|
||||
# released March 31, 1998.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape Communications
|
||||
# Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
#
|
||||
|
||||
DEPTH = ..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
DIRS = unix
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
Makefile
|
||||
nsprenv.mk
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
#!gmake
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (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/NPL/
|
||||
#
|
||||
# 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 Communicator client code,
|
||||
# released March 31, 1998.
|
||||
#
|
||||
# The Initial Developer of the Original Code is Netscape Communications
|
||||
# Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
#
|
||||
|
||||
DEPTH = ../..
|
||||
topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
TARGETS =\
|
||||
run-mozilla.sh
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
RUN_MOZILLA_SCRIPT= $(srcdir)/run-mozilla.sh
|
||||
|
||||
install:: $(PROGRAM) $(RUN_MOZILLA_SCRIPT)
|
||||
$(INSTALL) $(RUN_MOZILLA_SCRIPT) $(DIST)/bin
|
||||
|
||||
|
|
@ -4,3 +4,4 @@ export NS_USE_GCC=@MOZ_NSPRENV_NS_USE_GCC@
|
|||
export NO_MDUPDATE=@MOZ_NSPRENV_NO_MDUPDATE@
|
||||
export NS_USE_NATIVE=@MOZ_NSPRENV_NS_USE_NATIVE@
|
||||
export MOZILLA_CLIENT=@MOZ_NSPRENV_MOZILLA_CLIENT@
|
||||
export DIST=@MOZ_NSPRENV_DIST@
|
||||
|
|
@ -0,0 +1,213 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
#
|
||||
|
||||
##
|
||||
## Usage:
|
||||
##
|
||||
## $ run-mozilla.sh [program]
|
||||
##
|
||||
## This script is meant to run a mozilla program from the mozilla
|
||||
## source tree. This is mostly useful to folks hacking on mozilla.
|
||||
##
|
||||
## A mozilla program is currently either viewer or apprunner. The
|
||||
## default is viewer.
|
||||
##
|
||||
## The script will setup all the environment voodoo needed to make
|
||||
## mozilla work.
|
||||
|
||||
##
|
||||
## Standard shell script disclaimer blurb thing:
|
||||
##
|
||||
## This script is a hcak. Its brute force. Its horrible.
|
||||
## It doesnt use Artificial Intelligence. It doesnt use Virtual Reality.
|
||||
## Its not perl. Its not python. It probably wont work unchanged on
|
||||
## the "other" thousands of unices. But it worksforme.
|
||||
##
|
||||
## If you have an improvement, patch, idea, whatever, on how to make this
|
||||
## script better, post it here:
|
||||
##
|
||||
## news://news.mozilla.org/netscape.public.mozilla.patches
|
||||
## news://news.mozilla.org/netscape.public.mozilla.unix
|
||||
##
|
||||
|
||||
##
|
||||
## Potential improvements:
|
||||
##
|
||||
## + Run from anywhere in the tree.
|
||||
## + Run ldd on the program and report missing dlls
|
||||
## + Deal with NSPR in the tree
|
||||
## + All the "other" unices
|
||||
##
|
||||
|
||||
cmdname=`basename $0`
|
||||
|
||||
##
|
||||
## Constants
|
||||
##
|
||||
MOZ_APPRUNNER_NAME="apprunner"
|
||||
MOZ_VIEWER_NAME="viewer"
|
||||
|
||||
##
|
||||
## Variables
|
||||
##
|
||||
MOZ_DIST_BIN=""
|
||||
MOZ_PROGRAM=""
|
||||
|
||||
##
|
||||
## Functions
|
||||
##
|
||||
moz_bail()
|
||||
{
|
||||
message=$1
|
||||
|
||||
echo
|
||||
echo "$cmdname: $message"
|
||||
echo
|
||||
|
||||
exit 1
|
||||
}
|
||||
|
||||
moz_test_binary()
|
||||
{
|
||||
binary=$1
|
||||
|
||||
if [ -f "$binary" ]
|
||||
then
|
||||
if [ -x "$binary" ]
|
||||
then
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
##
|
||||
## Program name given in $1
|
||||
##
|
||||
if [ $# -gt 0 ]
|
||||
then
|
||||
MOZ_PROGRAM=$1
|
||||
|
||||
shift
|
||||
fi
|
||||
|
||||
##
|
||||
## Program not given, try to guess a default
|
||||
##
|
||||
if [ -z "$MOZ_PROGRAM" ]
|
||||
then
|
||||
##
|
||||
## Try viewer
|
||||
##
|
||||
moz_test_binary $MOZ_VIEWER_NAME
|
||||
|
||||
if [ $? -eq 1 ]
|
||||
then
|
||||
MOZ_PROGRAM=$MOZ_VIEWER_NAME
|
||||
##
|
||||
## Try apprunner
|
||||
##
|
||||
else
|
||||
moz_test_binary $MOZ_APPRUNNER_NAME
|
||||
|
||||
if [ $? -eq 1 ]
|
||||
then
|
||||
MOZ_PROGRAM=$MOZ_APPRUNNER_NAME
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
##
|
||||
## Running the program from its source dir
|
||||
##
|
||||
if [ -f Makefile.in ]
|
||||
then
|
||||
# Use DEPTH in the Makefile.in to determine the depth
|
||||
depth=`grep -w DEPTH Makefile.in | grep -e "\.\." | awk -F"=" '{ print $2; }'`
|
||||
|
||||
##
|
||||
## Make sure dist/bin exits
|
||||
##
|
||||
if [ ! -d $depth/dist/bin ]
|
||||
then
|
||||
moz_bail "$depth/dist/bin does not exist."
|
||||
fi
|
||||
|
||||
# push
|
||||
here=`pwd`
|
||||
|
||||
cd $depth/dist/bin
|
||||
|
||||
MOZ_DIST_BIN=`pwd`
|
||||
|
||||
# pop
|
||||
cd $here
|
||||
else
|
||||
##
|
||||
## Running the program from dist/bin
|
||||
##
|
||||
if [ -d components -a -d res ]
|
||||
then
|
||||
MOZ_DIST_BIN=`pwd`
|
||||
fi
|
||||
fi
|
||||
|
||||
##
|
||||
## Make sure dist/bin is ok
|
||||
##
|
||||
if [ -z "$MOZ_DIST_BIN" ]
|
||||
then
|
||||
moz_bail "Cannot access dir dist/bin directory."
|
||||
fi
|
||||
|
||||
if [ ! -d $MOZ_DIST_BIN ]
|
||||
then
|
||||
moz_bail "Cannot access dir dist/bin directory."
|
||||
fi
|
||||
|
||||
##
|
||||
## Make sure the program is executable
|
||||
##
|
||||
if [ ! -x $MOZ_PROGRAM ]
|
||||
then
|
||||
moz_bail "Cannot execute $MOZ_PROGRAM."
|
||||
fi
|
||||
|
||||
##
|
||||
## Set MOZILLA_FIVE_HOME
|
||||
##
|
||||
MOZILLA_FIVE_HOME=$MOZ_DIST_BIN
|
||||
|
||||
##
|
||||
## Set LD_LIBRARY_PATH
|
||||
##
|
||||
if [ -n "$LD_LIBRARY_PATH" ]
|
||||
then
|
||||
LD_LIBRARY_PATH=${MOZ_DIST_BIN}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
|
||||
else
|
||||
LD_LIBRARY_PATH=${MOZ_DIST_BIN}
|
||||
fi
|
||||
|
||||
echo "MOZILLA_FIVE_HOME=$MOZILLA_FIVE_HOME"
|
||||
echo " LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
|
||||
echo " MOZ_PROGRAM=$MOZ_PROGRAM"
|
||||
|
||||
export MOZILLA_FIVE_HOME LD_LIBRARY_PATH
|
||||
|
||||
exec ./$MOZ_PROGRAM ${1+"$@"}
|
||||
|
|
@ -133,7 +133,7 @@ show_objname:
|
|||
|
||||
.PHONY: show_objname
|
||||
|
||||
RUN_MOZILLA_SCRIPT= $(topsrcdir)/build/run-mozilla.sh
|
||||
#RUN_MOZILLA_SCRIPT= $(topsrcdir)/build/run-mozilla.sh
|
||||
|
||||
export:: $(RUN_MOZILLA_SCRIPT)
|
||||
$(INSTALL) $(RUN_MOZILLA_SCRIPT) $(DIST)/bin
|
||||
#export:: $(RUN_MOZILLA_SCRIPT)
|
||||
# $(INSTALL) $(RUN_MOZILLA_SCRIPT) $(DIST)/bin
|
||||
|
|
|
|||
10
configure.in
10
configure.in
|
|
@ -1680,11 +1680,11 @@ dnl ========================================================
|
|||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = build/nsprenv.mk support
|
||||
dnl = build/unix/nsprenv.mk support
|
||||
dnl =
|
||||
dnl = NSPR does not use autoconf. However, it support reading
|
||||
dnl = environment from a file. That is what build/nsprenv.mk
|
||||
dnl = does. It is generated from builds/nsprenv.mk.in.
|
||||
dnl = environment from a file. That is what build/unix/nsprenv.mk
|
||||
dnl = does. It is generated from builds/unix/nsprenv.mk.in.
|
||||
dnl =
|
||||
dnl = This file is them copied to nsprpub/config/myconfig.mk
|
||||
dnl =
|
||||
|
|
@ -1815,7 +1815,7 @@ AC_OUTPUT($MAKEFILES)
|
|||
|
||||
dnl ========================================================
|
||||
dnl =
|
||||
dnl = If is not native, copy build/nsprenv.mk to
|
||||
dnl = If is not native, copy build/unix/nsprenv.mk to
|
||||
dnl = nsprpub/config/myconfig.mk, so that NSPR will be
|
||||
dnl = built with the same options as mozilla.
|
||||
dnl =
|
||||
|
|
@ -1827,5 +1827,5 @@ dnl
|
|||
dnl if test ! "$MOZ_NATIVE_NSPR"
|
||||
dnl then
|
||||
dnl rm -f nsprpub/config/myconfig.mk
|
||||
dnl cp build/nsprenv.mk nsprpub/config/myconfig.mk
|
||||
dnl cp build/unix/nsprenv.mk nsprpub/config/myconfig.mk
|
||||
dnl fi
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче