Merge pull request #380 from gfngfn/dev-0-1-0-discard-dist-and-local

[WIP] Discard `dist/` and `local/`
gfngfn · Dec 6, 2022 · ffc588a · ffc588a
2 parents 27ac5d8 + 97474e2
commit ffc588a
Show file tree

Hide file tree

Showing 101 changed files with 149 additions and 149 deletions.
diff --git a/demo/demo.satysfi-lock-expected b/demo/demo.satysfi-lock-expected
@@ -2,74 +2,74 @@ locks:
 - name: annot.0.0.1
   location:
     type: global
-    path: ./dist/packages/annot/annot.0.0.1
+    path: ./packages/annot/annot.0.0.1
   dependencies:
   - stdlib.0.0.1
   test_only: false
 - name: code.0.0.1
   location:
     type: global
-    path: ./dist/packages/code/code.0.0.1
+    path: ./packages/code/code.0.0.1
   dependencies:
   - stdlib.0.0.1
   - font-latin-modern.0.0.1
   test_only: false
 - name: font-ipa-ex.0.0.1
   location:
     type: global
-    path: ./dist/packages/font-ipa-ex/font-ipa-ex.0.0.1
+    path: ./packages/font-ipa-ex/font-ipa-ex.0.0.1
   dependencies: []
   test_only: false
 - name: font-junicode.0.0.1
   location:
     type: global
-    path: ./dist/packages/font-junicode/font-junicode.0.0.1
+    path: ./packages/font-junicode/font-junicode.0.0.1
   dependencies: []
   test_only: false
 - name: font-latin-modern.0.0.1
   location:
     type: global
-    path: ./dist/packages/font-latin-modern/font-latin-modern.0.0.1
+    path: ./packages/font-latin-modern/font-latin-modern.0.0.1
   dependencies: []
   test_only: false
 - name: font-latin-modern-math.0.0.1
   location:
     type: global
-    path: ./dist/packages/font-latin-modern-math/font-latin-modern-math.0.0.1
+    path: ./packages/font-latin-modern-math/font-latin-modern-math.0.0.1
   dependencies: []
   test_only: false
 - name: footnote-scheme.0.0.1
   location:
     type: global
-    path: ./dist/packages/footnote-scheme/footnote-scheme.0.0.1
+    path: ./packages/footnote-scheme/footnote-scheme.0.0.1
   dependencies:
   - stdlib.0.0.1
   test_only: false
 - name: itemize.0.0.1
   location:
     type: global
-    path: ./dist/packages/itemize/itemize.0.0.1
+    path: ./packages/itemize/itemize.0.0.1
   dependencies:
   - stdlib.0.0.1
   test_only: false
 - name: math.0.0.1
   location:
     type: global
-    path: ./dist/packages/math/math.0.0.1
+    path: ./packages/math/math.0.0.1
   dependencies:
   - stdlib.0.0.1
   test_only: false
 - name: proof.0.0.1
   location:
     type: global
-    path: ./dist/packages/proof/proof.0.0.1
+    path: ./packages/proof/proof.0.0.1
   dependencies:
   - stdlib.0.0.1
   test_only: false
 - name: std-ja-book.0.0.1
   location:
     type: global
-    path: ./dist/packages/std-ja-book/std-ja-book.0.0.1
+    path: ./packages/std-ja-book/std-ja-book.0.0.1
   dependencies:
   - stdlib.0.0.1
   - math.0.0.1
@@ -84,13 +84,13 @@ locks:
 - name: stdlib.0.0.1
   location:
     type: global
-    path: ./dist/packages/stdlib/stdlib.0.0.1
+    path: ./packages/stdlib/stdlib.0.0.1
   dependencies: []
   test_only: false
 - name: tabular.0.0.1
   location:
     type: global
-    path: ./dist/packages/tabular/tabular.0.0.1
+    path: ./packages/tabular/tabular.0.0.1
   dependencies:
   - stdlib.0.0.1
   test_only: false
