Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/openstack/horizon/Makefile
changeset 5427 25b736152081
parent 5405 66fd59fecd68
child 5447 508add8f43f1 
--- a/components/openstack/horizon/Makefile	Tue Feb 09 14:48:07 2016 -0800
+++ b/components/openstack/horizon/Makefile	Tue Feb 09 15:21:35 2016 -0800
@@ -89,7 +89,7 @@
 COMPONENT_ARCHIVE_HASH_2 = \
 	sha256:7cad216b226399cbe8d2909ed5b9f28d724907b9c9e1e078e6e25d320a3d5dd7
 COMPONENT_ARCHIVE_URL_2 = $(call pypi_url,2)
-PKG_MACROS +=		VERSION_ANGULAR=$(VERSION_ANGULAR)
+PKG_VARS +=		VERSION_ANGULAR
 
 COMPONENT_NAME_3 =	XStatic-Bootstrap-Datepicker
 VERSION_BOOTSTRAP_DP=	1.3.1.0
@@ -98,7 +98,7 @@
 COMPONENT_ARCHIVE_HASH_3 = \
 	sha256:9edc9b77501001fcee9fbf4bf0a722c263efd928ef928b40081a8269fdd9a944
 COMPONENT_ARCHIVE_URL_3 = $(call pypi_url,3)
-PKG_MACROS +=		VERSION_BOOTSTRAP_DP=$(VERSION_BOOTSTRAP_DP)
+PKG_VARS +=		VERSION_BOOTSTRAP_DP
 
 COMPONENT_NAME_4 =	XStatic-Bootstrap-SCSS
 VERSION_BOOTSTRAP_SCSS=	3.2.0.0
@@ -107,7 +107,7 @@
 COMPONENT_ARCHIVE_HASH_4 = \
 	sha256:7e9858737e2e6aac921ec7a3fca627e522901c3061611e154ebc0b8a892c7018
 COMPONENT_ARCHIVE_URL_4 = $(call pypi_url,4)
-PKG_MACROS +=		VERSION_BOOTSTRAP_SCSS=$(VERSION_BOOTSTRAP_SCSS)
+PKG_VARS +=		VERSION_BOOTSTRAP_SCSS
 
 COMPONENT_NAME_5 =	XStatic-D3
 VERSION_D3 =		3.1.6.2
@@ -116,7 +116,7 @@
 COMPONENT_ARCHIVE_HASH_5 = \
 	sha256:46fe521f8dad99f5e20f6702180510c37b81d11f1d78119d308fcec31381f90e
 COMPONENT_ARCHIVE_URL_5 = $(call pypi_url,5)
-PKG_MACROS +=		VERSION_D3=$(VERSION_D3)
+PKG_VARS +=		VERSION_D3
 
 COMPONENT_NAME_6 =	XStatic-Font-Awesome
 VERSION_FONT_AWESOME =	4.3.0.0
@@ -125,7 +125,7 @@
 COMPONENT_ARCHIVE_HASH_6 = \
 	sha256:d2c0548990a22744ad20013e1d095de8ba1ea56b1878d8393a721205b03885c3
 COMPONENT_ARCHIVE_URL_6 = $(call pypi_url,6)
-PKG_MACROS +=		VERSION_FONT_AWESOME=$(VERSION_FONT_AWESOME)
+PKG_VARS +=		VERSION_FONT_AWESOME
 
 COMPONENT_NAME_7 =	XStatic-Hogan
 VERSION_HOGAN =		2.0.0.2
@@ -134,7 +134,7 @@
 COMPONENT_ARCHIVE_HASH_7 = \
 	sha256:5941bc7fb2a09916b8837848e6fc2a13b2dfc271811e9b522c61e1337d5fc2bd
 COMPONENT_ARCHIVE_URL_7 = $(call pypi_url,7)
-PKG_MACROS +=		VERSION_HOGAN=$(VERSION_HOGAN)
+PKG_VARS +=		VERSION_HOGAN
 
 COMPONENT_NAME_8 =	XStatic-jQuery
 VERSION_JQUERY =	1.10.2.1
@@ -143,7 +143,7 @@
 COMPONENT_ARCHIVE_HASH_8 = \
 	sha256:83416a6bb86e8534858c4d1ddca45e881c87639da6f78000c28c3a193fe91305
 COMPONENT_ARCHIVE_URL_8 = $(call pypi_url,8)
-PKG_MACROS +=		VERSION_JQUERY=$(VERSION_JQUERY)
+PKG_VARS +=		VERSION_JQUERY
 
 COMPONENT_NAME_9 =	XStatic-JQuery-Migrate
 VERSION_JQUERY_MIGRATE=	1.2.1.1
