Bug 944952 - Bring mdimporter into the regular build config, r=Standard8.
authorJoshua Cranmer <Pidgeot18@gmail.com>
Tue, 25 Feb 2014 11:07:30 -0600
changeset 15797 24c3a939f322cf29ec0fa1c891b241fbb91961ab
parent 15796 7da4d42884f1381610cfae92ab6d842ee48fa327
child 15798 0d5a6b079e1a36e07a20eb314410f233d7e3d8e8
push id9895
push userPidgeot18@gmail.com
push dateTue, 25 Feb 2014 17:07:41 +0000
treeherdercomm-central@24c3a939f322 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8
bugs944952
Bug 944952 - Bring mdimporter into the regular build config, r=Standard8.
mail/components/search/mdimporter/English.lproj/schema.strings
mail/components/search/mdimporter/InfoPlist.strings
mail/components/search/mdimporter/Makefile.in
mail/components/search/mdimporter/TBSpotlight.xcodeproj/project.pbxproj
mail/components/search/mdimporter/moz.build
mail/configure.in
index 1577efdb95a183aa5a9b87c7c59ea4f463334681..0f7b8d6297138cd0ed12f4d66a30146a8179f7c9
GIT binary patch
literal 1276
zc$~FUO;5r=5Petq6&sEm>RsZ&#BfnOdEsPAKcq=Z32nvt<JC9AZd+;*F!4ZVXZG!U
zym@?mUf~)O7(60J03Rt5d>}%|*gek$HjMeG@x*V&n}Rnn(OcS@w$f8TTcD($(Gy%r
ze8`_zqqZb6!IH?*=9#ei2(E``tQdFMC6Cm<p*0xOuQBiCeV||S&fr!tb9&|n$~3sC
z<}ybsukDP69jy5+Z9L^Srnm2?jkowv5eXxE?h<`pkQYH_#Cdq9O)su3oW1hgR^QR{
z)pr=-KGHqxh)K1IM53nJn4QROUNEE0X%}{PcXl&wzb%`KX1hb`aPLg#<&>31o!N#}
z6)7(=*M=DqJ8w?@oTC0)Prs?jJJMmxi}Y17YiuWW_0DBjcC*sER2f<J6ciq4$nAJo
zOR?@dI?%M~&Httws7`3BRgUYY`|pozr*-G`tm#%%AY2CQ%=?4pPIEq_r0@(SZ3nd?
Gd;11x`qsAq
deleted file mode 100644
index ca96e65b7ea3c2e08f207027838cc951dd0ee99e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/mail/components/search/mdimporter/Makefile.in
+++ b/mail/components/search/mdimporter/Makefile.in
@@ -1,49 +1,33 @@
 # 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/.
 
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+# This directory is producing a framework as a target. The output of this
+# framework will be located here.
+FRAMEWORK_DIR := $(DIST)/package/thunderbird.mdimporter
+
+STRING_FILES := English.lproj/InfoPlist.strings English.lproj/schema.strings
+STRING_DEST := $(FRAMEWORK_DIR)/Contents/Resources/English.lproj
+INSTALL_TARGETS += STRING
+
+SCHEMA_FILES := schema.xml
+SCHEMA_DEST := $(FRAMEWORK_DIR)/Contents/Resources
+INSTALL_TARGETS += SCHEMA
 
-include $(DEPTH)/config/autoconf.mk
+PLIST_FILES := Info.plist
+PLIST_DEST := $(FRAMEWORK_DIR)/Contents
+INSTALL_TARGETS += PLIST
 
-# Xcode 2.1 and newer puts its build products in a directory corresponding to
-# the selected build style/configuration.
-XCODE_PRODUCT_DIR = build/$(BUILDSTYLE)
+CFLAGS += -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
+# We don't need mozglue
+WRAP_LDFLAGS :=
+LIBS += \
+  -framework CoreFoundation \
+  -framework CoreServices \
+  $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-ifeq (,$(findstring pbxbuild,$(PBBUILD)))
-    # pbbuild or xcodebuild indicates Xcode; the Xcode project contains
-    # native targets needed for proper SDK builds.
-    PROJECT=TBSpotlight.xcodeproj
-    PROJECT_ARG=-project $(PROJECT)
-    PBBUILD_ARG=$(PBBUILD_SETTINGS)
-endif
-
-BUILDSTYLE = Release
-
-CC  := $(shell which $(firstword $(CC)))
-CXX := $(shell which $(firstword $(CXX)))
+# We're also a bundle.
+LDFLAGS += -bundle
 
