Bug 1036864 - Remove EXPORT_LIBRARY. r=mshal

2024-09-13 09:24:08 -07:00 · 2014-07-11 19:06:55 +09:00 · 2014-07-11 19:06:55 +09:00 · 07267c6f7f
commit 07267c6f7f
parent dbf9b286cd
20 changed files with 3 additions and 59 deletions
--- a/config/config.mk
+++ b/config/config.mk
@ -74,6 +74,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \

 _DEPRECATED_VARIABLES := \
  ANDROID_RESFILES \
+  EXPORT_LIBRARY \
  LIBXUL_LIBRARY \
  MOCHITEST_A11Y_FILES \
  MOCHITEST_BROWSER_FILES \
@ -345,7 +346,6 @@ endif

 ifdef XPI_NAME
 ifdef IS_COMPONENT
-EXPORT_LIBRARY=
 FORCE_STATIC_LIB=
 FORCE_SHARED_LIB=1
 endif
--- a/config/makefiles/target_binaries.mk
+++ b/config/makefiles/target_binaries.mk
@ -5,19 +5,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-ifdef EXPORT_LIBRARY
-ifeq ($(EXPORT_LIBRARY),1)
-ifdef IS_COMPONENT
-EXPORT_LIBRARY = $(DEPTH)/staticlib/components
-else
-EXPORT_LIBRARY = $(DEPTH)/staticlib
-endif
-else
-# If EXPORT_LIBRARY has a value, we'll be installing there. We also need to cleanup there
-GARBAGE += $(foreach lib,$(LIBRARY),$(EXPORT_LIBRARY)/$(lib))
-endif
-endif # EXPORT_LIBRARY
-
 binaries libs:: $(SUBMAKEFILES) $(TARGETS)
 ifndef NO_DIST_INSTALL
 ifdef SHARED_LIBRARY
@ -41,12 +28,6 @@ INSTALL_TARGETS += PROGRAMS
 endif

 ifdef LIBRARY
-ifdef EXPORT_LIBRARY
-LIBRARY_FILES = $(LIBRARY)
-LIBRARY_DEST ?= $(EXPORT_LIBRARY)
-LIBRARY_TARGET = binaries libs
-INSTALL_TARGETS += LIBRARY
-endif
 ifdef DIST_INSTALL
 ifdef IS_COMPONENT
 $(error Shipping static component libs makes no sense.)
