Bug 1099430, part 2: Delete unnecessary auxiliary config makefiles, r=glandium, a=jcranmer
authorJoshua Cranmer <Pidgeot18@gmail.com>
Fri, 05 Dec 2014 11:38:31 -0600
changeset 21456 67fbc8c9e40a0504a92ec5c712b0afbf3dd9f6be
parent 21455 7254179a9d7d8fcb6b6847e31f82847fc309c69c
child 21457 cc7951cb37a238edb53dd05a5e449e61c9afd6b0
push id1305
push usermbanner@mozilla.com
push dateMon, 23 Feb 2015 19:48:12 +0000
treeherdercomm-beta@3ae4f13858fd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, jcranmer
bugs1099430
Bug 1099430, part 2: Delete unnecessary auxiliary config makefiles, r=glandium, a=jcranmer Sadly, not all of the files can be deleted. baseconfig, config, recurse, and rules all need to be included with $(topsrcdir), and therefore need the proxy. The remaining copies in config/makefiles can't even be proxied to their m-c counterparts, because client.mk needs to include them and their contents are needed by our automation processes before mozilla-central is cloned.
config/static-checking-config.mk
config/static-rules.mk
config/version.mk
deleted file mode 100644
--- a/config/static-checking-config.mk
+++ /dev/null
@@ -1,35 +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/.
-
-# The entire tree should be subject to static analysis using the XPCOM
-# script. Additional scripts may be added by specific subdirectories.
-
-DEHYDRA_SCRIPT = $(MOZILLA_SRCDIR)/config/static-checking.js
-
-DEHYDRA_MODULES = \
-  $(MOZILLA_SRCDIR)/xpcom/analysis/final.js \
-  $(MOZILLA_SRCDIR)/xpcom/analysis/override.js \
-  $(MOZILLA_SRCDIR)/xpcom/analysis/must-override.js \
-  $(NULL)
-
-TREEHYDRA_MODULES = \
-  $(MOZILLA_SRCDIR)/xpcom/analysis/outparams.js \
-  $(MOZILLA_SRCDIR)/xpcom/analysis/stack.js \
-  $(MOZILLA_SRCDIR)/xpcom/analysis/flow.js \
-  $(MOZILLA_SRCDIR)/js/src/jsstack.js \
-  $(MOZILLA_SRCDIR)/layout/generic/frame-verify.js \
-  $(NULL)
-
-DEHYDRA_ARGS = \
-  --topsrcdir=$(topsrcdir) \
-  --objdir=$(DEPTH) \
-  --dehydra-modules=$(subst $(NULL) ,$(COMMA),$(strip $(DEHYDRA_MODULES))) \
-  --treehydra-modules=$(subst $(NULL) ,$(COMMA),$(strip $(TREEHYDRA_MODULES))) \
-  $(NULL)
-
-DEHYDRA_FLAGS = -fplugin=$(DEHYDRA_PATH) -fplugin-arg='$(DEHYDRA_SCRIPT) $(DEHYDRA_ARGS)'
-
-ifdef DEHYDRA_PATH
-OS_CXXFLAGS += $(DEHYDRA_FLAGS)
-endif
deleted file mode 100644
--- a/config/static-rules.mk
+++ /dev/null
@@ -1,29 +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/.
-
-
-ifdef _NO_AUTO_VARS
-_TARGET = $(srcdir)/$(@F)
-else
-_TARGET = $@
-endif
-
-$(warning FINAL_LINK_COMP_NAMES = $(FINAL_LINK_COMP_NAMES))
-$(warning FINAL_LINK_COMPS = $(FINAL_LINK_COMPS))
-
-nsStaticComponents.cpp: $(MOZILLA_SRCDIR)/config/nsStaticComponents.cpp.in $(GLOBAL_DEPS) $(FINAL_LINK_COMP_NAMES)
-	rm -f $@
-	cat $< | \
-	sed -e "s|%MODULE_LIST%|$(foreach m, $(STATIC_COMPONENT_LIST),MODULE($(m)))|" \
-	> $(_TARGET)
-
-GARBAGE += nsStaticComponents.cpp
-
-ifeq ($(OS_ARCH),IRIX)
-LDFLAGS	+= -Wl,-LD_LAYOUT:lgot_buffer=80
-endif
-
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-LIBS	+= -framework QuickTime -framework IOKit -lcrypto
-endif
deleted file mode 100644
--- a/config/version.mk
+++ /dev/null
@@ -1,54 +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/.
-
-ifndef INCLUDED_VERSION_MK
-INCLUDED_VERSION_MK=1
-
-# Windows gmake build:
-# Build default .rc file if $(RESFILE) isn't defined.
-# TODO:
-# PBI      : Private build info.  Not used currently.
-#            Guessing the best way would be to set an env var.
-# BINARY   : Binary name.  Not used currently.
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-ifndef RESFILE
-RCFILE=./module.rc
-RESFILE=./module.res
-_RC_STRING = -QUIET 1 -DEPTH $(DEPTH) -TOPSRCDIR $(MOZILLA_SRCDIR) -OBJDIR . -SRCDIR $(srcdir) -DISPNAME $(MOZ_APP_DISPLAYNAME) -APPVERSION $(MOZ_APP_VERSION)
-ifdef MOZILLA_OFFICIAL
-_RC_STRING += -OFFICIAL 1
-endif
-ifdef MOZ_DEBUG
-_RC_STRING += -DEBUG 1
-endif
-ifdef MODULE
-_RC_STRING += -MODNAME $(MODULE)
-endif
-ifdef PROGRAM
-_RC_STRING += -BINARY $(PROGRAM)
-else
-ifdef _PROGRAM
-_RC_STRING += -BINARY $(_PROGRAM)
-else
-ifdef SHARED_LIBRARY
-_RC_STRING += -BINARY $(SHARED_LIBRARY)
-endif
-endif
-endif
-ifdef RCINCLUDE
-_RC_STRING += -RCINCLUDE $(srcdir)/$(RCINCLUDE)
-endif
-
-GARBAGE += $(RESFILE) $(RCFILE)
-
-#dummy target so $(RCFILE) doesn't become the default =P
-all::
-
-$(RCFILE): $(RCINCLUDE) $(MOZILLA_SRCDIR)/config/version_win.pl
-	$(PERL) $(MOZILLA_SRCDIR)/config/version_win.pl $(_RC_STRING)
-
-endif  # RESFILE
-endif  # Windows
-
-endif