diff --git a/doc/doc-lang.satysfi-lock-expected b/doc/doc-lang.satysfi-lock-expected
@@ -2,53 +2,53 @@ locks:
 - name: annot.0.0.1
   location:
     type: global
-    path: ./dist/packages/annot/annot.0.0.1
+    path: ./packages/annot/annot.0.0.1
   dependencies:
   - stdlib.0.0.1
   test_only: false
 - name: code.0.0.1
   location:
     type: global
-    path: ./dist/packages/code/code.0.0.1
+    path: ./packages/code/code.0.0.1
   dependencies:
   - stdlib.0.0.1
   - font-latin-modern.0.0.1
   test_only: false
 - name: font-ipa-ex.0.0.1
   location:
     type: global
-    path: ./dist/packages/font-ipa-ex/font-ipa-ex.0.0.1
+    path: ./packages/font-ipa-ex/font-ipa-ex.0.0.1
   dependencies: []
   test_only: false
 - name: font-junicode.0.0.1
   location:
     type: global
-    path: ./dist/packages/font-junicode/font-junicode.0.0.1
+    path: ./packages/font-junicode/font-junicode.0.0.1
   dependencies: []
   test_only: false
 - name: font-latin-modern.0.0.1
   location:
     type: global
-    path: ./dist/packages/font-latin-modern/font-latin-modern.0.0.1
+    path: ./packages/font-latin-modern/font-latin-modern.0.0.1
   dependencies: []
   test_only: false
 - name: font-latin-modern-math.0.0.1
   location:
     type: global
-    path: ./dist/packages/font-latin-modern-math/font-latin-modern-math.0.0.1
+    path: ./packages/font-latin-modern-math/font-latin-modern-math.0.0.1
   dependencies: []
   test_only: false
 - name: math.0.0.1
   location:
     type: global
-    path: ./dist/packages/math/math.0.0.1
+    path: ./packages/math/math.0.0.1
   dependencies:
   - stdlib.0.0.1
   test_only: false
 - name: std-ja.0.0.1
   location:
     type: global
-    path: ./dist/packages/std-ja/std-ja.0.0.1
+    path: ./packages/std-ja/std-ja.0.0.1
   dependencies:
   - stdlib.0.0.1
   - math.0.0.1
@@ -62,6 +62,6 @@ locks:
 - name: stdlib.0.0.1
   location:
     type: global
-    path: ./dist/packages/stdlib/stdlib.0.0.1
+    path: ./packages/stdlib/stdlib.0.0.1
   dependencies: []
   test_only: false
diff --git a/doc/doc-primitives.satysfi-lock-expected b/doc/doc-primitives.satysfi-lock-expected
@@ -2,67 +2,67 @@ locks:
 - name: annot.0.0.1
   location:
     type: global
-    path: ./dist/packages/annot/annot.0.0.1
+    path: ./packages/annot/annot.0.0.1
   dependencies:
   - stdlib.0.0.1
   test_only: false
 - name: code.0.0.1
   location:
     type: global
-    path: ./dist/packages/code/code.0.0.1
+    path: ./packages/code/code.0.0.1
   dependencies:
   - stdlib.0.0.1
   - font-latin-modern.0.0.1
   test_only: false
 - name: font-ipa-ex.0.0.1
   location:
     type: global
-    path: ./dist/packages/font-ipa-ex/font-ipa-ex.0.0.1
+    path: ./packages/font-ipa-ex/font-ipa-ex.0.0.1
   dependencies: []
   test_only: false
 - name: font-junicode.0.0.1
   location:
     type: global
-    path: ./dist/packages/font-junicode/font-junicode.0.0.1
+    path: ./packages/font-junicode/font-junicode.0.0.1
   dependencies: []
   test_only: false
 - name: font-latin-modern.0.0.1
   location:
     type: global
