Skip to content

Commit 8495cd0

Browse files
committed
Merge branch 'Release-0.8.0'
AJN: I am merging this on behalf of Sean, with his permission, due to technical issues.
2 parents 8aad76d + 3c5c43d commit 8495cd0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2645
-765
lines changed

Makefile

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,10 @@
1313

1414
SHELL := /bin/bash
1515

16-
turtle_directories := $(shell find uco-* -type d -maxdepth 0 | sort)
17-
18-
all_directories := $(foreach turtle_directory,$(turtle_directories),all-$(turtle_directory))
19-
20-
check_directories := $(foreach turtle_directory,$(turtle_directories),check-$(turtle_directory))
21-
22-
clean_directories := $(foreach turtle_directory,$(turtle_directories),clean-$(turtle_directory))
23-
2416
all: \
25-
$(all_directories)
26-
27-
all-%: \
28-
% \
2917
.lib.done.log
3018
$(MAKE) \
31-
--directory $< \
32-
--file $$PWD/src/review.mk
19+
--directory ontology
3320

3421
# This recipe guarantees that 'git submodule init' and 'git submodule update' have run at least once.
3522
# The recipe avoids running 'git submodule update' more than once, in case a user is testing with the submodule at a different commit than what UCO tracks.
@@ -48,32 +35,25 @@ all-%: \
4835
touch $@
4936

5037
check: \
51-
$(check_directories) \
52-
.git_submodule_init.done.log
38+
.git_submodule_init.done.log \
39+
.lib.done.log
5340
$(MAKE) \
54-
--directory tests \
41+
--directory ontology \
5542
check
56-
57-
check-%: \
58-
% \
59-
.lib.done.log
6043
$(MAKE) \
61-
--directory $< \
62-
--file $$PWD/src/review.mk \
44+
--directory tests \
6345
check
6446

6547
clean: \
66-
$(clean_directories) \
67-
clean-tests
48+
clean-tests \
49+
clean-ontology
6850
@rm -f \
6951
.git_submodule_init.done.log \
7052
.lib.done.log
7153

72-
clean-%: \
73-
%
54+
clean-ontology:
7455
@$(MAKE) \
75-
--directory $< \
76-
--file $$PWD/src/review.mk \
56+
--directory ontology \
7757
clean
7858

7959
clean-tests:

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Through this approach not only are domain-focused representations defined consis
1313
The purpose of this repository is to provide a foundation for broader community involvement in defining what to represent and how.
1414

1515
### Current Release
16-
The current release of UCO is 0.7.0
16+
The current release of UCO is 0.8.0.
1717

18-
UCO Version 0.7.0 is primarily focused on conversion of UCO ontologies to leverage the Shapes Constraint Language (SHACL) rather than domain assertions and owl property restrictions to define class shapes. In addition, it added a continuous integration (CI) method for testing and verifying the ontology and it corrects several minor issues and bugs.
18+
UCO 0.8.0 is primarily focused on an initial implementation of Shapes Constraint Language (SHACL) review of semi-open vocabulary usage, restructuring of all UCO ontology IRIs and file structures to enable delivery of ontology resources from a new subdomain, flattening action:ActionReferencesFacet properties directly onto action:Action, normalizing decimal number properties to xsd:decimal, improvements to unit and CI testing, numerous modifications and improvements to the Observable namespace, and correcting several minor issues and bugs.
1919

20-
Future versions of UCO will not only expand and refine the ontology itself but will also provide more complete and formalized documentation.
20+
More detail of improvements is documented in the [UCO 0.8.0 release notes](https://unifiedcyberontology.org/releases/0.8.0/).

ontology/Makefile

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
#!/usr/bin/make -f
2+
3+
# This software was developed at the National Institute of Standards
4+
# and Technology by employees of the Federal Government in the course
5+
# of their official duties. Pursuant to title 17 Section 105 of the
6+
# United States Code this software is not subject to copyright
7+
# protection and is in the public domain. NIST assumes no
8+
# responsibility whatsoever for its use by other parties, and makes
9+
# no guarantees, expressed or implied, about its quality,
10+
# reliability, or any other characteristic.
11+
#
12+
# We would appreciate acknowledgement if the software is used.
13+
14+
SHELL := /bin/bash
15+
16+
top_srcdir := $(shell cd .. ; pwd)
17+
18+
turtle_directories := $(shell find * -type d -maxdepth 0 | sort)
19+
20+
all_directories := $(foreach turtle_directory,$(turtle_directories),all-$(turtle_directory))
21+
22+
check_directories := $(foreach turtle_directory,$(turtle_directories),check-$(turtle_directory))
23+
24+
clean_directories := $(foreach turtle_directory,$(turtle_directories),clean-$(turtle_directory))
25+
26+
all: \
27+
$(all_directories)
28+
29+
all-%: \
30+
% \
31+
$(top_srcdir)/.lib.done.log
32+
$(MAKE) \
33+
--directory $< \
34+
--file $(top_srcdir)/src/review.mk
35+
36+
check: \
37+
$(check_directories)
38+
39+
check-%: \
40+
% \
41+
$(top_srcdir)/.lib.done.log
42+
$(MAKE) \
43+
--directory $< \
44+
--file $(top_srcdir)/src/review.mk \
45+
check
46+
47+
clean: \
48+
$(clean_directories)
49+
50+
clean-%: \
51+
%
52+
@$(MAKE) \
53+
--directory $< \
54+
--file $(top_srcdir)/src/review.mk \
55+
clean

0 commit comments

Comments
 (0)