From caa16968cd4fa20dd3772a7eb8576e98068b06a0 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Wed, 5 Aug 2009 00:59:15 +0200 Subject: implement start/end of life for comparing possible alternate binary dependency. - update src/xpi.mk --- src/xpi.mk | 76 +++++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 60 insertions(+), 16 deletions(-) (limited to 'src/xpi.mk') diff --git a/src/xpi.mk b/src/xpi.mk index 9ff3db2..820605e 100644 --- a/src/xpi.mk +++ b/src/xpi.mk @@ -3,6 +3,7 @@ # Copyright (c) 2008-2009 Canonical Ltd. # Author(s): Alexander Sack # Fabien Tassin +# Benjamin Drung # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -62,34 +63,77 @@ # your code to MOZ_XPI_MOZILLA_EXTRA_DIRS # -# data for XPI_DEPENDS/CHECK_VERSION magic - targetApplication to package mapping -target_packages_{ec8030f7-c20a-464f-9b0e-13a3a9e97384}_3.0 := abrowser-3.0 firefox-3.0 iceweasel -target_packages_{ec8030f7-c20a-464f-9b0e-13a3a9e97384}_3.5 := abrowser-3.5 firefox-3.5 iceweasel -target_packages_{ec8030f7-c20a-464f-9b0e-13a3a9e97384}_3.6 := abrowser-3.6 firefox-3.6 -target_packages_{3550f703-e582-4d05-9a08-453d09bdfdc6}_2.0 := icedove thunderbird -target_packages_{3550f703-e582-4d05-9a08-453d09bdfdc6}_3.0 := icedove thunderbird-3.0 -target_packages_prism@developer.mozilla.org_1.0 := prism - -# data for XPI_DEPENDS/CHECK_VERSION magic - targetApplication versions -target_versions_{ec8030f7-c20a-464f-9b0e-13a3a9e97384} := 3.0 3.5 3.6 -target_versions_{3550f703-e582-4d05-9a08-453d09bdfdc6} := 2.0 3.0 -target_versions_prism@developer.mozilla.org := 1.0 +# data for XPI_DEPENDS/CHECK_VERSION magic - start/end of life of binary packages +abrowser-3.0_sol := 3.0a8 +abrowser-3.0_eol := 3.0.* +abrowser-3.5_sol := 3.5b4 +abrowser-3.5_eol := 3.5.* +abrowser-3.6_sol := 3.6a1pre +abrowser-3.6_eol := 3.6.* +firefox-3.0_sol := 3.0a8 +firefox-3.0_eol := 3.0.* +firefox-3.5_sol := 3.5b4 +firefox-3.5_eol := 3.5.* +firefox-3.6_sol := 3.6a1pre +firefox-3.6_eol := 3.6.* +iceweasel_sol := 2.0 +iceweasel_eol := * + +icedove_sol := 1.5.0.7 +icedove_eol := * +thunderbird_sol := 2.0 +thunderbird_eol := 2.0.0.* +thunderbird-3.0_sol := 3.0a1pre +thunderbird-3.0_eol := 3.0.* + +iceape_sol := 1.0.6 +iceape_eol := * +seamonkey_sol := 1.1.6 +seamonkey_eol := * + +conkeror_sol := 0.9 +conkeror_eol := * + +prism_sol := 0.8 +prism_eol := * + +sunbird_sol := 0.5 +sunbird_eol := * + +xulrunner-1.9_sol := 1.9a1pre +xulrunner-1.9_eol := 1.9.0.* +xulrunner-1.9.1_sol := 1.9.1a1pre +xulrunner-1.9.1_eol := 1.9.1.* +xulrunner-1.9.2_sol := 1.9.2a1pre +xulrunner-1.9.2_eol := 1.9.2.* + +# data for XPI_DEPENDS/CHECK_VERSION magic - targetApplication packages +packages_{ec8030f7-c20a-464f-9b0e-13a3a9e97384} := abrowser-3.0 abrowser-3.5 abrowser-3.6 firefox-3.0 firefox-3.5 firefox-3.6 iceweasel +packages_{3550f703-e582-4d05-9a08-453d09bdfdc6} := icedove thunderbird thunderbird-3.0 +packages_{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} := iceape seamonkey +packages_{a79fe89b-6662-4ff4-8e88-09950ad4dfde} := conkeror +packages_prism@developer.mozilla.org := prism +packages_toolkit@mozilla.org := xulrunner-1.9 xulrunner-1.9.1 xulrunner-1.9.2 # data for XPI_DEPENDS/CHECK_VERSION magic - targetApplication min-/maxVersions -# FIXME: find a way to get this information # call parameters_ # 1- target app id # 2- maxVersion | minVersion # 3- extension dir TARGET_VERSION = $(shell xpath -q -e '//em:targetApplication/Description[em:id="$(1)" or @em:id="$(1)"]/em:$(2)/text() | //em:targetApplication/Description[em:id="$(1)" or @em:id="$(1)"]/@em:$(2)' $(3)/install.rdf) -# TODO: Use correct comparison -CHECK_VERSION = $(shell moz-version-compare $(call TARGET_VERSION,$(1),minVersion,$(TEMPDIR)) le $(2) && moz-version-compare $(2) le $(call TARGET_VERSION,$(1),maxVersion,$(TEMPDIR)) && echo $(target_packages_$(1)_$(2))) +# call parameters_ +# 1- target app id +# 2- package name +CHECK_VERSION = $(shell \ + moz-version -cs "$($(2)_eol)" ge $(call TARGET_VERSION,$(1),minVersion,$(TEMPDIR)) && \ + moz-version -cs "$($(2)_sol)" le $(call TARGET_VERSION,$(1),maxVersion,$(TEMPDIR)) && \ + echo $(2)) MOZ_XPI_BUILD_COMMAND ?= med-xpi-pack $(CURDIR) $(MOZ_EXTENSION_PKG).xpi; XPI_DEPENDS = $(sort $(foreach id,$(call XPI_TARGET_EMIDs,$(TEMPDIR)), \ - $(foreach version,$(target_versions_$(id)),$(call CHECK_VERSION,$(id),$(version))))) + $(foreach package,$(packages_$(id)),$(call CHECK_VERSION,$(id),$(package))))) TEMPDIR := temp-xpi-unpacked -- cgit v1.2.3