-    path: ./dist/packages/font-latin-modern/font-latin-modern.0.0.1
+    path: ./packages/font-latin-modern/font-latin-modern.0.0.1
   dependencies: []
   test_only: false
 - name: font-latin-modern-math.0.0.1
   location:
     type: global
-    path: ./dist/packages/font-latin-modern-math/font-latin-modern-math.0.0.1
+    path: ./packages/font-latin-modern-math/font-latin-modern-math.0.0.1
   dependencies: []
   test_only: false
 - name: footnote-scheme.0.0.1
   location:
     type: global
-    path: ./dist/packages/footnote-scheme/footnote-scheme.0.0.1
+    path: ./packages/footnote-scheme/footnote-scheme.0.0.1
   dependencies:
   - stdlib.0.0.1
   test_only: false
 - name: itemize.0.0.1
   location:
     type: global
-    path: ./dist/packages/itemize/itemize.0.0.1
+    path: ./packages/itemize/itemize.0.0.1
   dependencies:
   - stdlib.0.0.1
   test_only: false
 - name: math.0.0.1
   location:
     type: global
-    path: ./dist/packages/math/math.0.0.1
+    path: ./packages/math/math.0.0.1
   dependencies:
   - stdlib.0.0.1
   test_only: false
 - name: std-ja-book.0.0.1
   location:
     type: global
-    path: ./dist/packages/std-ja-book/std-ja-book.0.0.1
+    path: ./packages/std-ja-book/std-ja-book.0.0.1
   dependencies:
   - stdlib.0.0.1
   - math.0.0.1
@@ -77,6 +77,6 @@ locks:
 - name: stdlib.0.0.1
   location:
     type: global
-    path: ./dist/packages/stdlib/stdlib.0.0.1
+    path: ./packages/stdlib/stdlib.0.0.1
   dependencies: []
   test_only: false
diff --git a/doc/math1.satysfi-lock-expected b/doc/math1.satysfi-lock-expected
@@ -2,60 +2,60 @@ locks:
 - name: annot.0.0.1
   location:
     type: global
-    path: ./dist/packages/annot/annot.0.0.1
+    path: ./packages/annot/annot.0.0.1
   dependencies:
   - stdlib.0.0.1
   test_only: false
 - name: code.0.0.1
   location:
     type: global
-    path: ./dist/packages/code/code.0.0.1
+    path: ./packages/code/code.0.0.1
   dependencies:
   - stdlib.0.0.1
   - font-latin-modern.0.0.1
   test_only: false
 - name: font-ipa-ex.0.0.1
   location:
     type: global
-    path: ./dist/packages/font-ipa-ex/font-ipa-ex.0.0.1
+    path: ./packages/font-ipa-ex/font-ipa-ex.0.0.1
   dependencies: []
   test_only: false
 - name: font-junicode.0.0.1
   location:
     type: global
-    path: ./dist/packages/font-junicode/font-junicode.0.0.1
+    path: ./packages/font-junicode/font-junicode.0.0.1
   dependencies: []
   test_only: false
 - name: font-latin-modern.0.0.1
   location:
     type: global
-    path: ./dist/packages/font-latin-modern/font-latin-modern.0.0.1
+    path: ./packages/font-latin-modern/font-latin-modern.0.0.1
   dependencies: []
   test_only: false
 - name: font-latin-modern-math.0.0.1
   location:
     type: global
-    path: ./dist/packages/font-latin-modern-math/font-latin-modern-math.0.0.1
+    path: ./packages/font-latin-modern-math/font-latin-modern-math.0.0.1
   dependencies: []
   test_only: false
 - name: math.0.0.1
   location:
     type: global
-    path: ./dist/packages/math/math.0.0.1
+    path: ./packages/math/math.0.0.1
   dependencies:
   - stdlib.0.0.1
   test_only: false
 - name: proof.0.0.1
   location:
     type: global
-    path: ./dist/packages/proof/proof.0.0.1
+    path: ./packages/proof/proof.0.0.1
   dependencies:
   - stdlib.0.0.1
   test_only: false
 - name: std-ja.0.0.1
   location:
     type: global
