Move everything over to using Fhs.ml / @ substitution

Note that there should be no user visible change in this changeset;
everything should be the same as it was before.

Signed-off-by: Jon Ludlam <[email protected]>

Author: Jon Ludlam

.gitignore

@@ -197,3 +197,5 @@ ocaml/xenops/memory_breakdown
 ocaml/xenops/squeezed
 ocaml/xenops/squeezed_client
 xapi.spec
+
+ocaml/fhs.*

Makefile

@@ -32,13 +32,17 @@ PLUGINDIR=/etc/xapi.d/plugins
 HOOKSDIR=/etc/xapi.d
 INVENTORY=/etc/xensource-inventory
 XAPICONF=/etc/xapi.conf
-LIBEXECDIR=$(OPTDIR)/libexec
+LIBEXECDIR=/opt/xensource/libexec
 SCRIPTSDIR=/etc/xensource/scripts
+SHAREDIR=/opt/xensource
+WEBDIR=/opt/xensource/www
+XHADIR=/opt/xensource/xha
+BINDIR=/opt/xensource/bin
 
-export VARDIR ETCDIR OPTDIR PLUGINDIR HOOKSDIR INVENTORY VARPATCHDIR LIBEXECDIR XAPICONF SCRIPTSDIR
+export VARDIR ETCDIR OPTDIR PLUGINDIR HOOKSDIR INVENTORY VARPATCHDIR LIBEXECDIR XAPICONF SCRIPTSDIR SHAREDIR WEBDIR XHADIR BINDIR
 
 .PHONY: all
-all: version
+all: version ocaml/fhs.ml
 	omake phase1
 	omake phase2
 	omake phase3
@@ -116,9 +120,13 @@ ocaml/fhs.ml :
 	let libexecdir=\"$(LIBEXECDIR)\"\n \
 	let xapiconf=\"$(XAPICONF)\"\n \
 	let scriptsdir=\"$(SCRIPTSDIR)\"\n \
-	let varpatchdir=\"$(VARPATCHDIR)\"\n" \
+	let varpatchdir=\"$(VARPATCHDIR)\"\n \
+	let webdir=\"$(WEBDIR)\"\n \
+	let xhadir=\"$(XHADIR)\"\n \
+	let bindir=\"$(BINDIR)\"\n \
+	let sharedir=\"$(SHAREDIR)\"\n" \
 	> ocaml/fhs.ml
-	 
+ 
 .PHONY: clean
  clean:
 

OMakefile

@@ -79,7 +79,7 @@ export
 .PHONY: none
 
 # Ocaml #############################################################################
-OCAML_PHASE1= generate_constants autogen_idl
+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 ################################################################################

ocaml/OMakefile

@@ -1,9 +1,11 @@
 # You must set your XEN_ROOT env var before building
 XEN_CFLAGS    = -I$(XEN_ROOT)/usr/include
 OCAMLINCLUDES = +ocamldoc
-OCAML_LIBS    = $(ROOT)/ocaml/util/version $(ROOT)/ocaml/util/stats
+OCAML_LIBS    = $(ROOT)/ocaml/fhs $(ROOT)/ocaml/util/version $(ROOT)/ocaml/util/stats
 OCAMLPACKS    = stdext log
 
+OCamlLibrary(fhs, fhs)
+
 .SUBDIRS: \
 	ptoken \
 	autogen \

ocaml/auth/OMakefile

@@ -1,5 +1,5 @@
 OTHER_CLIBS = -cclib -lpam
-OCAMLINCLUDES += ../autogen ../idl/ocaml_backend ../idl ../xapi 
+OCAMLINCLUDES += ../autogen ../idl/ocaml_backend ../idl ../xapi ..
 
 StaticCLibrary(auth_stubs, xa_auth xa_auth_stubs)
 OCamlLibraryClib(pam, pam, auth_stubs)

ocaml/auth/extauth.ml

@@ -74,7 +74,7 @@ struct
 end
 
 (* some constants *)
-let extauth_hook_script_name = "extauth-hook" (* script name in /etc/xapi.d/plugins/ *)
+let extauth_hook_script_name = "extauth-hook" (* script name in @PLUGINDIR@/ *)
 let event_name_after_subject_add = "after-subject-add"
 let event_name_after_subject_remove = "after-subject-remove"
 let event_name_after_xapi_initialize = "after-xapi-initialize"
@@ -102,10 +102,10 @@ let can_execute_extauth_hook_script ~__context host event_name =
 (* use the generic call below to avoid concurrency problems between the script and host.{enable,disable}_extauth *)
 let call_extauth_hook_script_in_host_wrapper ~__context host event_name ~call_plugin_fn =
 	(* CP-709: call extauth-hook-script *)
