Port bug 896797 and bug 912293 from mozilla-central to fix build bustages. rs=build system peer port,a=bustage-fix
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 05 Sep 2013 12:58:39 +0100
changeset 16463 8958f7bad543101e5413557b2eafd59fd445608c
parent 16462 5d68d0b9aeb7f860c42f80a1d8fd3bec15dd53c2
child 16464 518f766beceb1a1ba0104d843e916ab8b6990d99
push id1019
push userbugzilla@standard8.plus.com
push dateMon, 28 Oct 2013 22:08:40 +0000
treeherdercomm-beta@c81d5f517a5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbuild, bustage-fix
bugs896797, 912293
Port bug 896797 and bug 912293 from mozilla-central to fix build bustages. rs=build system peer port,a=bustage-fix
calendar/libical/src/libical/Makefile.in
calendar/libical/src/libical/moz.build
config/autoconf.mk.in
config/baseconfig.mk
config/rules.mk
mailnews/mapi/mapihook/build/Makefile.in
mailnews/mapi/mapihook/build/moz.build
--- a/calendar/libical/src/libical/Makefile.in
+++ b/calendar/libical/src/libical/Makefile.in
@@ -49,16 +49,21 @@ USE_STATIC_LIBS  = 1
 DEFINES += -DHAVE_CONFIG_H
 
 ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD,$(OS_ARCH)))
 DEFINES	+= -D__USE_BSD=1
 endif
 
 LOCAL_INCLUDES = -I$(srcdir)/../.. -I$(srcdir) -I.
 
+INSTALL_TARGETS += ical
+ical_FILES := ical.h
+ical_DEST = $(DIST)/include
+ical_TARGET := export
+
 include $(topsrcdir)/config/rules.mk
 
 ######################################################################
 #
 # Generate files that are automatically generated (*.h.in and *.c.in)
 # and ical.h
 #
 
--- a/calendar/libical/src/libical/moz.build
+++ b/calendar/libical/src/libical/moz.build
@@ -1,19 +1,15 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'ical'
 
-EXPORTS += [
-    'ical.h',
-]
-
 CSRCS += [
     'caldate.c',
     'icalarray.c',
     'icalattach.c',
     'icalcomponent.c',
     'icalderivedparameter.c',
     'icalderivedproperty.c',
     'icalderivedvalue.c',
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -1,2 +1,5 @@
+ifndef INCLUDED_AUTOCONF_MK
+INCLUDED_AUTOCONF_MK = 1
 @ALLSUBSTS@
 include $(topsrcdir)/config/baseconfig.mk
+endif
--- a/config/baseconfig.mk
+++ b/config/baseconfig.mk
@@ -1,10 +1,8 @@
-INCLUDED_AUTOCONF_MK = 1
-
 includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
 MOZILLA_SRCDIR = $(topsrcdir)/mozilla
 MOZDEPTH = $(DEPTH)/mozilla
 DIST = $(MOZDEPTH)/dist
 
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -4,16 +4,22 @@
 # 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 topsrcdir
 $(error topsrcdir was not set))
 endif
 
+# Define an include-at-most-once flag
+ifdef INCLUDED_RULES_MK
+$(error Do not include rules.mk twice!)
+endif
+INCLUDED_RULES_MK = 1
+
 # Integrate with mozbuild-generated make files. We first verify that no
 # variables provided by the automatically generated .mk files are
 # present. If they are, this is a violation of the separation of
 # responsibility between Makefile.in and mozbuild files.
 _MOZBUILD_EXTERNAL_VARIABLES := \
   DIRS \
   PARALLEL_DIRS \
   TEST_DIRS \
--- a/mailnews/mapi/mapihook/build/Makefile.in
+++ b/mailnews/mapi/mapihook/build/Makefile.in
@@ -14,16 +14,21 @@ DEFFILE		= $(win_srcdir)/MapiProxy.def
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 OS_LIBS		+= rpcrt4.lib
 
 MIDL_GENERATED_FILES = msgMapi.h msgMapi_p.c msgMapi_i.c dlldata.c
 
+INSTALL_TARGETS += msgmapi
+msgmapi_FILES := msgMapi.h
+msgmapi_DEST = $(DIST)/include
+msgmapi_TARGET := export
+
 SRCDIR_CSRCS	= $(addprefix $(srcdir)/,$(CSRCS))
 
 GARBAGE	+= $(MIDL_GENERATED_FILES) done_gen $(CSRCS) $(SRCDIR_CSRCS)
 
 LOCAL_INCLUDES	= -I.
 
 EMBED_MANIFEST_AT = 2
 
--- a/mailnews/mapi/mapihook/build/moz.build
+++ b/mailnews/mapi/mapihook/build/moz.build
@@ -1,20 +1,16 @@
 # vim: set filetype=python:
 # 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/.
 
 MODULE = 'MapiProxy'
 LIBRARY_NAME = 'MapiProxy'
 
-EXPORTS += [
-    'msgMapi.h',
-]
-
 CSRCS += [
     'dlldata.c',
     'msgMapi_i.c',
     'msgMapi_p.c',
 ]
 
 FORCE_SHARED_LIB = True