Fix bug 1130854 - Package Lightning with Thunderbird - Go back to using em:targetPlatform. r=jcranmer
authorPhilipp Kewisch <mozilla@kewis.ch>
Mon, 13 Apr 2015 21:54:24 +0200
changeset 25881 fc7ec66919e6b092a00799527d05bec86be73cd5
parent 25880 f29f3513be8bed4158f4066b29783eee7139d9dc
child 25882 b11a42c262d6ce8a814c132a00a3bea820fa965e
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer
bugs1130854
Fix bug 1130854 - Package Lightning with Thunderbird - Go back to using em:targetPlatform. r=jcranmer
calendar/lightning/build/get-platform.py
calendar/lightning/build/universal.mk
calendar/lightning/install.rdf
calendar/lightning/lightning-tests.mk
--- a/calendar/lightning/build/get-platform.py
+++ b/calendar/lightning/build/get-platform.py
@@ -4,10 +4,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Get the target platform from a set an install.rdf file
 
 import sys
 from xml.dom.minidom import parse
 
 doc = parse(sys.argv[1] + "/install.rdf")
-elem = doc.getElementsByTagName("em:realTargetPlatform")[0]
+elem = doc.getElementsByTagName("em:targetPlatform")[0]
 print elem.firstChild.nodeValue
--- a/calendar/lightning/build/universal.mk
+++ b/calendar/lightning/build/universal.mk
@@ -37,10 +37,10 @@ postflight_all:
 		$(DIST_UNI)/xpi-stage/lightning/components/$$platform; \
 	$(foreach dylib,$(wildcard $(DIST_ARCH_1)/xpi-stage/lightning/components/*.dylib),echo binary-component $$platform/$(notdir $(dylib)) abi=$$platform >> $(DIST_UNI)/xpi-stage/lightning/components/libical-manifest)
 	platform=`$(PYTHON) $(TOPSRCDIR)/calendar/lightning/build/get-platform.py \
 		$(DIST_ARCH_2)/xpi-stage/lightning`; \
 	mkdir -p $(DIST_UNI)/xpi-stage/lightning/components/$$platform; \
 	cp $(DIST_ARCH_2)/xpi-stage/lightning/components/*.dylib \
 		$(DIST_UNI)/xpi-stage/lightning/components/$$platform; \
 	$(foreach dylib,$(wildcard $(DIST_ARCH_2)/xpi-stage/lightning/components/*.dylib),echo binary-component $$platform/$(notdir $(dylib)) abi=$$platform >> $(DIST_UNI)/xpi-stage/lightning/components/libical-manifest)
-	grep -v em:realTargetPlatform $(DIST_ARCH_1)/xpi-stage/lightning/install.rdf > $(DIST_UNI)/xpi-stage/lightning/install.rdf
+	grep -v em:targetPlatform $(DIST_ARCH_1)/xpi-stage/lightning/install.rdf > $(DIST_UNI)/xpi-stage/lightning/install.rdf
 	cd $(DIST_UNI)/xpi-stage/lightning && $(ZIP) -qr ../$(XPI_PKGNAME).xpi *
--- a/calendar/lightning/install.rdf
+++ b/calendar/lightning/install.rdf
@@ -35,16 +35,16 @@
     <em:description>An integrated calendar for Thunderbird</em:description>
 #ifdef LIGHTNING_PRERELEASE_VERSION
     <em:developer>Build ID: @GRE_BUILDID@</em:developer>
 #endif
     <em:creator>Mozilla Calendar Project</em:creator>
     <em:homepageURL>https://www.mozilla.org/projects/calendar/</em:homepageURL>
     <em:iconURL>chrome://calendar/skin/cal-icon32.png</em:iconURL>
     <em:optionsURL>chrome://messenger/content/preferences/preferences.xul</em:optionsURL>
-    <em:realTargetPlatform>@TARGET_PLATFORM@</em:realTargetPlatform>
+    <em:targetPlatform>@TARGET_PLATFORM@</em:targetPlatform>
 #ifdef LIGHTNING_UPDATE_LOCATION
     <em:updateURL>@LIGHTNING_UPDATE_LOCATION@?buildID=@GRE_BUILDID@&amp;appABI=%APP_ABI%&amp;appOS=%APP_OS%&amp;locale=%APP_LOCALE%&amp;appVersion=%APP_VERSION%&amp;appID=%APP_ID%</em:updateURL>
 #endif
     <em:unpack>true</em:unpack>
     <em:strictCompatibility>true</em:strictCompatibility>
   </Description>
 </RDF>
--- a/calendar/lightning/lightning-tests.mk
+++ b/calendar/lightning/lightning-tests.mk
@@ -11,17 +11,17 @@ endif
 # This is the target that should be called externally
 stage-package: stage-extension stage-mozmill
 
 # stage the extension, avoiding per-platform differences so that the mac unify
 # target works.
 stage-extension:
 	$(NSINSTALL) -D $(PKG_STAGE)/extensions/$(XPI_EM_ID)
 	(cd $(FINAL_TARGET) && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/extensions/$(XPI_EM_ID) && tar -xf -)
-	grep -v em:realTargetPlatform $(FINAL_TARGET)/install.rdf > $(PKG_STAGE)/extensions/$(XPI_EM_ID)/install.rdf
+	grep -v em:targetPlatform $(FINAL_TARGET)/install.rdf > $(PKG_STAGE)/extensions/$(XPI_EM_ID)/install.rdf
 
 # stage mozmill tests and shared modules. Cross your fingers that there are no
 # name conflicts between calendar/ and mail/
 stage-mozmill:
 	$(NSINSTALL) -D $(PKG_STAGE)/mozmill/shared-modules
 	(cd $(topsrcdir)/calendar/test/mozmill && tar $(TAR_CREATE_FLAGS) - `cat $(topsrcdir)/calendar/test/mozmill/mozmilltests.list`) | (cd $(PKG_STAGE)/mozmill && tar -xf -)
 	(cd $(topsrcdir)/calendar/test/mozmill/shared-modules && tar $(TAR_CREATE_FLAGS) - *) | (cd $(PKG_STAGE)/mozmill/shared-modules && tar -xf -)
 	$(call py_action,buildlist,$(PKG_STAGE)/mozmill/mozmilltests.list $(shell cat $(topsrcdir)/calendar/test/mozmill/mozmilltests.list))