-	(* Forkhelpers.execute_command_get_output hook-script "/etc/xapi.d/plugins/extauth-hook" *)
+	(* Forkhelpers.execute_command_get_output hook-script "@PLUGINDIR@/extauth-hook" *)
 	(* fork a new thread and call new xapi.host.call-subject-add-hook-script method *)
 	(* see xapi_sync.ml *)
-	(* host.call-plugins scriptname (calls /etc/xapi.d/plugins/scriptname*)
+	(* host.call-plugins scriptname (calls @PLUGINDIR@/scriptname*)
 
 	if can_execute_extauth_hook_script ~__context host event_name
 	then begin
@@ -148,7 +148,7 @@ let call_extauth_hook_script_in_host ~__context host event_name =
 	let call_plugin_fn () = 
 		Helpers.call_api_functions ~__context (fun rpc session_id ->
 			Client.Client.Host.call_plugin rpc session_id host (* will call extauth plugin with mutex *) 
-			extauth_hook_script_name (* script name in /etc/xapi.d/plugins/ *) 
+			extauth_hook_script_name (* script name in @PLUGINDIR@/ *) 
 			event_name (* event name sent to script *)
 			event_params (* parameters sent to event name *)
 		)

ocaml/auth/extauth_plugin_ADlikewise.ml

@@ -700,7 +700,7 @@ let on_disable config_params =
 	debug "Doing a manual Likewise domain-leave cleanup...";
 	(* When likewise raises an exception during domain-leave, we try again, using *)
 	(* some of the command-line workarounds that Kyle describes in CA-27627: *)
-	let lw_force_domain_leave_script = Xapi_globs.base_path ^ "/libexec/lw-force-domain-leave" in
+	let lw_force_domain_leave_script = Filename.concat Fhs.libexecdir "lw-force-domain-leave" in
 	(try
 		let output, stderr = Forkhelpers.execute_command_get_output lw_force_domain_leave_script [] in
 		debug "execute %s: stdout=[%s],stderr=[%s]" lw_force_domain_leave_script (Stringext.String.replace "\n" ";" output) (Stringext.String.replace "\n" ";" stderr)

ocaml/cdrommon/OMakefile

@@ -1,4 +1,4 @@
-OCAML_LIBS    = ../util/version ../idl/ocaml_backend/common
+OCAML_LIBS    = ../fhs ../util/version ../idl/ocaml_backend/common
 OCAMLINCLUDES = ../xapi
 OCAMLPACKS += unix cdrom
 

ocaml/database/OMakefile

@@ -1,5 +1,5 @@
 
-OCAMLINCLUDES = ../idl/ocaml_backend ../xapi ../idl ../util ../autogen
+OCAMLINCLUDES = ../idl/ocaml_backend ../xapi ../idl ../util ../autogen ..
 OCAMLPACKS    = xml-light2 stdext stunnel http-svr log sexpr rpc-light
 #OCAMLPPFLAGS  = -pp "camlp4o" 
 #OCAMLDEPFLAGS = -pp "camlp4o"
@@ -13,7 +13,7 @@ OCamlProgram(unit_test_sql, unit_test_sql)
 BLOCK_DEVICE_IO_FILES = \
 	block_device_io_errors \
 	block_device_io \
-	../xapi/config_constants ../xapi/xapi_globs ../idl/ocaml_backend/ref \
+	../xapi/xapi_globs ../idl/ocaml_backend/ref \
 	../xapi/helper_process ../xapi/helper_hostname ../idl/api_errors
 
 OCamlProgram(block_device_io, $(BLOCK_DEVICE_IO_FILES))
@@ -28,7 +28,7 @@ section:
 	OCamlProgram(database_test, $(DATABASE_TEST_FILES))
 
 section:
-	OCAML_LIBS +=  ../idl/ocaml_backend/common ../idl/ocaml_backend/client ../idl/ocaml_backend/server
+	OCAML_LIBS += ../idl/ocaml_backend/common ../idl/ocaml_backend/client ../idl/ocaml_backend/server
 	OCamlProgram(unit_test_marshall, unit_test_marshall db_remote_cache_access_v1)
 
 .PHONY: install

ocaml/database/redo_log.ml

@@ -202,7 +202,7 @@ let string_to_redo_log_entry str =
 exception RedoLogFailure of string
 exception CommunicationsProblem of string
 
-let prog = Xapi_globs.base_path ^ "/libexec/block_device_io"
+let prog = Filename.concat Fhs.libexecdir "block_device_io"
 
 let generation_size = 16
 let length_size = 16