--- a/config/rules.mk
+++ b/config/rules.mk
@ -833,7 +833,7 @@ $(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
 $(filter-out %.$(LIB_SUFFIX),$(LIBRARY)): $(filter %.$(LIB_SUFFIX),$(LIBRARY)) $(OBJS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
 # When we only build a library descriptor, blow out any existing library
 	$(REPORT_BUILD)
-	$(if $(filter %.$(LIB_SUFFIX),$(LIBRARY)),,$(RM) $(REAL_LIBRARY) $(EXPORT_LIBRARY:%=%/$(REAL_LIBRARY)))
+	$(if $(filter %.$(LIB_SUFFIX),$(LIBRARY)),,$(RM) $(REAL_LIBRARY))
 	$(EXPAND_LIBS_GEN) -o $@ $(OBJS) $(SHARED_LIBRARY_LIBS)

 ifeq ($(OS_ARCH),WINNT)
--- a/content/media/gtest/moz.build
+++ b/content/media/gtest/moz.build
@ -18,8 +18,6 @@ if CONFIG['MOZ_WEBM_ENCODER']:
                        'TestWebMWriter.cpp',
 ]

-EXPORT_LIBRARY = True
-
 include('/ipc/chromium/chromium-config.mozbuild')

 LOCAL_INCLUDES += [
--- a/gfx/tests/gtest/moz.build
+++ b/gfx/tests/gtest/moz.build
@ -39,8 +39,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'windows':
        'TestRect.cpp',
    ]

-EXPORT_LIBRARY = True
-
 include('/ipc/chromium/chromium-config.mozbuild')

 LOCAL_INCLUDES += [
--- a/ipc/nfc/moz.build
+++ b/ipc/nfc/moz.build
@ -11,8 +11,6 @@ if CONFIG['MOZ_NFC']:
        'Nfc.cpp',
    ]

-EXPORT_LIBRARY = True
-
 include('/ipc/chromium/chromium-config.mozbuild')

 FINAL_LIBRARY = 'xul'
--- a/layout/media/Makefile.in
+++ b/layout/media/Makefile.in
@ -3,8 +3,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-EXPORT_LIBRARY	= $(DIST)/lib
-
 ifeq (WINNT,$(OS_TARGET))
 EXTRA_DSO_LDOPTS = $(MOZALLOC_LIB) $(NSPR_LIBS)
 OS_LIBS += $(call EXPAND_LIBNAME,usp10 ole32)
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@ -222,7 +222,6 @@ class TreeMetadataEmitter(LoggingMixin):
            'ANDROID_RES_DIRS',
            'CPP_UNIT_TESTS',
            'DISABLE_STL_WRAPPING',
-            'EXPORT_LIBRARY',
            'EXTRA_ASSEMBLER_FLAGS',
            'EXTRA_COMPILE_FLAGS',
            'EXTRA_COMPONENTS',
--- a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
+++ b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
@ -183,10 +183,6 @@ VARIABLES = {
        disabled.
        """, 'binaries'),

-    'EXPORT_LIBRARY': (bool, bool,
-        """Install the library to the static libraries folder.
-        """, None),
-
    'EXTRA_COMPONENTS': (StrictOrderingOnAppendList, list,
        """Additional component files to distribute.

--- a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
+++ b/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
@ -35,7 +35,6 @@ MSVC_ENABLE_PGO = True
 NO_DIST_INSTALL = True

 FORCE_SHARED_LIB = True
-EXPORT_LIBRARY = True
 IS_COMPONENT = True
 NO_VISIBILITY_FLAGS = True

--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
@ -160,7 +160,6 @@ class TestEmitterBasic(unittest.TestCase):
            CSRCS=['fans.c', 'tans.c'],
            CPP_UNIT_TESTS=['foo.cpp'],
            DISABLE_STL_WRAPPING=True,
-            EXPORT_LIBRARY=True,
            EXTRA_COMPONENTS=['fans.js', 'tans.js'],
            EXTRA_PP_COMPONENTS=['fans.pp.js', 'tans.pp.js'],
            EXTRA_JS_MODULES=['bar.jsm', 'foo.jsm'],
--- a/security/manager/ssl/tests/gtest/Makefile.in
+++ b/security/manager/ssl/tests/gtest/Makefile.in
@ -1,11 +0,0 @@
-#! gmake
-# 
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(DEPTH)/config/autoconf.mk
-
-EXPORT_LIBRARY = 1
-
-include $(topsrcdir)/config/rules.mk
--- a/security/sandbox/moz.build
+++ b/security/sandbox/moz.build
@ -10,7 +10,6 @@ if CONFIG['OS_ARCH'] == 'Linux':

 elif CONFIG['OS_ARCH'] == 'WINNT':
    LIBRARY_NAME = 'sandbox_s'
-    EXPORT_LIBRARY = True
    FORCE_STATIC_LIB = True

    DIRS += [
--- a/security/sandbox/win/src/sandboxbroker/moz.build
+++ b/security/sandbox/win/src/sandboxbroker/moz.build
@ -5,7 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 LIBRARY_NAME = 'sandboxbroker'
-EXPORT_LIBRARY = True

 SOURCES += [
    'sandboxBroker.cpp',
--- a/testing/gtest/moz.build
+++ b/testing/gtest/moz.build
@ -68,8 +68,6 @@ if CONFIG['ENABLE_TESTS']:
        'mozilla/SanityTest.cpp',
    ]

-    EXPORT_LIBRARY = True
-
    LOCAL_INCLUDES += [
        'gmock',
        'gmock/include',
--- a/toolkit/components/workerlz4/moz.build
+++ b/toolkit/components/workerlz4/moz.build
@ -17,5 +17,4 @@ SOURCES += [
    'lz4.cpp',
 ]

-EXPORT_LIBRARY = True
 FINAL_LIBRARY = 'xul'
--- a/toolkit/library/libxul.mk
+++ b/toolkit/library/libxul.mk
@ -93,7 +93,7 @@ ifdef MOZ_DMD
 EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,dmd,$(DIST)/lib)
 endif

-EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DIST)/lib)
+EXTRA_DSO_LDOPTS += $(call EXPAND_LIBNAME_PATH,gkmedias,$(DEPTH)/layout/media)

 ifdef MOZ_WEBRTC
 ifeq (WINNT,$(OS_TARGET))
--- a/tools/jprof/stub/moz.build
+++ b/tools/jprof/stub/moz.build
@ -14,8 +14,6 @@ SOURCES += [

 LIBRARY_NAME = 'jprof'

-EXPORT_LIBRARY = True
-
 FORCE_SHARED_LIB = True

 DEFINES['_IMPL_JPROF_API'] = True
--- a/tools/profiler/tests/gtest/moz.build
+++ b/tools/profiler/tests/gtest/moz.build
@ -11,8 +11,6 @@ if CONFIG['OS_TARGET'] in ('Android', 'Linux'):
        'LulTest.cpp',
    ]

-EXPORT_LIBRARY = True
-
 LOCAL_INCLUDES += [
    '/tools/profiler',
 ]
--- a/xpcom/glue/tests/gtest/moz.build
+++ b/xpcom/glue/tests/gtest/moz.build
@ -17,6 +17,4 @@ FAIL_ON_WARNINGS = True

 LIBRARY_NAME = 'xpcom_glue_gtest'

-EXPORT_LIBRARY = True
-
 FINAL_LIBRARY = 'xul-gtest'