Merge pull request #2769 from euanh/sync-with-transformer

xapi.spec: Remove www sub-package

Author: Jon Ludlam

OMakefile

@@ -122,15 +122,14 @@ clean:
 	rm -f $(CLEAN_OBJS)
 
 COMPILE_OCAML=$(getenv COMPILE_OCAML, yes)
-COMPILE_JS=$(getenv COMPILE_JS, yes)
 COMPILE_JAVA=$(getenv COMPILE_JAVA, no)
 
 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)
+.SUBDIRS: ocaml scripts $(if $(COMPILE_JAVA), java)
 
 export
 
@@ -141,20 +140,11 @@ 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=
-JS_PHASE2=js_binding
-JS_PHASE3=
-
 # Java ##############################################################################
 JAVA_PHASE1= XenServerConsole.jar
 JAVA_PHASE2=
 JAVA_PHASE3=
 
-JS_PHASE1_TARGETS = $(if $(COMPILE_JS), $(JS_PHASE1))
-JS_PHASE2_TARGETS = $(if $(COMPILE_JS), $(JS_PHASE2))
-JS_PHASE3_TARGETS = $(if $(COMPILE_JS), $(JS_PHASE3))
-
 JAVA_PHASE1_TARGETS = $(if $(COMPILE_JAVA), $(JAVA_PHASE1))
 JAVA_PHASE2_TARGETS = $(if $(COMPILE_JAVA), $(JAVA_PHASE2))
 JAVA_PHASE3_TARGETS = $(if $(COMPILE_JAVA), $(JAVA_PHASE3))
@@ -207,16 +197,16 @@ OCAML_PHASE3_TARGETS = $(if $(COMPILE_OCAML), $(OCAML_PHASE3))
 
 # phase1: build stdlib2
 .PHONY: phase1
-phase1: $(OCAML_PHASE1_TARGETS) $(JS_PHASE1_TARGETS) $(JAVA_PHASE1_TARGETS)
+phase1: $(OCAML_PHASE1_TARGETS) $(JAVA_PHASE1_TARGETS)
 	mkdir -p $(DIST) $(DIST)/bin
 
 # phase2: build compilers and make autogenerated files
 .PHONY: phase2
-phase2: $(OCAML_PHASE2_TARGETS) $(JS_PHASE2_TARGETS) $(JAVA_PHASE2_TARGETS)
+phase2: $(OCAML_PHASE2_TARGETS) $(JAVA_PHASE2_TARGETS)
 
 # phase3: use autogenerated files to make apps
 .PHONY: phase3
-phase3: $(OCAML_PHASE3_TARGETS) $(JS_PHASE3_TARGETS) $(JAVA_PHASE3_TARGETS)
+phase3: $(OCAML_PHASE3_TARGETS) $(JAVA_PHASE3_TARGETS)
 
 .PHONY: test
 test: ocaml/test/suite ocaml/database/database_test