@@ -152,7 +152,7 @@
 COMPONENT_ARCHIVE_HASH_9 = \
 	sha256:e2959b3df49afdddb00d36b74cca727a91b994b9f4edb993d7264731a750900e
 COMPONENT_ARCHIVE_URL_9 = $(call pypi_url,9)
-PKG_MACROS +=		VERSION_JQUERY_MIGRATE=$(VERSION_JQUERY_MIGRATE)
+PKG_VARS +=		VERSION_JQUERY_MIGRATE
 
 COMPONENT_NAME_10 =	XStatic-jquery-ui
 VERSION_JQUERY_UI =	1.11.0.1
@@ -161,7 +161,7 @@
 COMPONENT_ARCHIVE_HASH_10 = \
 	sha256:099b1836eb0d91b8dc98f5b8a6b856a2631d43af0d47f33ef90ee72ed37bda58
 COMPONENT_ARCHIVE_URL_10 = $(call pypi_url,10)
-PKG_MACROS +=		VERSION_JQUERY_UI=$(VERSION_JQUERY_UI)
+PKG_VARS +=		VERSION_JQUERY_UI
 
 COMPONENT_NAME_11 =	XStatic-JQuery.quicksearch
 VERSION_JQUERY_QS =	2.0.3.1
@@ -170,7 +170,7 @@
 COMPONENT_ARCHIVE_HASH_11 = \
 	sha256:1271571b420417add56c274fd935e81bfc79e0d54a03559d6ba5ef369f358477
 COMPONENT_ARCHIVE_URL_11 = $(call pypi_url,11)
-PKG_MACROS +=		VERSION_JQUERY_QS=$(VERSION_JQUERY_QS)
+PKG_VARS +=		VERSION_JQUERY_QS
 
 COMPONENT_NAME_12 =	XStatic-JQuery.TableSorter
 VERSION_JQUERY_TS =	2.14.5.1
@@ -179,7 +179,7 @@
 COMPONENT_ARCHIVE_HASH_12 = \
 	sha256:3ba24aecd9a3dc71a79dd4096fa5a8a041c3a7b892c61d05e6e46de0605070f0
 COMPONENT_ARCHIVE_URL_12 = $(call pypi_url,12)
-PKG_MACROS +=		VERSION_JQUERY_TS=$(VERSION_JQUERY_TS)
+PKG_VARS +=		VERSION_JQUERY_TS
 
 COMPONENT_NAME_13 =	XStatic-JSEncrypt
 VERSION_JSENCRYPT =	2.0.0.2
@@ -188,7 +188,7 @@
 COMPONENT_ARCHIVE_HASH_13 = \
 	sha256:5852892afc6f80c7848f4110b6dad190a54aeb908271d67aaeae9d966f4a26b5
 COMPONENT_ARCHIVE_URL_13 = $(call pypi_url,13)
-PKG_MACROS +=		VERSION_JSENCRYPT=$(VERSION_JSENCRYPT)
+PKG_VARS +=		VERSION_JSENCRYPT
 
 COMPONENT_NAME_14 =	XStatic-Rickshaw
 VERSION_RICKSHAW =	1.5.0.0
@@ -197,7 +197,7 @@
 COMPONENT_ARCHIVE_HASH_14 = \
 	sha256:147574228757254442700a9eea5150f14acb1224ef0612f896b663ab58406de8
 COMPONENT_ARCHIVE_URL_14 = $(call pypi_url,14)
-PKG_MACROS +=		VERSION_RICKSHAW=$(VERSION_RICKSHAW)
+PKG_VARS +=		VERSION_RICKSHAW
 
 COMPONENT_NAME_15 =	XStatic-Spin
 VERSION_SPIN =		1.2.5.2
@@ -206,7 +206,9 @@
 COMPONENT_ARCHIVE_HASH_15 = \
 	sha256:7f46ef0e45e047019ba6eda22c432fb96f681b97bbe7f1749aa9209e07727192
 COMPONENT_ARCHIVE_URL_15 = $(call pypi_url,15)
-PKG_MACROS +=		VERSION_SPIN=$(VERSION_SPIN)
+PKG_VARS +=		VERSION_SPIN
+
+PKG_VARS +=		COMPONENT_BE_VERSION
 
 COMPONENT_NAME_16 =	XStatic-Angular-lrdragndrop
 VERSION_LR_DND =	1.0.2.2
@@ -263,7 +265,6 @@
 # only need to deliver one version.  The manifest is parameterized, though.
 PYTHON_VERSIONS=	2.7
 
-PKG_MACROS +=		COMPONENT_BE_VERSION=$(COMPONENT_BE_VERSION)
 PKG_MACROS +=		PYVER=$(PYTHON_VERSIONS)
 PKG_MACROS +=		PYV=$(shell echo $(PYTHON_VERSIONS) | tr -d .)
upstream/oracle/userland-gate