Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop lock files and their handling in the package system #370

Merged
merged 28 commits into from
Nov 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
f353f0d
begin to develop lock files
gfngfn Oct 29, 2022
4042936
develop 'LockConfig'
gfngfn Oct 29, 2022
8032ea5
develop 'ClosedLockDependencyResolver'
gfngfn Oct 29, 2022
1b57b87
make 'demo.saty' compile
gfngfn Oct 29, 2022
cf87e3d
make 'doc-primitives.saty' compile
gfngfn Oct 29, 2022
7ed051d
make 'doc-lang.saty' compile
gfngfn Oct 29, 2022
4628b61
make 'math1.saty' compile
gfngfn Oct 29, 2022
5be494d
make 'tests/**/*.saty' compile
gfngfn Oct 29, 2022
50c6e2e
slight refactoring of 'YamlDecoder'
gfngfn Oct 29, 2022
c7a98d1
add contexts to 'YamlDecoder.error'
gfngfn Oct 29, 2022
828140f
Merge branch 'dev-0-1-0-package-system' into dev-0-1-0-lock-file
gfngfn Nov 1, 2022
2b5a855
remove 'OpenPackageDependencyResolver'
gfngfn Nov 1, 2022
fc0b29f
refactor 'ClosedFileDependencyResolver'
gfngfn Nov 1, 2022
00685b8
add 'CannotUseHeaderUseOf'
gfngfn Nov 1, 2022
bcf9776
remove 'fileDependencyGraph.{ml,mli}'
gfngfn Nov 1, 2022
15d25a9
slight improvement on 'FileModuleNameConflict'
gfngfn Nov 1, 2022
ae8f50f
improve error propagation around 'YamlDecoder' and 'Config'
gfngfn Nov 1, 2022
56df525
move 'stdlib'
gfngfn Nov 2, 2022
255c55e
move 'math'
gfngfn Nov 2, 2022
921f91b
move 'code'
gfngfn Nov 2, 2022
892ed44
move 'annot'
gfngfn Nov 2, 2022
cd296e3
move 'itemize'
gfngfn Nov 2, 2022
7ec14c4
move 'tabular'
gfngfn Nov 2, 2022
5998011
move 'footnote-scheme'
gfngfn Nov 2, 2022
9dac222
move 'proof'
gfngfn Nov 2, 2022
c509f94
move 'md-ja'
gfngfn Nov 2, 2022
86a1a17
move 'std-ja{,-report,-book}'
gfngfn Nov 2, 2022
0b4c770
lessen contents of package config files
gfngfn Nov 2, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions demo/demo.satysfi-lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
locks:
- name: "stdlib.0.0.1"
location:
type: "global"
path: "./dist/packages/stdlib/stdlib.0.0.1/"

- name: "math.0.0.1"
location:
type: "global"
path: "./dist/packages/math/math.0.0.1/"
dependencies:
- "stdlib.0.0.1"

- name: "std-ja-book.0.0.1"
dependencies:
- "stdlib.0.0.1"
- "math.0.0.1"
- "annot.0.0.1"
- "code.0.0.1"
- "footnote-scheme.0.0.1"
location:
type: "global"
path: "./dist/packages/std-ja-book/std-ja-book.0.0.1/"

- name: "annot.0.0.1"
location:
type: "global"
path: "./dist/packages/annot/annot.0.0.1/"
dependencies:
- "stdlib.0.0.1"

- name: "code.0.0.1"
location:
type: "global"
path: "./dist/packages/code/code.0.0.1/"
dependencies:
- "stdlib.0.0.1"

- name: "footnote-scheme.0.0.1"
location:
type: "global"
path: "./dist/packages/footnote-scheme/footnote-scheme.0.0.1/"
dependencies:
- "stdlib.0.0.1"

- name: "itemize.0.0.1"
location:
type: "global"
path: "./dist/packages/itemize/itemize.0.0.1"
dependencies:
- "stdlib.0.0.1"

- name: "proof.0.0.1"
location:
type: "global"
path: "./dist/packages/proof/proof.0.0.1"
dependencies:
- "stdlib.0.0.1"

- name: "tabular.0.0.1"
location:
type: "global"
path: "./dist/packages/tabular/tabular.0.0.1"
dependencies:
- "stdlib.0.0.1"
36 changes: 36 additions & 0 deletions doc/doc-lang.satysfi-lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
locks:
- name: "stdlib.0.0.1"
location:
type: "global"
path: "./dist/packages/stdlib/stdlib.0.0.1/"

- name: "math.0.0.1"
location:
type: "global"
path: "./dist/packages/math/math.0.0.1/"
dependencies:
- "stdlib.0.0.1"

- name: "std-ja.0.0.1"
dependencies:
- "stdlib.0.0.1"
- "math.0.0.1"
- "annot.0.0.1"
- "code.0.0.1"
location:
type: "global"
path: "./dist/packages/std-ja/std-ja.0.0.1/"

- name: "annot.0.0.1"
location:
type: "global"
path: "./dist/packages/annot/annot.0.0.1/"
dependencies:
- "stdlib.0.0.1"

- name: "code.0.0.1"
location:
type: "global"
path: "./dist/packages/code/code.0.0.1/"
dependencies:
- "stdlib.0.0.1"
51 changes: 51 additions & 0 deletions doc/doc-primitives.satysfi-lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
locks:
- name: "stdlib.0.0.1"
location:
type: "global"
path: "./dist/packages/stdlib/stdlib.0.0.1/"

- name: "math.0.0.1"
location:
type: "global"
path: "./dist/packages/math/math.0.0.1/"
dependencies:
- "stdlib.0.0.1"