-# for objdir builds, copy the project, and symlink the sources
-ABS_topsrcdir   := $(shell cd $(topsrcdir); pwd)
-ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
-export::
-	rsync -a --exclude .DS_Store --exclude "CVS/" $(srcdir)/$(PROJECT) .
-	ln -fs $(srcdir)/English.lproj
-	ln -fs $(srcdir)/GetMetadataForFile.c
-	ln -fs $(srcdir)/main.c
-	ln -fs $(srcdir)/schema.xml
-	ln -fs $(srcdir)/Info*.plist .
-endif
-
-libs::
-	$(PBBUILD) $(PROJECT_ARG) -target thunderbird -configuration Release $(PBBUILD_ARG)
-	mkdir -p $(DIST)/package
-	$(INSTALL) "$(XCODE_PRODUCT_DIR)/thunderbird.mdimporter" $(DIST)/package
-
-clean clobber distclean::
-	rm -rf build
deleted file mode 100644
--- a/mail/components/search/mdimporter/TBSpotlight.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,281 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 45;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		2C05A19C06CAA52B00D84F6F /* GetMetadataForFile.c in Sources */ = {isa = PBXBuildFile; fileRef = 2C05A19B06CAA52B00D84F6F /* GetMetadataForFile.c */; };
-		8D576312048677EA00EA77CD /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 08FB77B6FE84183AC02AAC07 /* main.c */; settings = {ATTRIBUTES = (); }; };
-		8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; };
-		8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; };
-		C86B05270671AA6E00DD9006 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C86B05260671AA6E00DD9006 /* CoreServices.framework */; };
-		C88FB7D8067446EC006EBB30 /* schema.xml in Resources */ = {isa = PBXBuildFile; fileRef = C88FB7D7067446EC006EBB30 /* schema.xml */; };
-		C88FB7E40674480E006EBB30 /* schema.strings in Resources */ = {isa = PBXBuildFile; fileRef = C88FB7E30674480E006EBB30 /* schema.strings */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-		089C167EFE841241C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		08FB77B6FE84183AC02AAC07 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
-		0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
-		2C05A19B06CAA52B00D84F6F /* GetMetadataForFile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = GetMetadataForFile.c; sourceTree = "<group>"; };
-		8D576316048677EA00EA77CD /* thunderbird.mdimporter */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = thunderbird.mdimporter; sourceTree = BUILT_PRODUCTS_DIR; };
-		8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
-		C86B05260671AA6E00DD9006 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
-		C88FB7D7067446EC006EBB30 /* schema.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = schema.xml; sourceTree = "<group>"; };
-		C88FB7DB0674470F006EBB30 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/schema.strings; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		8D576313048677EA00EA77CD /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */,
-				C86B05270671AA6E00DD9006 /* CoreServices.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		089C166AFE841209C02AAC07 /* TBSpotlight */ = {
-			isa = PBXGroup;
-			children = (
-				08FB77AFFE84173DC02AAC07 /* Source */,
-				089C167CFE841241C02AAC07 /* Resources */,
-				089C1671FE841209C02AAC07 /* External Frameworks and Libraries */,
-				19C28FB6FE9D52B211CA2CBB /* Products */,
-			);
-			name = TBSpotlight;
-			sourceTree = "<group>";
-		};
-		089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = {
-			isa = PBXGroup;
-			children = (
-				C86B05260671AA6E00DD9006 /* CoreServices.framework */,
-				0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */,
-			);
-			name = "External Frameworks and Libraries";
-			sourceTree = "<group>";
-		};
-		089C167CFE841241C02AAC07 /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				C88FB7E30674480E006EBB30 /* schema.strings */,
-				C88FB7D7067446EC006EBB30 /* schema.xml */,
-				8D576317048677EA00EA77CD /* Info.plist */,
-				8D5B49A704867FD3000E48DA /* InfoPlist.strings */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		08FB77AFFE84173DC02AAC07 /* Source */ = {
-			isa = PBXGroup;
-			children = (
-				2C05A19B06CAA52B00D84F6F /* GetMetadataForFile.c */,
-				08FB77B6FE84183AC02AAC07 /* main.c */,
-			);
-			name = Source;
-			sourceTree = "<group>";
-		};
-		19C28FB6FE9D52B211CA2CBB /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				8D576316048677EA00EA77CD /* thunderbird.mdimporter */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXHeadersBuildPhase section */
-		8D57630E048677EA00EA77CD /* Headers */ = {
-			isa = PBXHeadersBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXHeadersBuildPhase section */
-
-/* Begin PBXNativeTarget section */
-		8D57630D048677EA00EA77CD /* thunderbird */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 70138C840896BE9A00968C2F /* Build configuration list for PBXNativeTarget "thunderbird" */;
-			buildPhases = (
-				8D57630E048677EA00EA77CD /* Headers */,
-				8D57630F048677EA00EA77CD /* Resources */,
-				8D576311048677EA00EA77CD /* Sources */,
-				8D576313048677EA00EA77CD /* Frameworks */,
-				8D576315048677EA00EA77CD /* Rez */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = thunderbird;
-			productInstallPath = /Library/Spotlight;
-			productName = TBSpotlight;
-			productReference = 8D576316048677EA00EA77CD /* thunderbird.mdimporter */;
-			productType = "com.apple.product-type.bundle";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		089C1669FE841209C02AAC07 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-			};
-			buildConfigurationList = 70138C880896BE9A00968C2F /* Build configuration list for PBXProject "TBSpotlight" */;
-			compatibilityVersion = "Xcode 3.1";
-			developmentRegion = English;
-			hasScannedForEncodings = 1;
-			knownRegions = (
-				en,
-			);
-			mainGroup = 089C166AFE841209C02AAC07 /* TBSpotlight */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				8D57630D048677EA00EA77CD /* thunderbird */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		8D57630F048677EA00EA77CD /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */,
-				C88FB7D8067446EC006EBB30 /* schema.xml in Resources */,
-				C88FB7E40674480E006EBB30 /* schema.strings in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXRezBuildPhase section */
-		8D576315048677EA00EA77CD /* Rez */ = {
-			isa = PBXRezBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXRezBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		8D576311048677EA00EA77CD /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				8D576312048677EA00EA77CD /* main.c in Sources */,
-				2C05A19C06CAA52B00D84F6F /* GetMetadataForFile.c in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
-		8D5B49A704867FD3000E48DA /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				089C167EFE841241C02AAC07 /* English */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-		C88FB7E30674480E006EBB30 /* schema.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				C88FB7DB0674470F006EBB30 /* English */,
-			);
-			name = schema.strings;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		70138C850896BE9A00968C2F /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = /Library/Spotlight;
-				LIBRARY_STYLE = Bundle;
-				PRODUCT_NAME = thunderbird;
-				WRAPPER_EXTENSION = mdimporter;
-				ZERO_LINK = YES;
-			};
-			name = Debug;
-		};
-		70138C860896BE9A00968C2F /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				COMBINE_HIDPI_IMAGES = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_MODEL_TUNING = G5;
-				GCC_PRECOMPILE_PREFIX_HEADER = NO;
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = /Library/Spotlight;
-				LIBRARY_STYLE = Bundle;
-				PRODUCT_NAME = thunderbird;
-				WRAPPER_EXTENSION = mdimporter;
-			};
-			name = Release;
-		};
-		70138C890896BE9A00968C2F /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				SDKROOT = "";
-			};
-			name = Debug;
-		};
-		70138C8A0896BE9A00968C2F /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				SDKROOT = "";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		70138C840896BE9A00968C2F /* Build configuration list for PBXNativeTarget "thunderbird" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				70138C850896BE9A00968C2F /* Debug */,
-				70138C860896BE9A00968C2F /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		70138C880896BE9A00968C2F /* Build configuration list for PBXProject "TBSpotlight" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				70138C890896BE9A00968C2F /* Debug */,
-				70138C8A0896BE9A00968C2F /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 089C1669FE841209C02AAC07 /* Project object */;
-}
--- a/mail/components/search/mdimporter/moz.build
+++ b/mail/components/search/mdimporter/moz.build
@@ -1,5 +1,14 @@
 # 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/.
 
