From: David Scott Date: Wed, 26 Jan 2011 17:39:04 +0000 (+0000) Subject: Move defaults for environment variables PRODUCT_VERSION, PRODUCT_BRAND, BUILD_NUMBER... X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=45ea560b71bf970273d975557d873b123240c7b9;p=xcp%2Fxen-api.git Move defaults for environment variables PRODUCT_VERSION, PRODUCT_BRAND, BUILD_NUMBER into the OMakefile, to make it easier to use omake directly for building. Signed-off-by: David Scott --- diff --git a/Makefile b/Makefile index d4cbefdf..c55cf098 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,6 @@ -# Set this to some other value on systems with no Xen libs to -# build only the client stuff and the fakeserver. -COMPILE_XENSTUFF=yes -export COMPILE_XENSTUFF - -PRODUCT_VERSION?=unknown -PRODUCT_BRAND?=Rio -BUILD_NUMBER?=6666 COMPILE_NATIVE=yes COMPILE_BYTE=no # bytecode version does not build -export PRODUCT_VERSION PRODUCT_BRAND BUILD_NUMBER COMPILE_NATIVE COMPILE_BYTE +export COMPILE_NATIVE COMPILE_BYTE .PHONY: all all: version diff --git a/OMakefile b/OMakefile index f8c17ec5..b0dfba0e 100644 --- a/OMakefile +++ b/OMakefile @@ -66,6 +66,10 @@ export CLEAN_OBJS COMPILE_OCAML=$(getenv COMPILE_OCAML, yes) COMPILE_JS=$(getenv COMPILE_JS, yes) COMPILE_JAVA=$(getenv COMPILE_JAVA, yes) + +PRODUCT_VERSION=$(getenv PRODUCT_VERSION, unknown) +PRODUCT_BRAND=$(getenv PRODUCT_BRAND, unknown) +BUILD_NUMBER=$(getenv BUILD_NUMBER, -1) export .SUBDIRS: ocaml scripts $(if $(COMPILE_JAVA), java) $(if $(COMPILE_JS), javascript)