- name: "std-ja-book.0.0.1"
dependencies:
- "stdlib.0.0.1"
- "math.0.0.1"
- "annot.0.0.1"
- "code.0.0.1"
- "footnote-scheme.0.0.1"
location:
type: "global"
path: "./dist/packages/std-ja-book/std-ja-book.0.0.1/"

- name: "annot.0.0.1"
location:
type: "global"
path: "./dist/packages/annot/annot.0.0.1/"
dependencies:
- "stdlib.0.0.1"

- name: "code.0.0.1"
location:
type: "global"
path: "./dist/packages/code/code.0.0.1/"
dependencies:
- "stdlib.0.0.1"

- name: "footnote-scheme.0.0.1"
location:
type: "global"
path: "./dist/packages/footnote-scheme/footnote-scheme.0.0.1/"
dependencies:
- "stdlib.0.0.1"

- name: "itemize.0.0.1"
location:
type: "global"
path: "./dist/packages/itemize/itemize.0.0.1"
dependencies:
- "stdlib.0.0.1"
50 changes: 50 additions & 0 deletions doc/math1.satysfi-lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
locks:
- name: "stdlib.0.0.1"
location:
type: "global"
path: "./dist/packages/stdlib/stdlib.0.0.1/"

- name: "math.0.0.1"
location:
type: "global"
path: "./dist/packages/math/math.0.0.1/"
dependencies:
- "stdlib.0.0.1"

- name: "proof.0.0.1"
location:
type: "global"
path: "./dist/packages/proof/proof.0.0.1"
dependencies:
- "stdlib.0.0.1"

- name: "tabular.0.0.1"
location:
type: "global"
path: "./dist/packages/tabular/tabular.0.0.1"
dependencies:
- "stdlib.0.0.1"

- name: "std-ja.0.0.1"
dependencies:
- "stdlib.0.0.1"
- "math.0.0.1"
- "annot.0.0.1"
- "code.0.0.1"
location:
type: "global"
path: "./dist/packages/std-ja/std-ja.0.0.1/"

- name: "annot.0.0.1"
location:
type: "global"
path: "./dist/packages/annot/annot.0.0.1/"
dependencies:
- "stdlib.0.0.1"

- name: "code.0.0.1"
location:
type: "global"
path: "./dist/packages/code/code.0.0.1/"
dependencies:
- "stdlib.0.0.1"
6 changes: 0 additions & 6 deletions lib-satysfi/dist/packages/Annot/satysfi.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions lib-satysfi/dist/packages/Code/satysfi.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions lib-satysfi/dist/packages/FootnoteScheme/satysfi.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions lib-satysfi/dist/packages/Itemize/satysfi.yaml

This file was deleted.

11 changes: 0 additions & 11 deletions lib-satysfi/dist/packages/MDJa/satysfi.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions lib-satysfi/dist/packages/Math/satysfi.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions lib-satysfi/dist/packages/Proof/satysfi.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions lib-satysfi/dist/packages/StdJa/satysfi.yaml

This file was deleted.

10 changes: 0 additions & 10 deletions lib-satysfi/dist/packages/StdJaBook/satysfi.yaml

This file was deleted.

10 changes: 0 additions & 10 deletions lib-satysfi/dist/packages/StdJaReport/satysfi.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions lib-satysfi/dist/packages/Stdlib/satysfi.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions lib-satysfi/dist/packages/Tabular/satysfi.yaml

This file was deleted.

6 changes: 6 additions & 0 deletions lib-satysfi/dist/packages/annot/annot.0.0.1/satysfi.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: "0.1.0"
contents:
type: "library"
main_module: "Annot"
source_directories:
- "./src"
6 changes: 6 additions & 0 deletions lib-satysfi/dist/packages/code/code.0.0.1/satysfi.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: "0.1.0"
contents:
type: "library"
main_module: "Code"
source_directories:
- "./src"
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: "0.1.0"
contents:
type: "library"
main_module: "FootnoteScheme"
source_directories:
- "./src"
6 changes: 6 additions & 0 deletions lib-satysfi/dist/packages/itemize/itemize.0.0.1/satysfi.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: "0.1.0"
contents:
type: "library"
main_module: "Itemize"
source_directories:
- "./src"
6 changes: 6 additions & 0 deletions lib-satysfi/dist/packages/math/math.0.0.1/satysfi.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: "0.1.0"
contents:
type: "library"
main_module: "Math"
source_directories:
- "./src"
6 changes: 6 additions & 0 deletions lib-satysfi/dist/packages/md-ja/md-ja.0.0.1/satysfi.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: "0.1.0"
contents:
type: "library"
main_module: "MDJa"
source_directories:
- "./src"
6 changes: 6 additions & 0 deletions lib-satysfi/dist/packages/proof/proof.0.0.1/satysfi.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: "0.1.0"
contents:
type: "library"
main_module: "Proof"
source_directories:
- "./src"
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: "0.1.0"
contents:
type: "library"
main_module: "StdJaBook"
source_directories:
- "./src"
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: "0.1.0"
contents:
type: "library"
main_module: "StdJaReport"
source_directories:
- "./src"
6 changes: 6 additions & 0 deletions lib-satysfi/dist/packages/std-ja/std-ja.0.0.1/satysfi.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: "0.1.0"
contents:
type: "library"
main_module: "StdJa"
source_directories:
- "./src"
6 changes: 6 additions & 0 deletions lib-satysfi/dist/packages/stdlib/stdlib.0.0.1/satysfi.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: "0.1.0"
contents:
type: "library"
main_module: "Stdlib"
source_directories:
- "./src"
6 changes: 6 additions & 0 deletions lib-satysfi/dist/packages/tabular/tabular.0.0.1/satysfi.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: "0.1.0"
contents:
type: "library"
main_module: "Tabular"
source_directories:
- "./src"
Loading