Bug 831790 - Use the buildconfig python module for expandlibs_config. r=ted

--HG--
rename : config/expandlibs_config.py.in => config/expandlibs_config.py
rename : js/src/config/expandlibs_config.py.in => js/src/config/expandlibs_config.py

allmakefiles.sh

@@ -35,7 +35,6 @@ config/Makefile
 config/autoconf.mk
 config/nspr/Makefile
 config/doxygen.cfg
-config/expandlibs_config.py
 mfbt/Makefile
 probes/Makefile
 python/Makefile

config/config.mk

@@ -758,8 +758,8 @@ CREATE_PRECOMPLETE_CMD = $(PYTHON) $(call core_abspath,$(topsrcdir)/config/creat
 # MDDEPDIR is the subdirectory where dependency files are stored
 MDDEPDIR := .deps
 
-EXPAND_LIBS_EXEC = $(PYTHON) $(topsrcdir)/config/pythonpath.py -I$(DEPTH)/config $(topsrcdir)/config/expandlibs_exec.py $(if $@,--depend $(MDDEPDIR)/$(@F).pp --target $@)
+EXPAND_LIBS_EXEC = $(PYTHON) $(topsrcdir)/config/expandlibs_exec.py $(if $@,--depend $(MDDEPDIR)/$(@F).pp --target $@)
-EXPAND_LIBS_GEN = $(PYTHON) $(topsrcdir)/config/pythonpath.py -I$(DEPTH)/config $(topsrcdir)/config/expandlibs_gen.py $(if $@,--depend $(MDDEPDIR)/$(@F).pp)
+EXPAND_LIBS_GEN = $(PYTHON) $(topsrcdir)/config/expandlibs_gen.py $(if $@,--depend $(MDDEPDIR)/$(@F).pp)
 EXPAND_AR = $(EXPAND_LIBS_EXEC) --extract -- $(AR)
 EXPAND_CC = $(EXPAND_LIBS_EXEC) --uselist -- $(CC)
 EXPAND_CCC = $(EXPAND_LIBS_EXEC) --uselist -- $(CCC)

config/expandlibs_config.py

@@ -0,0 +1,27 @@
+# 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/.
+
+from buildconfig import substs
+
+def normalize_suffix(suffix):
+    '''Returns a normalized suffix, i.e. ensures it starts with a dot and
+    doesn't starts or ends with whitespace characters'''
+    value = suffix.strip()
+    if len(value) and not value.startswith('.'):
+        value = '.' + value
+    return value
+
+# Variables from the build system
+AR = substs['AR']
+AR_EXTRACT = substs['AR_EXTRACT'].replace('$(AR)', AR)
+DLL_PREFIX = substs['DLL_PREFIX']
+LIB_PREFIX = substs['LIB_PREFIX']
+OBJ_SUFFIX = normalize_suffix(substs['OBJ_SUFFIX'])
+LIB_SUFFIX = normalize_suffix(substs['LIB_SUFFIX'])
+DLL_SUFFIX = normalize_suffix(substs['DLL_SUFFIX'])
+IMPORT_LIB_SUFFIX = normalize_suffix(substs['IMPORT_LIB_SUFFIX'])
+LIBS_DESC_SUFFIX = normalize_suffix(substs['LIBS_DESC_SUFFIX'])
+EXPAND_LIBS_LIST_STYLE = substs['EXPAND_LIBS_LIST_STYLE']
+EXPAND_LIBS_ORDER_STYLE = substs['EXPAND_LIBS_ORDER_STYLE']
+LD_PRINT_ICF_SECTIONS = substs['LD_PRINT_ICF_SECTIONS']

config/expandlibs_config.py.in

@@ -1,25 +0,0 @@
-# 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/.
-
-def normalize_suffix(suffix):
-    '''Returns a normalized suffix, i.e. ensures it starts with a dot and
-    doesn't starts or ends with whitespace characters'''
-    value = suffix.strip()
-    if len(value) and not value.startswith('.'):
-        value = '.' + value
-    return value
-
-# Variables from the build system
-AR = "@AR@"
-AR_EXTRACT = "@AR_EXTRACT@".replace('$(AR)', AR)
-DLL_PREFIX = "@DLL_PREFIX@"
-LIB_PREFIX = "@LIB_PREFIX@"
-OBJ_SUFFIX = normalize_suffix("@OBJ_SUFFIX@")
-LIB_SUFFIX = normalize_suffix("@LIB_SUFFIX@")
-DLL_SUFFIX = normalize_suffix("@DLL_SUFFIX@")
-IMPORT_LIB_SUFFIX = normalize_suffix("@IMPORT_LIB_SUFFIX@")
-LIBS_DESC_SUFFIX = normalize_suffix("@LIBS_DESC_SUFFIX@")
-EXPAND_LIBS_LIST_STYLE = "@EXPAND_LIBS_LIST_STYLE@"
-EXPAND_LIBS_ORDER_STYLE = "@EXPAND_LIBS_ORDER_STYLE@"
-LD_PRINT_ICF_SECTIONS = "@LD_PRINT_ICF_SECTIONS@"

js/src/config/config.mk

@@ -758,8 +758,8 @@ CREATE_PRECOMPLETE_CMD = $(PYTHON) $(call core_abspath,$(topsrcdir)/config/creat
 # MDDEPDIR is the subdirectory where dependency files are stored
 MDDEPDIR := .deps
 
-EXPAND_LIBS_EXEC = $(PYTHON) $(topsrcdir)/config/pythonpath.py -I$(DEPTH)/config $(topsrcdir)/config/expandlibs_exec.py $(if $@,--depend $(MDDEPDIR)/$(@F).pp --target $@)
+EXPAND_LIBS_EXEC = $(PYTHON) $(topsrcdir)/config/expandlibs_exec.py $(if $@,--depend $(MDDEPDIR)/$(@F).pp --target $@)
-EXPAND_LIBS_GEN = $(PYTHON) $(topsrcdir)/config/pythonpath.py -I$(DEPTH)/config $(topsrcdir)/config/expandlibs_gen.py $(if $@,--depend $(MDDEPDIR)/$(@F).pp)
+EXPAND_LIBS_GEN = $(PYTHON) $(topsrcdir)/config/expandlibs_gen.py $(if $@,--depend $(MDDEPDIR)/$(@F).pp)
 EXPAND_AR = $(EXPAND_LIBS_EXEC) --extract -- $(AR)
 EXPAND_CC = $(EXPAND_LIBS_EXEC) --uselist -- $(CC)
 EXPAND_CCC = $(EXPAND_LIBS_EXEC) --uselist -- $(CCC)

js/src/config/expandlibs_config.py

@@ -0,0 +1,27 @@
+# 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/.
+
+from buildconfig import substs
+
+def normalize_suffix(suffix):
+    '''Returns a normalized suffix, i.e. ensures it starts with a dot and
+    doesn't starts or ends with whitespace characters'''
+    value = suffix.strip()
+    if len(value) and not value.startswith('.'):
+        value = '.' + value
+    return value
+
+# Variables from the build system
+AR = substs['AR']
+AR_EXTRACT = substs['AR_EXTRACT'].replace('$(AR)', AR)
+DLL_PREFIX = substs['DLL_PREFIX']
+LIB_PREFIX = substs['LIB_PREFIX']
+OBJ_SUFFIX = normalize_suffix(substs['OBJ_SUFFIX'])
+LIB_SUFFIX = normalize_suffix(substs['LIB_SUFFIX'])
+DLL_SUFFIX = normalize_suffix(substs['DLL_SUFFIX'])
+IMPORT_LIB_SUFFIX = normalize_suffix(substs['IMPORT_LIB_SUFFIX'])
+LIBS_DESC_SUFFIX = normalize_suffix(substs['LIBS_DESC_SUFFIX'])
+EXPAND_LIBS_LIST_STYLE = substs['EXPAND_LIBS_LIST_STYLE']
+EXPAND_LIBS_ORDER_STYLE = substs['EXPAND_LIBS_ORDER_STYLE']
+LD_PRINT_ICF_SECTIONS = substs['LD_PRINT_ICF_SECTIONS']

js/src/config/expandlibs_config.py.in

@@ -1,25 +0,0 @@
-# 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/.
-
-def normalize_suffix(suffix):
-    '''Returns a normalized suffix, i.e. ensures it starts with a dot and
-    doesn't starts or ends with whitespace characters'''
-    value = suffix.strip()
-    if len(value) and not value.startswith('.'):
-        value = '.' + value
-    return value
-
-# Variables from the build system
-AR = "@AR@"
-AR_EXTRACT = "@AR_EXTRACT@".replace('$(AR)', AR)
-DLL_PREFIX = "@DLL_PREFIX@"
-LIB_PREFIX = "@LIB_PREFIX@"
-OBJ_SUFFIX = normalize_suffix("@OBJ_SUFFIX@")
-LIB_SUFFIX = normalize_suffix("@LIB_SUFFIX@")
-DLL_SUFFIX = normalize_suffix("@DLL_SUFFIX@")
-IMPORT_LIB_SUFFIX = normalize_suffix("@IMPORT_LIB_SUFFIX@")
-LIBS_DESC_SUFFIX = normalize_suffix("@LIBS_DESC_SUFFIX@")
-EXPAND_LIBS_LIST_STYLE = "@EXPAND_LIBS_LIST_STYLE@"
-EXPAND_LIBS_ORDER_STYLE = "@EXPAND_LIBS_ORDER_STYLE@"
-LD_PRINT_ICF_SECTIONS = "@LD_PRINT_ICF_SECTIONS@"

js/src/configure.in

@@ -4443,7 +4443,6 @@ MAKEFILES="
   shell/Makefile
   config/Makefile
   config/autoconf.mk
-  config/expandlibs_config.py
 "
 
 if test "$JS_NATIVE_EDITLINE"; then