-    path: ./dist/packages/std-ja/std-ja.0.0.1
+    path: ./packages/std-ja/std-ja.0.0.1
   dependencies:
   - stdlib.0.0.1
   - math.0.0.1
@@ -69,13 +69,13 @@ locks:
 - name: stdlib.0.0.1
   location:
     type: global
-    path: ./dist/packages/stdlib/stdlib.0.0.1
+    path: ./packages/stdlib/stdlib.0.0.1
   dependencies: []
   test_only: false
 - name: tabular.0.0.1
   location:
     type: global
-    path: ./dist/packages/tabular/tabular.0.0.1
+    path: ./packages/tabular/tabular.0.0.1
   dependencies:
   - stdlib.0.0.1
   test_only: false
diff --git a/download-fonts.sh b/download-fonts.sh
@@ -3,6 +3,7 @@
 set -ue
 
 CACHE=temp
+PACKAGES=lib-satysfi/packages
 MESSAGE_PREFIX="[download-fonts.sh]"
 cd "$(dirname "$0")"
 mkdir -p "$CACHE"
@@ -47,23 +48,23 @@ download_file () {
 # Latin Modern
 NAME=lm2.004otf
 download_file "$NAME.zip" "http://www.gust.org.pl/projects/e-foundry/latin-modern/download/lm2.004otf.zip"
-unzip -o "$CACHE/$NAME.zip" "*.otf" -d lib-satysfi/dist/packages/font-latin-modern/font-latin-modern.0.0.1/fonts/
+unzip -o "$CACHE/$NAME.zip" "*.otf" -d "$PACKAGES"/font-latin-modern/font-latin-modern.0.0.1/fonts/
 
 # Latin Modern Math
 NAME=latinmodern-math-1959
 download_file "$NAME.zip" "http://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip"
 unzip -o "$CACHE/$NAME.zip" "*.otf" -d "$CACHE/"
-cp "$CACHE"/latinmodern-math-1959/otf/latinmodern-math.otf lib-satysfi/dist/packages/font-latin-modern-math/font-latin-modern-math.0.0.1/fonts/
+cp "$CACHE"/latinmodern-math-1959/otf/latinmodern-math.otf "$PACKAGES"/font-latin-modern-math/font-latin-modern-math.0.0.1/fonts/
 
 # Junicode
 NAME=junicode-1.002
 download_file "$NAME.zip" "http://downloads.sourceforge.net/project/junicode/junicode/junicode-1.002/junicode-1.002.zip"
-unzip -o "$CACHE/$NAME.zip" "*.ttf" -d lib-satysfi/dist/packages/font-junicode/font-junicode.0.0.1/fonts/
+unzip -o "$CACHE/$NAME.zip" "*.ttf" -d "$PACKAGES"/font-junicode/font-junicode.0.0.1/fonts/
 
 # IPAexfont
 NAME=IPAexfont00401
 download_file "$NAME.zip" "https://moji.or.jp/wp-content/ipafont/IPAexfont/IPAexfont00401.zip"
 unzip -o "$CACHE/$NAME.zip" "*.ttf" -d "$CACHE/"
-cp "$CACHE"/IPAexfont00401/ipaexg.ttf lib-satysfi/dist/packages/font-ipa-ex/font-ipa-ex.0.0.1/fonts/
-cp "$CACHE"/IPAexfont00401/ipaexm.ttf lib-satysfi/dist/packages/font-ipa-ex/font-ipa-ex.0.0.1/fonts/
+cp "$CACHE"/IPAexfont00401/ipaexg.ttf "$PACKAGES"/font-ipa-ex/font-ipa-ex.0.0.1/fonts/
+cp "$CACHE"/IPAexfont00401/ipaexm.ttf "$PACKAGES"/font-ipa-ex/font-ipa-ex.0.0.1/fonts/
 show_message "end."