+SOURCES = [
+    'GetMetadataForFile.c',
+    'main.c',
+]
+
+PROGRAM = 'thunderbird'
+# This directory is producing a framework as a target. The output of this
+# framework will be located here.
+FINAL_TARGET = 'mozilla/dist/package/thunderbird.mdimporter/Contents/MacOS'
--- a/mail/configure.in
+++ b/mail/configure.in
@@ -94,27 +94,16 @@ if test -n "$MOZ_MAPI_SUPPORT"; then
     MAIL_MODULE="$MAIL_MODULE MODULE(msgMapiModule)"
 fi
 
 if test -z "$MOZ_INCOMPLETE_EXTERNAL_LINKAGE"; then
   MOZ_APP_COMPONENT_MODULES="MODULE(nsMailCompsModule) $MAIL_MODULE $LDAP_MODULE $MORK_MODULE"
   MOZ_APP_EXTRA_LIBS="$LDAP_LIBS"
 fi
 
-# Check for PBBUILD on OS X.
-case "$target_os" in
-darwin*)
-  for name in pbbuild xcodebuild pbxbuild; do
-    PBBUILD_BIN=`which $name`
-    test -n "$PBBUILD_BIN" && break
-  done
-  AC_SUBST(PBBUILD_BIN)
-  ;;
-esac
-
 # if we're building the LDAP XPCOM component, we need to build
 # the c-sdk first.
 if test -n "$COMPILE_ENVIRONMENT" -a -n "$MOZ_LDAP_XPCOM"; then
     # Save configure args so we can restore them after configuring LDAP.
     _save_ac_configure_args="$ac_configure_args"
     ac_configure_args="$_SUBDIR_CONFIG_ARGS"
 
     mkdir -p ../ldap/sdks/c-sdk/ldap