[depends] auto-generate xbmc.json's addon.xml

diff --git a/codegenerator.mk b/codegenerator.mk
index 0cd5309..d9d3c9a 100644 (file)
--- a/codegenerator.mk
+++ b/codegenerator.mk
@@ -18,7 +18,7 @@ else
 DOXY_XML_PATH=$(GENDIR)/doxygenxml
 endif
 
-GENERATED_JSON = $(INTERFACES_DIR)/json-rpc/ServiceDescription.h
+GENERATED_JSON = $(INTERFACES_DIR)/json-rpc/ServiceDescription.h addons/xbmc.json/addon.xml
 ifeq ($(wildcard $(JSON_BUILDER)),)
   JSON_BUILDER = $(shell which JsonSchemaBuilder)
 ifeq ($(JSON_BUILDER),)
@@ -51,7 +51,7 @@ $(GENDIR)/%.xml: %.i $(SWIG) $(JAVA) $(GENERATE_DEPS)
        mkdir -p $(GENDIR)
        $(SWIG) -w401 -c++ -o $@ -xml -I$(TOPDIR)/xbmc -xmllang python $<
 
-codegenerated: $(DOXYGEN) $(SWIG) $(JAVA) $(GENERATED) $(GENERATED_JSON)
+codegenerated: $(DOXYGEN) $(SWIG) $(JAVA) $(GENERATED) $(GENERATED_JSON) $(GENERATED_ADDON_JSON)
 
 $(DOXY_XML_PATH): $(SWIG) $(JAVA)
        cd $(INTERFACES_DIR)/python; ($(DOXYGEN) Doxyfile > /dev/null) 2>&1 | grep -v " warning: "

diff --git a/xbmc/interfaces/json-rpc/Makefile b/xbmc/interfaces/json-rpc/Makefile
index b45f03b..4ba5513 100644 (file)
--- a/xbmc/interfaces/json-rpc/Makefile
+++ b/xbmc/interfaces/json-rpc/Makefile
@@ -21,9 +21,11 @@ SRCS=AddonsOperations.cpp \
 LIB=json-rpc.a
 
 GENERATED_JSON = ServiceDescription.h
-JSON_SRC =  schema/version.txt schema/license.txt schema/methods.json schema/types.json schema/notifications.json
+GENERATED_ADDON_JSON = ../../../addons/xbmc.json/addon.xml
+JSON_VERSION_SRC = schema/version.txt
+JSON_SRC =  $(JSON_VERSION_SRC) schema/license.txt schema/methods.json schema/types.json schema/notifications.json
 
-all: $(GENERATED_JSON) $(LIB)
+all: $(GENERATED_JSON) $(GENERATED_ADDON_JSON) $(LIB)
 
 -include ../../../Makefile.include
 ifeq ($(wildcard $(JSON_BUILDER)),)
@@ -33,4 +35,10 @@ endif
 $(GENERATED_JSON): $(JSON_SRC)
        $(JSON_BUILDER) $(JSON_SRC)
 
+.PHONY: $(notdir $(GENERATED_ADDON_JSON))
+$(notdir $(GENERATED_ADDON_JSON)): $(GENERATED_ADDON_JSON)
+
+$(GENERATED_ADDON_JSON): $(JSON_VERSION_SRC)
+       sed s/@jsonrpc_version@/`cat $(JSON_VERSION_SRC)`/g $@.in > $@
+
 -include $(patsubst %.cpp,%.P,$(patsubst %.c,%.P,$(SRCS)))