From 00bf0528837d17338daa276ab3e2bf793fd233e6 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Wed, 28 Dec 2011 08:24:02 +0100 Subject: [PATCH] Bug 701371 - Rename mozutils to mozglue, and move it to top-level. r=khuey --HG-- rename : memory/mozutils/Makefile.in => mozglue/Makefile.in rename : memory/mozutils/Makefile.in => mozglue/build/Makefile.in rename : memory/mozutils/dummy.cpp => mozglue/build/dummy.cpp rename : memory/mozutils/fixcrt.py => mozglue/build/fixcrt.py rename : memory/mozutils/mozutils.def.in => mozglue/build/mozutils.def.in --- Makefile.in | 23 ++++++++---- allmakefiles.sh | 4 +-- b2g/installer/package-manifest.in | 2 +- b2g/installer/removed-files.in | 1 + browser/installer/package-manifest.in | 2 +- browser/installer/removed-files.in | 1 + build/win32/Makefile.in | 2 +- build/win32/crashinjectdll/Makefile.in | 2 +- build/win32/vmwarerecordinghelper/Makefile.in | 2 +- config/autoconf.mk.in | 4 +-- config/config.mk | 6 ++-- config/rules.mk | 18 +++++----- configure.in | 36 +++++++++---------- db/sqlite3/src/Makefile.in | 4 +-- embedding/android/GeckoAppShell.java | 2 +- ipc/app/MozillaRuntimeMainAndroid.cpp | 2 +- js/src/config/autoconf.mk.in | 4 +-- js/src/config/config.mk | 6 ++-- js/src/config/rules.mk | 18 +++++----- js/src/configure.in | 6 ++-- mobile/android/base/GeckoApp.java | 2 +- mobile/android/installer/package-manifest.in | 3 +- mobile/android/installer/removed-files.in | 25 ++++++------- mobile/xul/installer/package-manifest.in | 3 +- mobile/xul/installer/removed-files.in | 25 ++++++------- {memory => mozglue}/Makefile.in | 24 +++++-------- .../mozutils => mozglue/build}/Makefile.in | 18 +++++----- {memory/mozutils => mozglue/build}/dummy.cpp | 0 {memory/mozutils => mozglue/build}/fixcrt.py | 0 .../build}/mozutils.def.in | 2 +- other-licenses/android/linker.c | 4 +-- toolkit/crashreporter/client/Makefile.in | 6 ++-- toolkit/mozapps/installer/packager.mk | 6 ++-- toolkit/mozapps/update/updater/Makefile.in | 6 ++-- 34 files changed, 137 insertions(+), 132 deletions(-) rename {memory => mozglue}/Makefile.in (86%) rename {memory/mozutils => mozglue/build}/Makefile.in (94%) rename {memory/mozutils => mozglue/build}/dummy.cpp (100%) rename {memory/mozutils => mozglue/build}/fixcrt.py (100%) rename {memory/mozutils => mozglue/build}/mozutils.def.in (99%) diff --git a/Makefile.in b/Makefile.in index 0a81255581a..bc9007e2840 100644 --- a/Makefile.in +++ b/Makefile.in @@ -59,18 +59,27 @@ TIERS += base # tier "base" - basic setup # tier_base_dirs = \ - config \ - build \ - probes \ - mfbt \ - $(NULL) + config \ + build \ + probes \ + mfbt \ + $(NULL) ifndef LIBXUL_SDK ifeq (android,$(MOZ_WIDGET_TOOLKIT)) -tier_base_dirs += other-licenses/android other-licenses/skia-npapi +tier_base_dirs += \ + other-licenses/android \ + other-licenses/skia-npapi \ + $(NULL) endif -tier_base_dirs += memory +ifdef MOZ_MEMORY +tier_base_dirs += memory/jemalloc +endif +tier_base_dirs += \ + mozglue \ + memory/mozalloc \ + $(NULL) endif ifdef COMPILE_ENVIRONMENT diff --git a/allmakefiles.sh b/allmakefiles.sh index fb29d86a2c0..2a0e18b1465 100755 --- a/allmakefiles.sh +++ b/allmakefiles.sh @@ -74,9 +74,9 @@ extensions/Makefile if [ ! "$LIBXUL_SDK" ]; then add_makefiles " - memory/Makefile memory/mozalloc/Makefile - memory/mozutils/Makefile + mozglue/Makefile + mozglue/build/Makefile " if [ "$MOZ_MEMORY" ]; then add_makefiles " diff --git a/b2g/installer/package-manifest.in b/b2g/installer/package-manifest.in index e132c60fa2d..141b6478ec6 100644 --- a/b2g/installer/package-manifest.in +++ b/b2g/installer/package-manifest.in @@ -82,7 +82,7 @@ @BINPATH@/AndroidManifest.xml @BINPATH@/resources.arsc @BINPATH@/classes.dex -@BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ @BINPATH@/res/drawable @BINPATH@/res/drawable-hdpi @BINPATH@/res/layout diff --git a/b2g/installer/removed-files.in b/b2g/installer/removed-files.in index 71dfd5bac5a..3219136f565 100644 --- a/b2g/installer/removed-files.in +++ b/b2g/installer/removed-files.in @@ -1 +1,2 @@ README.txt +@DLL_PREFIX@mozutils@DLL_SUFFIX@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index cef190fed00..6af32084f5a 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -44,7 +44,7 @@ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@ -@BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ #ifdef XP_MACOSX @BINPATH@/XUL #else diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in index c1f5fc18bf0..60b99e334f1 100644 --- a/browser/installer/removed-files.in +++ b/browser/installer/removed-files.in @@ -10,6 +10,7 @@ @DLL_PREFIX@xpistub@DLL_SUFFIX@ @DLL_PREFIX@zlib@DLL_SUFFIX@ @DLL_PREFIX@jemalloc@DLL_SUFFIX@ +@DLL_PREFIX@mozutils@DLL_SUFFIX@ #ifdef MOZ_STATIC_JS @DLL_PREFIX@mozjs@DLL_SUFFIX@ #endif diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in index 132bc5bfa75..ad7dea45730 100644 --- a/build/win32/Makefile.in +++ b/build/win32/Makefile.in @@ -62,7 +62,7 @@ CPPSRCS = crashinject.cpp endif # ENABLE_TESTS -MOZ_UTILS_LDFLAGS = +MOZ_GLUE_LDFLAGS = include $(topsrcdir)/config/rules.mk diff --git a/build/win32/crashinjectdll/Makefile.in b/build/win32/crashinjectdll/Makefile.in index a7cd0ab962b..cded1bd88a6 100644 --- a/build/win32/crashinjectdll/Makefile.in +++ b/build/win32/crashinjectdll/Makefile.in @@ -50,6 +50,6 @@ USE_STATIC_LIBS = 1 CPPSRCS = crashinjectdll.cpp -MOZ_UTILS_LDFLAGS = +MOZ_GLUE_LDFLAGS = include $(topsrcdir)/config/rules.mk diff --git a/build/win32/vmwarerecordinghelper/Makefile.in b/build/win32/vmwarerecordinghelper/Makefile.in index 7c0e459dd70..ed985b5dbd7 100644 --- a/build/win32/vmwarerecordinghelper/Makefile.in +++ b/build/win32/vmwarerecordinghelper/Makefile.in @@ -51,6 +51,6 @@ USE_STATIC_LIBS = 1 CPPSRCS = $(LIBRARY_NAME).cpp -MOZ_UTILS_LDFLAGS = +MOZ_GLUE_LDFLAGS = include $(topsrcdir)/config/rules.mk diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index 84f8590f7f7..31eff58fa1e 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -631,8 +631,8 @@ MOZ_TOOLS_DIR = @MOZ_TOOLS_DIR@ MOZ_QUANTIFY = @MOZ_QUANTIFY@ MSMANIFEST_TOOL = @MSMANIFEST_TOOL@ WIN32_REDIST_DIR = @WIN32_REDIST_DIR@ -MOZ_UTILS_LDFLAGS = @MOZ_UTILS_LDFLAGS@ -MOZ_UTILS_PROGRAM_LDFLAGS = @MOZ_UTILS_PROGRAM_LDFLAGS@ +MOZ_GLUE_LDFLAGS = @MOZ_GLUE_LDFLAGS@ +MOZ_GLUE_PROGRAM_LDFLAGS = @MOZ_GLUE_PROGRAM_LDFLAGS@ WIN32_CRT_LIBS = @WIN32_CRT_LIBS@ # This is used to pass jemalloc flags to NSS diff --git a/config/config.mk b/config/config.mk index eb99f1e6b68..3d86dddc50f 100644 --- a/config/config.mk +++ b/config/config.mk @@ -243,13 +243,13 @@ endif # MOZ_DEBUG # the Makefile wants static CRT linking. ifeq ($(MOZ_MEMORY)_$(USE_STATIC_LIBS),1_1) # Disable default CRT libs and add the right lib path for the linker -MOZ_UTILS_LDFLAGS= +MOZ_GLUE_LDFLAGS= endif endif # WINNT && !GNU_CC -ifndef MOZ_UTILS_PROGRAM_LDFLAGS -MOZ_UTILS_PROGRAM_LDFLAGS=$(MOZ_UTILS_LDFLAGS) +ifndef MOZ_GLUE_PROGRAM_LDFLAGS +MOZ_GLUE_PROGRAM_LDFLAGS=$(MOZ_GLUE_LDFLAGS) endif # diff --git a/config/rules.mk b/config/rules.mk index 6efc99a15f4..f06a7ba789b 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -792,7 +792,7 @@ endif # Create dependencies on static (and shared EXTRA_DSO_LIBS) libraries DO_EXPAND_LIBS = $(foreach f,$(1),$(if $(filter %.$(LIB_SUFFIX),$(f)),$(if $(wildcard $(f).$(LIBS_DESC_SUFFIX)),$(f).$(LIBS_DESC_SUFFIX),$(if $(wildcard $(f)),$(f))))) -LIBS_DEPS = $(call DO_EXPAND_LIBS,$(filter %.$(LIB_SUFFIX),$(LIBS) $(if $(PROGRAM)$(SIMPLE_PROGRAMS),$(MOZ_UTILS_PROGRAM_LDFLAGS)))) +LIBS_DEPS = $(call DO_EXPAND_LIBS,$(filter %.$(LIB_SUFFIX),$(LIBS) $(if $(PROGRAM)$(SIMPLE_PROGRAMS),$(MOZ_GLUE_PROGRAM_LDFLAGS)))) SHARED_LIBRARY_LIBS_DEPS = $(call DO_EXPAND_LIBS,$(SHARED_LIBRARY_LIBS)) HOST_LIBS_DEPS = $(filter %.$(LIB_SUFFIX),$(HOST_LIBS)) DSO_LDOPTS_DEPS = $(call DO_EXPAND_LIBS,$(EXTRA_DSO_LIBS) $(filter %.$(LIB_SUFFIX), $(EXTRA_DSO_LDOPTS))) @@ -893,7 +893,7 @@ alltags: $(PROGRAM): $(PROGOBJS) $(LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS) @$(RM) $@.manifest ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) - $(EXPAND_LD) -NOLOGO -OUT:$@ -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) + $(EXPAND_LD) -NOLOGO -OUT:$@ -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) ifdef MSMANIFEST_TOOL @if test -f $@.manifest; then \ if test -f "$(srcdir)/$@.manifest"; then \ @@ -915,10 +915,10 @@ ifdef MOZ_PROFILE_GENERATE endif else # !WINNT || GNU_CC ifeq ($(CPP_PROG_LINK),1) - $(EXPAND_CCC) -o $@ $(CXXFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) + $(EXPAND_CCC) -o $@ $(CXXFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) @$(call CHECK_STDCXX,$@) else # ! CPP_PROG_LINK - $(EXPAND_CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) + $(EXPAND_CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) endif # CPP_PROG_LINK endif # WINNT && !GNU_CC @@ -964,7 +964,7 @@ endif # $(SIMPLE_PROGRAMS): %$(BIN_SUFFIX): %.$(OBJ_SUFFIX) $(LIBS_DEPS) $(EXTRA_DEPS) $(GLOBAL_DEPS) ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) - $(EXPAND_LD) -nologo -out:$@ -pdb:$(LINK_PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) + $(EXPAND_LD) -nologo -out:$@ -pdb:$(LINK_PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) ifdef MSMANIFEST_TOOL @if test -f $@.manifest; then \ mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \ @@ -973,10 +973,10 @@ ifdef MSMANIFEST_TOOL endif # MSVC with manifest tool else ifeq ($(CPP_PROG_LINK),1) - $(EXPAND_CCC) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) + $(EXPAND_CCC) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) @$(call CHECK_STDCXX,$@) else - $(EXPAND_CC) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) + $(EXPAND_CC) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) endif # CPP_PROG_LINK endif # WINNT && !GNU_CC @@ -1089,10 +1089,10 @@ ifdef DTRACE_LIB_DEPENDENT ifndef XP_MACOSX dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS)) endif - $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(MOZ_UTILS_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) + $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(MOZ_GLUE_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) @$(RM) $(DTRACE_PROBE_OBJ) else # ! DTRACE_LIB_DEPENDENT - $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(MOZ_UTILS_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) + $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(MOZ_GLUE_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) endif # DTRACE_LIB_DEPENDENT @$(call CHECK_STDCXX,$@) diff --git a/configure.in b/configure.in index 0a18e0aed96..e0172fb807a 100644 --- a/configure.in +++ b/configure.in @@ -7144,17 +7144,17 @@ if test "$MOZ_DMD"; then fi if test "${OS_TARGET}" = "Android"; then - dnl On Android, we use WRAP_LDFLAGS to link everything to mozutils + dnl On Android, we use WRAP_LDFLAGS to link everything to mozglue : elif test "${OS_TARGET}" = "WINNT" -o "${OS_TARGET}" = "Darwin" -o "${OS_TARGET}" = "OS2"; then - dnl On Windows, OSX and OS2, we want to link all our binaries against mozutils - MOZ_UTILS_LDFLAGS='$(call EXPAND_LIBNAME_PATH,mozutils,$(LIBXUL_DIST)/lib)' + dnl On Windows, OSX and OS2, we want to link all our binaries against mozglue + MOZ_GLUE_LDFLAGS='$(call EXPAND_LIBNAME_PATH,mozglue,$(LIBXUL_DIST)/lib)' else - dnl On other Unix systems, we only want to link executables against mozutils - MOZ_UTILS_PROGRAM_LDFLAGS='$(MKSHLIB_FORCE_ALL) $(call EXPAND_LIBNAME_PATH,mozutils,$(LIBXUL_DIST)/lib) $(MKSHLIB_UNFORCE_ALL)' + dnl On other Unix systems, we only want to link executables against mozglue + MOZ_GLUE_PROGRAM_LDFLAGS='$(MKSHLIB_FORCE_ALL) $(call EXPAND_LIBNAME_PATH,mozglue,$(LIBXUL_DIST)/lib) $(MKSHLIB_UNFORCE_ALL)' if test -n "$GNU_CC"; then - dnl And we need mozutils symbols to be exported. - MOZ_UTILS_PROGRAM_LDFLAGS="$MOZ_UTILS_PROGRAM_LDFLAGS -rdynamic" + dnl And we need mozglue symbols to be exported. + MOZ_GLUE_PROGRAM_LDFLAGS="$MOZ_GLUE_PROGRAM_LDFLAGS -rdynamic" fi fi @@ -7207,7 +7207,7 @@ else AC_DEFINE(MOZ_MEMORY_LINUX) AC_DEFINE(MOZ_MEMORY_ANDROID) _WRAP_MALLOC=1 - MOZ_UTILS_LDFLAGS= + MOZ_GLUE_LDFLAGS= ;; *-*linux*) AC_DEFINE(MOZ_MEMORY_LINUX) @@ -7229,11 +7229,11 @@ else WIN32_CRTDLL_FULLPATH=`lib -nologo -list $WIN32_CRT_LIBS | grep crtdll\\.obj` lib -NOLOGO -OUT:crtdll.obj $WIN32_CRT_LIBS -EXTRACT:$WIN32_CRTDLL_FULLPATH if grep -q '__imp__\{0,1\}free' crtdll.obj; then - MOZ_UTILS_LDFLAGS='-LIBPATH:$(DIST)/lib -NODEFAULTLIB:msvcrt -NODEFAULTLIB:msvcrtd -NODEFAULTLIB:msvcprt -NODEFAULTLIB:msvcprtd -DEFAULTLIB:mozcrt' + MOZ_GLUE_LDFLAGS='-LIBPATH:$(DIST)/lib -NODEFAULTLIB:msvcrt -NODEFAULTLIB:msvcrtd -NODEFAULTLIB:msvcprt -NODEFAULTLIB:msvcprtd -DEFAULTLIB:mozcrt' dnl Also pass this to NSPR/NSS - DLLFLAGS="$DLLFLAGS $MOZ_UTILS_LDFLAGS" + DLLFLAGS="$DLLFLAGS $MOZ_GLUE_LDFLAGS" else - DLLFLAGS="$DLLFLAGS -LIBPATH:\$(DIST)/lib -DEFAULTLIB:mozutils" + DLLFLAGS="$DLLFLAGS -LIBPATH:\$(DIST)/lib -DEFAULTLIB:mozglue" fi rm crtdll.obj @@ -7252,8 +7252,8 @@ else AC_DEFINE(HAVE_JEMALLOC_MEMALIGN) fi # MOZ_MEMORY AC_SUBST(MOZ_MEMORY) -AC_SUBST(MOZ_UTILS_LDFLAGS) -AC_SUBST(MOZ_UTILS_PROGRAM_LDFLAGS) +AC_SUBST(MOZ_GLUE_LDFLAGS) +AC_SUBST(MOZ_GLUE_PROGRAM_LDFLAGS) AC_SUBST(WIN32_CRT_LIBS) dnl Need to set this for make because NSS doesn't have configure AC_SUBST(DLLFLAGS) @@ -7261,7 +7261,7 @@ AC_SUBST(DLLFLAGS) dnl We need to wrap dlopen and related functions on Android because we use dnl our own linker. if test "$OS_TARGET" = Android; then - WRAP_LDFLAGS="${WRAP_LDFLAGS} -L$_objdir/dist/lib -lmozutils" + WRAP_LDFLAGS="${WRAP_LDFLAGS} -L$_objdir/dist/lib -lmozglue" if test "$MOZ_WIDGET_TOOLKIT" = android; then WRAP_LDFLAGS="${WRAP_LDFLAGS} -Wl,--wrap=dlopen,--wrap=dlclose,--wrap=dlerror,--wrap=dlsym,--wrap=dladdr,--wrap=getaddrinfo,--wrap=freeaddrinfo,--wrap=gai_strerror" fi @@ -9093,11 +9093,11 @@ ac_configure_args="$ac_configure_args --prefix=$dist" ac_configure_args="$ac_configure_args --with-sync-build-files=$_topsrcdir" if test "$MOZ_MEMORY"; then ac_configure_args="$ac_configure_args --enable-jemalloc" - if test -n "$MOZ_UTILS_LDFLAGS"; then - export MOZ_UTILS_LDFLAGS + if test -n "$MOZ_GLUE_LDFLAGS"; then + export MOZ_GLUE_LDFLAGS fi - if test -n "$MOZ_UTILS_PROGRAM_LDFLAGS"; then - export MOZ_UTILS_PROGRAM_LDFLAGS + if test -n "$MOZ_GLUE_PROGRAM_LDFLAGS"; then + export MOZ_GLUE_PROGRAM_LDFLAGS fi fi export MOZ_APP_NAME diff --git a/db/sqlite3/src/Makefile.in b/db/sqlite3/src/Makefile.in index a0304fa5efe..87320dea8fa 100644 --- a/db/sqlite3/src/Makefile.in +++ b/db/sqlite3/src/Makefile.in @@ -78,9 +78,9 @@ endif endif ifeq (Darwin,$(OS_TARGET)) -# On OSX, with jemalloc enabled, having sqlite linked against mozutils +# On OSX, with jemalloc enabled, having sqlite linked against mozglue # causes crashes in NSS standalone tools. -MOZ_UTILS_LDFLAGS = +MOZ_GLUE_LDFLAGS = endif # XXX Force -O2 optimisation on Mac because using the default -O3 causes diff --git a/embedding/android/GeckoAppShell.java b/embedding/android/GeckoAppShell.java index c4ad4664227..e48b0f725d0 100644 --- a/embedding/android/GeckoAppShell.java +++ b/embedding/android/GeckoAppShell.java @@ -278,7 +278,7 @@ public class GeckoAppShell // The package data lib directory isn't placed in ld.so's // search path, so we have to manually load libraries that // libxul will depend on. Not ideal. - System.loadLibrary("mozutils"); + System.loadLibrary("mozglue"); GeckoApp geckoApp = GeckoApp.mAppContext; String homeDir; if (Build.VERSION.SDK_INT < 8 || diff --git a/ipc/app/MozillaRuntimeMainAndroid.cpp b/ipc/app/MozillaRuntimeMainAndroid.cpp index 8dfcbe264c8..e5f7ad03901 100644 --- a/ipc/app/MozillaRuntimeMainAndroid.cpp +++ b/ipc/app/MozillaRuntimeMainAndroid.cpp @@ -49,7 +49,7 @@ main(int argc, char* argv[]) if (argc < 2) return 1; - void *mozloader_handle = dlopen("libmozutils.so", RTLD_LAZY); + void *mozloader_handle = dlopen("libmozglue.so", RTLD_LAZY); if (!mozloader_handle) { __android_log_print(ANDROID_LOG_ERROR, "GeckoChildLoad", "Couldn't load mozloader because %s", dlerror()); diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in index 80a8bc33de3..3eac260adb4 100644 --- a/js/src/config/autoconf.mk.in +++ b/js/src/config/autoconf.mk.in @@ -313,8 +313,8 @@ MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@ MOZ_TOOLS_DIR = @MOZ_TOOLS_DIR@ MOZ_QUANTIFY = @MOZ_QUANTIFY@ MSMANIFEST_TOOL = @MSMANIFEST_TOOL@ -MOZ_UTILS_LDFLAGS = @MOZ_UTILS_LDFLAGS@ -MOZ_UTILS_PROGRAM_LDFLAGS = @MOZ_UTILS_PROGRAM_LDFLAGS@ +MOZ_GLUE_LDFLAGS = @MOZ_GLUE_LDFLAGS@ +MOZ_GLUE_PROGRAM_LDFLAGS = @MOZ_GLUE_PROGRAM_LDFLAGS@ # Codesighs tools option, enables win32 mapfiles. MOZ_MAPINFO = @MOZ_MAPINFO@ diff --git a/js/src/config/config.mk b/js/src/config/config.mk index eb99f1e6b68..3d86dddc50f 100644 --- a/js/src/config/config.mk +++ b/js/src/config/config.mk @@ -243,13 +243,13 @@ endif # MOZ_DEBUG # the Makefile wants static CRT linking. ifeq ($(MOZ_MEMORY)_$(USE_STATIC_LIBS),1_1) # Disable default CRT libs and add the right lib path for the linker -MOZ_UTILS_LDFLAGS= +MOZ_GLUE_LDFLAGS= endif endif # WINNT && !GNU_CC -ifndef MOZ_UTILS_PROGRAM_LDFLAGS -MOZ_UTILS_PROGRAM_LDFLAGS=$(MOZ_UTILS_LDFLAGS) +ifndef MOZ_GLUE_PROGRAM_LDFLAGS +MOZ_GLUE_PROGRAM_LDFLAGS=$(MOZ_GLUE_LDFLAGS) endif # diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk index 6efc99a15f4..f06a7ba789b 100644 --- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -792,7 +792,7 @@ endif # Create dependencies on static (and shared EXTRA_DSO_LIBS) libraries DO_EXPAND_LIBS = $(foreach f,$(1),$(if $(filter %.$(LIB_SUFFIX),$(f)),$(if $(wildcard $(f).$(LIBS_DESC_SUFFIX)),$(f).$(LIBS_DESC_SUFFIX),$(if $(wildcard $(f)),$(f))))) -LIBS_DEPS = $(call DO_EXPAND_LIBS,$(filter %.$(LIB_SUFFIX),$(LIBS) $(if $(PROGRAM)$(SIMPLE_PROGRAMS),$(MOZ_UTILS_PROGRAM_LDFLAGS)))) +LIBS_DEPS = $(call DO_EXPAND_LIBS,$(filter %.$(LIB_SUFFIX),$(LIBS) $(if $(PROGRAM)$(SIMPLE_PROGRAMS),$(MOZ_GLUE_PROGRAM_LDFLAGS)))) SHARED_LIBRARY_LIBS_DEPS = $(call DO_EXPAND_LIBS,$(SHARED_LIBRARY_LIBS)) HOST_LIBS_DEPS = $(filter %.$(LIB_SUFFIX),$(HOST_LIBS)) DSO_LDOPTS_DEPS = $(call DO_EXPAND_LIBS,$(EXTRA_DSO_LIBS) $(filter %.$(LIB_SUFFIX), $(EXTRA_DSO_LDOPTS))) @@ -893,7 +893,7 @@ alltags: $(PROGRAM): $(PROGOBJS) $(LIBS_DEPS) $(EXTRA_DEPS) $(EXE_DEF_FILE) $(RESFILE) $(GLOBAL_DEPS) @$(RM) $@.manifest ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) - $(EXPAND_LD) -NOLOGO -OUT:$@ -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) + $(EXPAND_LD) -NOLOGO -OUT:$@ -PDB:$(LINK_PDBFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(PROGOBJS) $(RESFILE) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) ifdef MSMANIFEST_TOOL @if test -f $@.manifest; then \ if test -f "$(srcdir)/$@.manifest"; then \ @@ -915,10 +915,10 @@ ifdef MOZ_PROFILE_GENERATE endif else # !WINNT || GNU_CC ifeq ($(CPP_PROG_LINK),1) - $(EXPAND_CCC) -o $@ $(CXXFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) + $(EXPAND_CCC) -o $@ $(CXXFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) @$(call CHECK_STDCXX,$@) else # ! CPP_PROG_LINK - $(EXPAND_CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) + $(EXPAND_CC) -o $@ $(CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) endif # CPP_PROG_LINK endif # WINNT && !GNU_CC @@ -964,7 +964,7 @@ endif # $(SIMPLE_PROGRAMS): %$(BIN_SUFFIX): %.$(OBJ_SUFFIX) $(LIBS_DEPS) $(EXTRA_DEPS) $(GLOBAL_DEPS) ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH)) - $(EXPAND_LD) -nologo -out:$@ -pdb:$(LINK_PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) + $(EXPAND_LD) -nologo -out:$@ -pdb:$(LINK_PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(LIBS) $(EXTRA_LIBS) $(OS_LIBS) ifdef MSMANIFEST_TOOL @if test -f $@.manifest; then \ mt.exe -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \ @@ -973,10 +973,10 @@ ifdef MSMANIFEST_TOOL endif # MSVC with manifest tool else ifeq ($(CPP_PROG_LINK),1) - $(EXPAND_CCC) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) + $(EXPAND_CCC) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) @$(call CHECK_STDCXX,$@) else - $(EXPAND_CC) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_UTILS_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) + $(EXPAND_CC) $(CFLAGS) $(OUTOPTION)$@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) endif # CPP_PROG_LINK endif # WINNT && !GNU_CC @@ -1089,10 +1089,10 @@ ifdef DTRACE_LIB_DEPENDENT ifndef XP_MACOSX dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS)) endif - $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(MOZ_UTILS_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) + $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(MOZ_GLUE_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) @$(RM) $(DTRACE_PROBE_OBJ) else # ! DTRACE_LIB_DEPENDENT - $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(MOZ_UTILS_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) + $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(MOZ_GLUE_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) endif # DTRACE_LIB_DEPENDENT @$(call CHECK_STDCXX,$@) diff --git a/js/src/configure.in b/js/src/configure.in index 12467ef87c5..8e2f944de69 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -4293,7 +4293,7 @@ if test "$MOZ_MEMORY"; then ;; *-mingw*) AC_DEFINE(MOZ_MEMORY_WINDOWS) - # the interesting bits will get passed down in MOZ_UTILS_LDFLAGS + # the interesting bits will get passed down in MOZ_GLUE_LDFLAGS ;; *) AC_MSG_ERROR([--enable-jemalloc not supported on ${target}]) @@ -4308,8 +4308,8 @@ if test "$MOZ_MEMORY"; then fi fi AC_SUBST(MOZ_MEMORY) -AC_SUBST(MOZ_UTILS_LDFLAGS) -AC_SUBST(MOZ_UTILS_PROGRAM_LDFLAGS) +AC_SUBST(MOZ_GLUE_LDFLAGS) +AC_SUBST(MOZ_GLUE_PROGRAM_LDFLAGS) dnl ======================================================== dnl = Use malloc wrapper lib diff --git a/mobile/android/base/GeckoApp.java b/mobile/android/base/GeckoApp.java index 3e2db6ee1d0..5853340604b 100644 --- a/mobile/android/base/GeckoApp.java +++ b/mobile/android/base/GeckoApp.java @@ -1412,7 +1412,7 @@ abstract public class GeckoApp enableStrictMode(); } - System.loadLibrary("mozutils"); + System.loadLibrary("mozglue"); mMainHandler = new Handler(); Log.w(LOGTAG, "zerdatime " + new Date().getTime() + " - onCreate"); if (savedInstanceState != null) { diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in index badb6d7a0fe..f4eed8c4233 100644 --- a/mobile/android/installer/package-manifest.in +++ b/mobile/android/installer/package-manifest.in @@ -47,7 +47,7 @@ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@ -@BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ #ifdef XP_MACOSX @BINPATH@/XUL #else @@ -84,7 +84,6 @@ @BINPATH@/resources.arsc @BINPATH@/package-name.txt @BINPATH@/classes.dex -@BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@ @BINPATH@/res/drawable @BINPATH@/res/drawable-hdpi @BINPATH@/res/layout diff --git a/mobile/android/installer/removed-files.in b/mobile/android/installer/removed-files.in index a6a3226c069..af21a79cba1 100644 --- a/mobile/android/installer/removed-files.in +++ b/mobile/android/installer/removed-files.in @@ -6,25 +6,26 @@ extensions/feedback@mobile.mozilla.org.xpi #endif #ifdef XP_WIN #if _MSC_VER != 1400 - @BINPATH@/Microsoft.VC80.CRT.manifest - @BINPATH@/msvcm80.dll - @BINPATH@/msvcp80.dll - @BINPATH@/msvcr80.dll + Microsoft.VC80.CRT.manifest + msvcm80.dll + msvcp80.dll + msvcr80.dll #endif #if _MSC_VER != 1500 - @BINPATH@/Microsoft.VC90.CRT.manifest - @BINPATH@/msvcm90.dll - @BINPATH@/msvcp90.dll - @BINPATH@/msvcr90.dll + Microsoft.VC90.CRT.manifest + msvcm90.dll + msvcp90.dll + msvcr90.dll #endif #if _MSC_VER != 1600 - @BINPATH@/msvcp100.dll - @BINPATH@/msvcr100.dll + msvcp100.dll + msvcr100.dll #endif #if _MSC_VER != 1700 - @BINPATH@/msvcp110.dll - @BINPATH@/msvcr110.dll + msvcp110.dll + msvcr110.dll #endif mozcrt19.dll mozcpp19.dll #endif +@DLL_PREFIX@mozutils@DLL_SUFFIX@ diff --git a/mobile/xul/installer/package-manifest.in b/mobile/xul/installer/package-manifest.in index a9702f788a5..3aa110f20f1 100644 --- a/mobile/xul/installer/package-manifest.in +++ b/mobile/xul/installer/package-manifest.in @@ -47,7 +47,7 @@ @BINPATH@/@DLL_PREFIX@xpcom@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@ -@BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@mozglue@DLL_SUFFIX@ #ifdef XP_MACOSX @BINPATH@/XUL #else @@ -85,7 +85,6 @@ @BINPATH@/resources.arsc @BINPATH@/package-name.txt @BINPATH@/classes.dex -@BINPATH@/@DLL_PREFIX@mozutils@DLL_SUFFIX@ @BINPATH@/res/drawable @BINPATH@/res/drawable-hdpi @BINPATH@/res/layout diff --git a/mobile/xul/installer/removed-files.in b/mobile/xul/installer/removed-files.in index a6a3226c069..af21a79cba1 100644 --- a/mobile/xul/installer/removed-files.in +++ b/mobile/xul/installer/removed-files.in @@ -6,25 +6,26 @@ extensions/feedback@mobile.mozilla.org.xpi #endif #ifdef XP_WIN #if _MSC_VER != 1400 - @BINPATH@/Microsoft.VC80.CRT.manifest - @BINPATH@/msvcm80.dll - @BINPATH@/msvcp80.dll - @BINPATH@/msvcr80.dll + Microsoft.VC80.CRT.manifest + msvcm80.dll + msvcp80.dll + msvcr80.dll #endif #if _MSC_VER != 1500 - @BINPATH@/Microsoft.VC90.CRT.manifest - @BINPATH@/msvcm90.dll - @BINPATH@/msvcp90.dll - @BINPATH@/msvcr90.dll + Microsoft.VC90.CRT.manifest + msvcm90.dll + msvcp90.dll + msvcr90.dll #endif #if _MSC_VER != 1600 - @BINPATH@/msvcp100.dll - @BINPATH@/msvcr100.dll + msvcp100.dll + msvcr100.dll #endif #if _MSC_VER != 1700 - @BINPATH@/msvcp110.dll - @BINPATH@/msvcr110.dll + msvcp110.dll + msvcr110.dll #endif mozcrt19.dll mozcpp19.dll #endif +@DLL_PREFIX@mozutils@DLL_SUFFIX@ diff --git a/memory/Makefile.in b/mozglue/Makefile.in similarity index 86% rename from memory/Makefile.in rename to mozglue/Makefile.in index c61e5cf7834..ed37bcc4e71 100644 --- a/memory/Makefile.in +++ b/mozglue/Makefile.in @@ -11,14 +11,15 @@ # for the specific language governing rights and limitations under the # License. # -# The Original Code is the Mozilla platform. +# The Original Code is mozilla.org code. # # The Initial Developer of the Original Code is -# the Mozilla Foundation . -# Portions created by the Initial Developer are Copyright (C) 2009 +# Mozilla Foundation. +# Portions created by the Initial Developer are Copyright (C) 2011 # the Initial Developer. All Rights Reserved. # # Contributor(s): +# Mike Hommey # # 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 @@ -34,20 +35,13 @@ # # ***** END LICENSE BLOCK ***** -DEPTH = .. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ +DEPTH = .. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = - -ifdef MOZ_MEMORY -DIRS += jemalloc -endif - -DIRS += mozutils -DIRS += mozalloc +DIRS = build include $(topsrcdir)/config/rules.mk diff --git a/memory/mozutils/Makefile.in b/mozglue/build/Makefile.in similarity index 94% rename from memory/mozutils/Makefile.in rename to mozglue/build/Makefile.in index b090c6a1917..9d15b4e7321 100644 --- a/memory/mozutils/Makefile.in +++ b/mozglue/build/Makefile.in @@ -43,38 +43,38 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MODULE = mozutils -LIBRARY_NAME = mozutils +MODULE = mozglue +LIBRARY_NAME = mozglue DIST_INSTALL = 1 ifdef MOZ_MEMORY -SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,../jemalloc) +SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc) else # Temporary, until bug 662814 lands VISIBILITY_FLAGS = CPPSRCS = dummy.cpp endif -# Build mozutils as a shared lib on Windows, OSX and Android. +# Build mozglue as a shared lib on Windows, OSX and Android. ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET))) FORCE_SHARED_LIB = 1 else FORCE_STATIC_LIB = 1 endif -MOZ_UTILS_LDFLAGS = # Don't link against ourselves +MOZ_GLUE_LDFLAGS = # Don't link against ourselves ifeq (WINNT,$(OS_TARGET)) -DEFFILE = mozutils.def +DEFFILE = mozglue.def -mozutils.def: mozutils.def.in +mozglue.def: mozglue.def.in $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(ACDEFINES) $< > $@ -GARBAGE += mozutils.def +GARBAGE += mozglue.def LDFLAGS += -ENTRY:DllMain -ifneq (,$(filter -DEFAULTLIB:mozcrt,$(MOZ_UTILS_LDFLAGS))) +ifneq (,$(filter -DEFAULTLIB:mozcrt,$(MOZ_GLUE_LDFLAGS))) # Don't install the import library if we use mozcrt NO_INSTALL_IMPORT_LIBRARY = 1 endif diff --git a/memory/mozutils/dummy.cpp b/mozglue/build/dummy.cpp similarity index 100% rename from memory/mozutils/dummy.cpp rename to mozglue/build/dummy.cpp diff --git a/memory/mozutils/fixcrt.py b/mozglue/build/fixcrt.py similarity index 100% rename from memory/mozutils/fixcrt.py rename to mozglue/build/fixcrt.py diff --git a/memory/mozutils/mozutils.def.in b/mozglue/build/mozutils.def.in similarity index 99% rename from memory/mozutils/mozutils.def.in rename to mozglue/build/mozutils.def.in index 63cd6dc952a..97afb411828 100644 --- a/memory/mozutils/mozutils.def.in +++ b/mozglue/build/mozutils.def.in @@ -33,7 +33,7 @@ ; ; ***** END LICENSE BLOCK ***** -LIBRARY mozutils.dll +LIBRARY mozglue.dll EXPORTS #ifdef MOZ_MEMORY diff --git a/other-licenses/android/linker.c b/other-licenses/android/linker.c index 7dd2a3d188e..6e3272a829b 100644 --- a/other-licenses/android/linker.c +++ b/other-licenses/android/linker.c @@ -191,7 +191,7 @@ static void insert_soinfo_into_debug_map(soinfo * info) map->l_name = (char*) info->name; map->l_ld = (uintptr_t)info->dynamic; - /* Stick the new library before libmozutils.so + /* Stick the new library before libmozglue.so */ if (!_r_debug) return; @@ -2449,7 +2449,7 @@ void simple_linker_init(void) * load before that */ struct link_map *map = debug->r_map; while (map) { - if (strcmp(map->l_name, "libmozutils.so")) + if (strcmp(map->l_name, "libmozglue.so")) r_debug_insert = map; map = map->l_next; } diff --git a/toolkit/crashreporter/client/Makefile.in b/toolkit/crashreporter/client/Makefile.in index c5c9b6adad4..ec968ea597f 100644 --- a/toolkit/crashreporter/client/Makefile.in +++ b/toolkit/crashreporter/client/Makefile.in @@ -55,9 +55,9 @@ ifneq ($(OS_TARGET),Android) PROGRAM = crashreporter$(BIN_SUFFIX) DIST_PROGRAM = crashreporter$(BIN_SUFFIX) -# Don't link the updater against libmozutils. -MOZ_UTILS_LDFLAGS = -MOZ_UTILS_PROGRAM_LDFLAGS = +# Don't link the updater against libmozglue. +MOZ_GLUE_LDFLAGS = +MOZ_GLUE_PROGRAM_LDFLAGS = endif LOCAL_INCLUDES = -I$(srcdir)/../google-breakpad/src diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index a1381c299d4..c85d212576f 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -86,7 +86,7 @@ SDK = $(SDK_PATH)$(PKG_BASENAME).sdk$(SDK_SUFFIX) ifndef LIBXUL_SDK JSSHELL_BINS = \ $(DIST)/bin/js$(BIN_SUFFIX) \ - $(DIST)/bin/mozutils$(DLL_SUFFIX) \ + $(DIST)/bin/mozglue$(DLL_SUFFIX) \ $(NULL) ifndef MOZ_NATIVE_NSPR JSSHELL_BINS += $(DIST)/bin/$(LIB_PREFIX)nspr4$(DLL_SUFFIX) @@ -335,7 +335,7 @@ INNER_MAKE_PACKAGE = \ cp $(GECKO_APP_AP_PATH)/gecko.ap_ $(_ABS_DIST) && \ ( cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) && \ mkdir -p lib/$(ABI_DIR) && \ - mv libmozutils.so $(MOZ_CHILD_PROCESS_NAME) lib/$(ABI_DIR) && \ + mv libmozglue.so $(MOZ_CHILD_PROCESS_NAME) lib/$(ABI_DIR) && \ rm -f lib.id && \ for SOMELIB in *.so ; \ do \ @@ -354,7 +354,7 @@ INNER_UNMAKE_PACKAGE = \ mkdir $(MOZ_PKG_DIR) && \ cd $(MOZ_PKG_DIR) && \ $(UNZIP) $(UNPACKAGE) && \ - mv lib/$(ABI_DIR)/libmozutils.so . && \ + mv lib/$(ABI_DIR)/libmozglue.so . && \ mv lib/$(ABI_DIR)/*plugin-container* $(MOZ_CHILD_PROCESS_NAME) && \ rm -rf lib/$(ABI_DIR) endif diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in index 92790719f8f..d2b3b44b50c 100644 --- a/toolkit/mozapps/update/updater/Makefile.in +++ b/toolkit/mozapps/update/updater/Makefile.in @@ -51,9 +51,9 @@ CPPSRCS = \ PROGRAM = updater$(BIN_SUFFIX) -# Don't link the updater against libmozutils. See bug 687139 -MOZ_UTILS_LDFLAGS = -MOZ_UTILS_PROGRAM_LDFLAGS = +# Don't link the updater against libmozglue. See bug 687139 +MOZ_GLUE_LDFLAGS = +MOZ_GLUE_PROGRAM_LDFLAGS = LOCAL_INCLUDES += -I$(srcdir)/../../readstrings