Add schema submodule to handle OPTIMADE schema dependencies

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "tools/optimade-property-tools"]
-	path = tools/optimade-property-tools
+	path = dependencies/submodules/optimade-property-tools
 	url = https://github.com/Materials-Consortia/optimade-property-tools.git
+[submodule "dependencies/submodules/schemas"]
+	path = dependencies/submodules/schemas
+	url = https://github.com/Materials-Consortia/schemas

GNUmakefile

@@ -8,20 +8,31 @@
 .PHONY: all
 all: schemas
 
-# You may need to edit these configuration options
+###############################
+# Basic configuration options #
+###############################
+
 # Path to the process_schemas program
-PROCESS_SCHEMAS=tools/optimade-property-tools/bin/process_schemas
-# Path to the OPTIMADE specification schemas folder
-OPTIMADE_SCHEMAS_DIR=../OPTIMADE/schemas/output
+PROCESS_SCHEMAS=dependencies/submodules/optimade-property-tools/bin/process_schemas
 # The base of the URI for the generated property definitions
 BASEID=https://schemas.optimade.org/namespaces/cheminformatics/v0.1/
 # The versioned directory being processed
 BASEDIR=src/v0.1.0
-
-# You probably do not need to edit these
-META_SCHEMA_PATH=$(OPTIMADE_SCHEMAS_DIR)/meta/v1.2
+# The versions of the meta-schemas to use
+META_SCHEMA_VER=v1.2
+
+#################################
+# Advanced configuation options #
+#################################
+
+# Path to the OPTIMADE schemas repo
+OPTIMADE_SCHEMAS_DIR=dependencies/submodules/schemas
+# Path to the meta-schemas to use
+META_SCHEMA_PATH=$(OPTIMADE_SCHEMAS_DIR)/meta/$(META_SCHEMA_VER)
+# Add the OPTIMADE schemas repo as a path relative to which resolve $$inherit
 RESOLVE_PATHS_ARGS=--resolve-path $(OPTIMADE_SCHEMAS_DIR)
 
+
 ifeq ($(origin schemas_html_pretty), undefined)
 	OPTIMADE_HTML_HEADER ?=
 	OPTIMADE_HTML_TOP ?=
@@ -42,7 +53,7 @@ else
 	SCHEMAS_HTML_EXT = .html
 endif
 
-EXT_SCHEMAS := $(filter-out tools/optimade-property-tools/external/json-schema/LICENSE, $(wildcard tools/optimade-property-tools/external/json-schema/*))
+EXT_SCHEMAS := $(filter-out dependencies/submodules/optimade-property-tools/external/json-schema/LICENSE, $(wildcard dependencies/submodules/optimade-property-tools/external/json-schema/*))
 EXT_SCHEMAS_ARGS := $(foreach schema,$(EXT_SCHEMAS),--schema $(schema))
 
 META_SCHEMAS_JSON := $(wildcard $(META_SCHEMA_PATH)/optimade/*.json)

README.md

@@ -7,6 +7,10 @@ Repository for the cheminformatics namespace.
    ```
    git clone --recurse-submodules https://github.com/Materials-Consortia/namespace-cheminformatics.git
    ```
+   Or, if you have already cloned this repo without the submodules, init them with:
+   ```
+   git submodule update --init --recursive
+   ```
 
 2. Run make.