Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Changes backported from 1.9.2 to fix the build; all build infrastruct…

…ure: no code
  • Loading branch information...
commit e15a2ccf72c2ef253407454a002c5ecfa4a3a1d3 1 parent 6a21462
Steven Parkes smparkes authored
35 .gitignore
... ... @@ -0,0 +1,35 @@
  1 +/Makefile
  2 +/config.cache
  3 +/config.log
  4 +/config.status
  5 +/config/Makefile
  6 +/config/autoconf.mk
  7 +/config/mkdepend/Makefile
  8 +/config/myconfig.mk
  9 +/config/myrules.mk
  10 +/configure
  11 +/dist
  12 +/js-config
  13 +/js-config.h
  14 +/mozilla-config.h
  15 +/unallmakefiles
  16 +/.deps
  17 +/config/nfspwd
  18 +/config/nsinstall
  19 +/config/revdepth
  20 +/config/system_wrappers_js
  21 +/*.dylib
  22 +/*.a
  23 +/jscpucfg
  24 +/jsautokw.h
  25 +/jsautooplen.h
  26 +/jsautocfg.h
  27 +/host_jskwgen
  28 +/host_jsoplengen
  29 +/editline/.deps
  30 +/editline/Makefile
  31 +/editline/libeditline.a
  32 +js
  33 +/shell/.deps
  34 +/shell/Makefile
  35 +/shell/js
18 Makefile.in
@@ -46,15 +46,20 @@ DIRS = config
46 46 run_for_side_effects := $(shell echo "MAKE: $(MAKE)")
47 47 include $(DEPTH)/config/autoconf.mk
48 48
  49 +ifdef JS_NATIVE_EDITLINE
  50 +DIRS += editline
  51 +endif
  52 +
  53 +# editline needs to get built before the shell
  54 +ifndef JS_DISABLE_SHELL
  55 +DIRS += shell
  56 +endif
  57 +
49 58 MODULE = js
50 59 LIBRARY_NAME = mozjs
  60 +STATIC_LIBRARY_NAME = js_static
51 61 GRE_MODULE = 1
52 62
53   -PROGRAM = js$(BIN_SUFFIX)
54   -# The shell uses some 'HIDDEN' symbols to produce statistics, so we
55   -# link directly against the .o files, not against the JS shared
56   -# library.
57   -PROGOBJS = js.$(OBJ_SUFFIX) $(OBJS)
58 63 LIBS = $(NSPR_LIBS)
59 64
60 65 ifdef WINCE
@@ -100,9 +105,8 @@ endif
100 105 # the js code getting copied into xpinstall and jsd as well as mozilla-bin,
101 106 # and then the static data cells used for locking no longer work.
102 107
103   -ifndef JS_STATIC_BUILD
104 108 FORCE_SHARED_LIB = 1
105   -endif
  109 +FORCE_STATIC_LIB = 1
106 110
107 111 VPATH = $(srcdir)
108 112
4 config/autoconf.mk.in
@@ -267,6 +267,10 @@ NSPR_LIBS = @NSPR_LIBS@
267 267
268 268 USE_DEPENDENT_LIBS = @USE_DEPENDENT_LIBS@
269 269
  270 +JS_NATIVE_EDITLINE = @JS_NATIVE_EDITLINE@
  271 +JS_DISABLE_SHELL = @JS_DISABLE_SHELL@
  272 +EDITLINE_LIBS = @EDITLINE_LIBS@
  273 +
270 274 # MKSHLIB_FORCE_ALL is used to force the linker to include all object
271 275 # files present in an archive. MKSHLIB_UNFORCE_ALL reverts the linker
272 276 # to normal behavior. Makefile's that create shared libraries out of
11 config/rules.mk
@@ -221,15 +221,16 @@ endif # ENABLE_TESTS
221 221 #
222 222
223 223 ifndef LIBRARY
224   -ifdef LIBRARY_NAME
  224 +ifdef STATIC_LIBRARY_NAME
225 225 ifneq (,$(filter OS2 WINNT WINCE,$(OS_ARCH)))
226 226 ifdef SHORT_LIBNAME
227   -LIBRARY_NAME := $(SHORT_LIBNAME)
228   -endif
229   -endif
230   -LIBRARY := $(LIB_PREFIX)$(LIBRARY_NAME).$(LIB_SUFFIX)
  227 +STATIC_LIBRARY_NAME := $(SHORT_LIBNAME)
  228 +SHARED_LIBRARY_NAME := $(SHORT_LIBNAME)
231 229 endif
232 230 endif
  231 +LIBRARY := $(LIB_PREFIX)$(STATIC_LIBRARY_NAME).$(LIB_SUFFIX)
  232 +endif # STATIC_LIBRARY_NAME
  233 +endif # LIBRARY
233 234
234 235 ifndef HOST_LIBRARY
235 236 ifdef HOST_LIBRARY_NAME
49 configure.in
@@ -4895,6 +4895,48 @@ fi
4895 4895 fi
4896 4896
4897 4897 dnl ========================================================
  4898 +dnl = Link js shell to system readline
  4899 +dnl ========================================================
  4900 +MOZ_ARG_ENABLE_BOOL(readline,
  4901 +[ --enable-readline Link js shell to system readline library],
  4902 + JS_WANT_READLINE=1,
  4903 + JS_WANT_READLINE= )
  4904 +
  4905 +JS_NATIVE_EDITLINE=
  4906 +EDITLINE_LIBS=
  4907 +JS_DISABLE_SHELL=
  4908 +
  4909 +case "$target" in
  4910 +*-wince*|*-mingw*|*-cygwin*|*-msvc*|*-mks*)
  4911 + NO_EDITLINE=1
  4912 + ;;
  4913 +*-symbian*)
  4914 + NO_EDITLINE=1
  4915 + JS_DISABLE_SHELL=1
  4916 + ;;
  4917 +*)
  4918 + ;;
  4919 +esac
  4920 +
  4921 +if test -z "$SKIP_LIBRARY_CHECKS" -a -z "$NO_EDITLINE"; then
  4922 + if test -n "$JS_WANT_READLINE"; then
  4923 + AC_CHECK_LIB(readline, readline,
  4924 + EDITLINE_LIBS="-lreadline",
  4925 + AC_MSG_ERROR([No system readline library found.]))
  4926 + else
  4927 + dnl By default, we use editline
  4928 + JS_NATIVE_EDITLINE=1
  4929 + EDITLINE_LIBS='$(DEPTH)/editline/$(LIB_PREFIX)editline.$(LIB_SUFFIX)'
  4930 + fi
  4931 +
  4932 + dnl Either way, we want to build with line editing support.
  4933 + AC_DEFINE(EDITLINE)
  4934 +fi
  4935 +AC_SUBST(JS_NATIVE_EDITLINE)
  4936 +AC_SUBST(JS_DISABLE_SHELL)
  4937 +AC_SUBST(EDITLINE_LIBS)
  4938 +
  4939 +dnl ========================================================
4898 4940 dnl =
4899 4941 dnl = Standalone module options
4900 4942 dnl =
@@ -5270,11 +5312,18 @@ mv confdefs.h.save confdefs.h
5270 5312
5271 5313 MAKEFILES="
5272 5314 Makefile
  5315 + shell/Makefile
5273 5316 config/Makefile
5274 5317 config/autoconf.mk
5275 5318 config/mkdepend/Makefile
5276 5319 "
5277 5320
  5321 +if test -n "$JS_NATIVE_EDITLINE"; then
  5322 + MAKEFILES="$MAKEFILES
  5323 +editline/Makefile
  5324 +"
  5325 +fi
  5326 +
5278 5327 dnl
5279 5328 dnl Run a perl script to quickly create the makefiles.
5280 5329 dnl If it succeeds, it outputs a shell command to set CONFIG_FILES
55 editline/Makefile.in
... ... @@ -0,0 +1,55 @@
  1 +# -*- Mode: makefile -*-
  2 +#
  3 +# ***** BEGIN LICENSE BLOCK *****
  4 +# Version: MPL 1.1/GPL 2.0/LGPL 2.1
  5 +#
  6 +# The contents of this file are subject to the Mozilla Public License Version
  7 +# 1.1 (the "License"); you may not use this file except in compliance with
  8 +# the License. You may obtain a copy of the License at
  9 +# http://www.mozilla.org/MPL/
  10 +#
  11 +# Software distributed under the License is distributed on an "AS IS" basis,
  12 +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
  13 +# for the specific language governing rights and limitations under the
  14 +# License.
  15 +#
  16 +# The Original Code is Spidermonkey build system.
  17 +#
  18 +# The Initial Developer of the Original Code is
  19 +# The Mozilla Foundation.
  20 +# Portions created by the Initial Developer are Copyright (C) 2008
  21 +# the Initial Developer. All Rights Reserved.
  22 +#
  23 +# Contributor(s):
  24 +# Ted Mielczarek <ted.mielczarek@gmail.com>
  25 +#
  26 +# Alternatively, the contents of this file may be used under the terms of
  27 +# either of the GNU General Public License Version 2 or later (the "GPL"),
  28 +# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  29 +# in which case the provisions of the GPL or the LGPL are applicable instead
  30 +# of those above. If you wish to allow use of your version of this file only
  31 +# under the terms of either the GPL or the LGPL, and not to allow others to
  32 +# use your version of this file under the terms of the MPL, indicate your
  33 +# decision by deleting the provisions above and replace them with the notice
  34 +# and other provisions required by the GPL or the LGPL. If you do not delete
  35 +# the provisions above, a recipient may use your version of this file under
  36 +# the terms of any one of the MPL, the GPL or the LGPL.
  37 +#
  38 +# ***** END LICENSE BLOCK *****
  39 +
  40 +DEPTH = ..
  41 +topsrcdir = @top_srcdir@
  42 +srcdir = @srcdir@
  43 +VPATH = @srcdir@
  44 +
  45 +include $(DEPTH)/config/autoconf.mk
  46 +
  47 +LIBRARY_NAME = editline
  48 +FORCE_STATIC_LIB = 1
  49 +
  50 +CSRCS = editline.c sysunix.c
  51 +
  52 +DEFINES += -DANSI_ARROWS -DHAVE_TCGETATTR -DHIDE -DUSE_DIRENT -DSYS_UNIX \
  53 + -DHAVE_STDLIB -DUNIQUE_HISTORY
  54 +
  55 +include $(topsrcdir)/config/rules.mk
72 shell/Makefile.in
... ... @@ -0,0 +1,72 @@
  1 +# -*- Mode: makefile -*-
  2 +#
  3 +# ***** BEGIN LICENSE BLOCK *****
  4 +# Version: MPL 1.1/GPL 2.0/LGPL 2.1
  5 +#
  6 +# The contents of this file are subject to the Mozilla Public License Version
  7 +# 1.1 (the "License"); you may not use this file except in compliance with
  8 +# the License. You may obtain a copy of the License at
  9 +# http://www.mozilla.org/MPL/
  10 +#
  11 +# Software distributed under the License is distributed on an "AS IS" basis,
  12 +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
  13 +# for the specific language governing rights and limitations under the
  14 +# License.
  15 +#
  16 +# The Original Code is Spidermonkey build system.
  17 +#
  18 +# The Initial Developer of the Original Code is
  19 +# The Mozilla Foundation.
  20 +# Portions created by the Initial Developer are Copyright (C) 2008
  21 +# the Initial Developer. All Rights Reserved.
  22 +#
  23 +# Contributor(s):
  24 +# Ted Mielczarek <ted.mielczarek@gmail.com>
  25 +#
  26 +# Alternatively, the contents of this file may be used under the terms of
  27 +# either of the GNU General Public License Version 2 or later (the "GPL"),
  28 +# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  29 +# in which case the provisions of the GPL or the LGPL are applicable instead
  30 +# of those above. If you wish to allow use of your version of this file only
  31 +# under the terms of either the GPL or the LGPL, and not to allow others to
  32 +# use your version of this file under the terms of the MPL, indicate your
  33 +# decision by deleting the provisions above and replace them with the notice
  34 +# and other provisions required by the GPL or the LGPL. If you do not delete
  35 +# the provisions above, a recipient may use your version of this file under
  36 +# the terms of any one of the MPL, the GPL or the LGPL.
  37 +#
  38 +# ***** END LICENSE BLOCK *****
  39 +
  40 +DEPTH = ..
  41 +topsrcdir = @top_srcdir@
  42 +srcdir = @srcdir@
  43 +VPATH = @srcdir@
  44 +
  45 +include $(DEPTH)/config/autoconf.mk
  46 +
  47 +PROGRAM = js$(BIN_SUFFIX)
  48 +CPPSRCS = js.cpp
  49 +
  50 +DEFINES += -DEXPORT_JS_API
  51 +
  52 +LIBS = $(NSPR_LIBS) $(EDITLINE_LIBS) $(DEPTH)/$(LIB_PREFIX)js_static.$(LIB_SUFFIX)
  53 +
  54 +LOCAL_INCLUDES += -I$(topsrcdir) -I..
  55 +
  56 +ifdef _MSC_VER
  57 +ifdef WINCE
  58 +WIN32_EXE_LDFLAGS += -ENTRY:mainACRTStartup
  59 +endif
  60 +endif
  61 +
  62 +include $(topsrcdir)/config/rules.mk
  63 +
  64 +ifdef MOZ_SHARK
  65 +CFLAGS += -F/System/Library/PrivateFrameworks
  66 +CXXFLAGS += -F/System/Library/PrivateFrameworks
  67 +LDFLAGS += -F/System/Library/PrivateFrameworks -framework CHUD
  68 +endif
  69 +
  70 +# People expect the js shell to wind up in the top-level JS dir.
  71 +libs::
  72 + $(INSTALL) $(IFLAGS2) $(PROGRAM) $(DEPTH)
0  js.cpp → shell/js.cpp
File renamed without changes

0 comments on commit e15a2cc

Please sign in to comment.
Something went wrong with that request. Please try again.