Signed-off-by: Rok Strnisa <[email protected]>
Makefile | 12 +++++++----- OMakefile | 4 ++-- export.sh | 8 -------- rebuild | 10 ---------- 4 files changed, 9 insertions(+), 25 deletions(-)
# HG changeset patch # User Rok Strnisa <[email protected]> # Date 1279034099 -3600 # Node ID 259c1b3e9bf68352f8a1f0667dfd57e506a5e31e # Parent a9d00d9121a37d036aacc0defa09d490d0fc6191 Removes the need for the rebuild script. Signed-off-by: Rok Strnisa <[email protected]> diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -4,14 +4,16 @@ COMPILE_XENSTUFF ?= yes export COMPILE_XENSTUFF PRODUCT_VERSION?=unknown -PRODUCT_BRAND?=Miamidev +PRODUCT_BRAND?=Rio BUILD_NUMBER?=6666 -COMPILE_NATIVE?=yes -export PRODUCT_VERSION PRODUCT_BRAND BUILD_NUMBER +COMPILE_NATIVE=yes +COMPILE_BYTE=no # bytecode version does not build +export PRODUCT_VERSION PRODUCT_BRAND BUILD_NUMBER COMPILE_NATIVE COMPILE_BYTE .PHONY: all -all: - omake phase1 phase2 +all: version + omake phase1 + omake phase2 omake lib-uninstall omake lib-install omake phase3 diff --git a/OMakefile b/OMakefile --- a/OMakefile +++ b/OMakefile @@ -78,8 +78,8 @@ export .PHONY: none # Ocaml ############################################################################# -OCAML_PHASE1= -OCAML_PHASE2= autogen_idl $(if $(BYTE_ENABLED), ocaml/idl/ocaml_backend/xapi_client.cma) $(if $(NATIVE_ENABLED), ocaml/idl/ocaml_backend/xapi_client.cmxa) +OCAML_PHASE1= autogen_idl +OCAML_PHASE2= $(if $(BYTE_ENABLED), ocaml/idl/ocaml_backend/xapi_client.cma) $(if $(NATIVE_ENABLED), ocaml/idl/ocaml_backend/xapi_client.cmxa) # JS ################################################################################ JS_PHASE1= diff --git a/export.sh b/export.sh deleted file mode 100755 --- a/export.sh +++ /dev/null @@ -1,8 +0,0 @@ -# run . ./export.sh to export variables to environment in chroot to be able -# to use omake directly -export COMPILE_XENSTUFF=yes -export PRODUCT_VERSION=unknown -export PRODUCT_BRAND=Rio -export BUILD_NUMBER=6666 -export COMPILE_NATIVE=yes - diff --git a/rebuild b/rebuild deleted file mode 100755 --- a/rebuild +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -echo "This is just a temporary fix. Ideally, the effect would be the same when" -echo "just running the following two commands: make clean && make." - -make clean -. ./export.sh -make version -omake ocaml/autogen/aPI.cmx -make
_______________________________________________ xen-api mailing list [email protected] http://lists.xensource.com/mailman/listinfo/xen-api
