Removes the need for the rebuild script.

Signed-off-by: Rok Strnisa <rok.strnisa@citrix.com>

diff --git a/Makefile b/Makefile
index ec3e96456d6d5e19ada3f7892e46af3776047c22..6605ac9f069fcbcbba301ee425e3358007992d22 100644 (file)
--- 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
index e3a03e2239be4a0219def233fe5ff2b64286cb9c..205dfdfde3c76d1b1472b9990800a16957a79c32 100644 (file)
--- 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 (executable)
index 6fc3945..0000000
--- 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 (executable)
index 568516f..0000000
--- 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