Commit 2dcaaa55 authored by Jonathon Duerig's avatar Jonathon Duerig

Added version tag to the top of schema files. Added a GNUmakefile in the 0.1...

Added version tag to the top of schema files. Added a GNUmakefile in the 0.1 subdir so that it installs its files to lib/assign. Removed that functionality from rspec GNUmakefile and made it properly recursive. Changed xsdgen to automatically upload schema files to their proper web location on ops.
parent 16f496d4
......@@ -2710,6 +2710,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
protogeni/xmlrpc/GNUmakefile protogeni/lib/GNUmakefile \
protogeni/scripts/GNUmakefile protogeni/etc/GNUmakefile \
protogeni/test/GNUmakefile protogeni/rspec/GNUmakefile \
protogeni/rspec/0.1/GNUmakefile \
collab/GNUmakefile \
collab/trac/GNUmakefile \
collab/jabber/GNUmakefile \
......
......@@ -992,6 +992,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
protogeni/xmlrpc/GNUmakefile protogeni/lib/GNUmakefile \
protogeni/scripts/GNUmakefile protogeni/etc/GNUmakefile \
protogeni/test/GNUmakefile protogeni/rspec/GNUmakefile \
protogeni/rspec/0.1/GNUmakefile \
collab/GNUmakefile \
collab/trac/GNUmakefile \
collab/jabber/GNUmakefile \
......
......@@ -11,6 +11,7 @@
<!--
Common definitions for advertisements, requests, and tickets
Version 0.1
-->
<xs:element name="node" type="rspec:NodeContents"/>
......
......@@ -12,6 +12,7 @@
Definition of common data structures used for representing topologies -
shared between vtop (virtual topology) and ptop (physical topology)
formats.
Version 0.1
-->
<xs:element name="node_type">
......
......@@ -6,6 +6,7 @@
#
# Prototype of an advertisement RSpec, to be used by ProtoGENI
# Version 0.1
#
default namespace = "http://www.protogeni.net/resources/rspec/0.1"
......
......@@ -9,6 +9,7 @@
<!--
Prototype of an advertisement RSpec, to be used by ProtoGENI
Version 0.1
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.protogeni.net/resources/rspec/0.1" xmlns:rspec="http://www.protogeni.net/resources/rspec/0.1">
......
......@@ -6,6 +6,7 @@
#
# Common definitions for advertisements, requests, and tickets
# Version 0.1
#
include "top.rnc"
......
......@@ -11,6 +11,7 @@
<!--
Common definitions for advertisements, requests, and tickets
Version 0.1
-->
<xs:element name="node" type="rspec:NodeContents"/>
......
......@@ -9,6 +9,7 @@
<!--
Prototype of a request RSpec, to be used by ProtoGENI
Version 0.1
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.protogeni.net/resources/rspec/0.1" xmlns:rspec="http://www.protogeni.net/resources/rspec/0.1">
......
......@@ -12,6 +12,7 @@
Definition of common data structures used for representing topologies -
shared between vtop (virtual topology) and ptop (physical topology)
formats.
Version 0.1
-->
<xs:element name="node_type">
......
......@@ -6,6 +6,7 @@
#
# Schema for a manifest RSpec, to be used by ProtoGENI
# Version 0.1
#
include "request.rnc"
......
......@@ -11,6 +11,7 @@
<!--
Schema for a manifest RSpec, to be used by ProtoGENI
Version 0.1
-->
</xs:schema>
......@@ -11,6 +11,7 @@
<!--
Common definitions for advertisements, requests, and tickets
Version 0.1
-->
<xs:element name="node" type="rspec:NodeContents"/>
......
......@@ -12,6 +12,7 @@
Definition of common data structures used for representing topologies -
shared between vtop (virtual topology) and ptop (physical topology)
formats.
Version 0.1
-->
<xs:element name="node_type">
......
......@@ -6,6 +6,7 @@
#
# Prototype of a request RSpec, to be used by ProtoGENI
# Version 0.1
#
default namespace = "http://www.protogeni.net/resources/rspec/0.1"
......
......@@ -9,6 +9,7 @@
<!--
Prototype of a request RSpec, to be used by ProtoGENI
Version 0.1
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://www.protogeni.net/resources/rspec/0.1" xmlns:rspec="http://www.protogeni.net/resources/rspec/0.1">
......
......@@ -8,6 +8,7 @@
# Definition of common data structures used for representing topologies -
# shared between vtop (virtual topology) and ptop (physical topology)
# formats.
# Version 0.1
#
## Representation of a single node type
......
......@@ -11,23 +11,24 @@ SUBDIR = protogeni/rspec
include $(OBJDIR)/Makeconf
SCHEMATA = rspec-ad-common.xsd rspec-ad-top.xsd rspec-ad.xsd \
rspec-request-common.xsd rspec-request-top.xsd \
rspec-request.xsd
SUBDIRS = 0.1
# No explicit dependencies here. xsdgen must be run manually if necessary.
all:
# xsdgen must be run manually if necessary.
all: all-subdirs
include $(TESTBED_SRCDIR)/GNUmakerules
install: $(addprefix $(INSTALL_LIBDIR)/assign/, $(SCHEMATA))
install:
@$(MAKE) -C 0.1 install
control-install:
clean:
rm -f *.o core
clean: clean-subdirs
$(INSTALL_LIBDIR)/assign/%: %
@echo "Installing $<"
-mkdir -p $(INSTALL_LIBDIR)/assign
$(INSTALL) $< $@
# How to recursively descend into subdirectories to make general
# targets such as `all'.
%.MAKE:
@$(MAKE) -C $(dir $@) $(basename $(notdir $@))
%-subdirs: $(addsuffix /%.MAKE,$(SUBDIRS)) ;
.PHONY: $(SUBDIRS) install
......@@ -40,4 +40,6 @@ for path in 0.1; do
sed "s/common.xsd/${schema}-common.xsd/" ${path}/${schema}.xsd > ${path}/${schema}.tmp
mv ${path}/${schema}.tmp ${path}/${schema}.xsd
done
sudo scp ${path}/*.xsd ${path}/*.rnc ops.emulab.net:/usr/local/www.geni/data/trac/resources/rspec/${path}/
done
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment