From 0f9bc13a34b729d9ae9db31276feb2a66785d06b Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sun, 14 Aug 2022 21:02:22 -0400 Subject: Documentation changes for v0.7.0 --- stdlib/commands.md | 12 ------------ stdlib/project.clj | 29 ----------------------------- stdlib/project.lux | 16 ++++++++-------- stdlib/source/program/aedifex.lux | 2 +- stdlib/source/program/aedifex/format.lux | 1 - stdlib/source/program/aedifex/parser.lux | 1 - stdlib/source/program/aedifex/pom.lux | 25 ++++++++++++++++++------- stdlib/source/program/aedifex/profile.lux | 7 ++----- stdlib/source/test/aedifex/profile.lux | 1 - 9 files changed, 29 insertions(+), 65 deletions(-) delete mode 100644 stdlib/project.clj (limited to 'stdlib') diff --git a/stdlib/commands.md b/stdlib/commands.md index 0dbd64e87..94337334a 100644 --- a/stdlib/commands.md +++ b/stdlib/commands.md @@ -31,18 +31,6 @@ cd ~/lux/stdlib/ \ ## Deploy ``` -cd ~/lux/stdlib/ && lein install - -cd ~/lux/stdlib/ && mvn install:install-file -Dfile=target/library.tar -DgroupId=com.github.luxlang -DartifactId=stdlib -Dversion=0.6.0-SNAPSHOT -Dpackaging=tar - -cd ~/lux/stdlib/ && mvn deploy:deploy-file \ --Durl=https://USERNAME:PASSWORD@oss.sonatype.org/content/repositories/snapshots/ \ --Dfile=library.tar \ --DgroupId=com.github.luxlang \ --DartifactId=stdlib \ --Dversion=0.7.0-SNAPSHOT \ --Dpackaging=tar - cd ~/lux/stdlib/ \ && lux install diff --git a/stdlib/project.clj b/stdlib/project.clj deleted file mode 100644 index dfffbef5a..000000000 --- a/stdlib/project.clj +++ /dev/null @@ -1,29 +0,0 @@ -(def version "0.6.6-SNAPSHOT") -(def repo "https://github.com/LuxLang/lux") -(def sonatype-releases "https://oss.sonatype.org/service/local/staging/deploy/maven2/") -(def sonatype-snapshots "https://oss.sonatype.org/content/repositories/snapshots/") - -(defproject com.github.luxlang/stdlib #=(identity version) - :description "Standard library for the Lux programming language." - - :url ~repo - :license {:name "Lux License v0.1.2" - :url ~(str repo "/blob/master/license.txt")} - :plugins [[com.github.luxlang/lein-luxc ~version]] - :deploy-repositories [["releases" {:url ~sonatype-releases :creds :gpg}] - ["snapshots" {:url ~sonatype-snapshots :creds :gpg}]] - :pom-addition [:developers [:developer - [:name "Eduardo Julian"] - [:url "https://github.com/eduardoejp"]]] - :repositories [["snapshots" ~sonatype-snapshots]] - :scm {:name "git" - :url ~(str repo ".git")} - - :manifest {"lux" ~version} - :source-paths ["source"] - :dependencies [[com.github.luxlang/lux-bootstrapper ~version]] - :profiles {:bibliotheca {:lux {:test "test/lux"}} - :aedifex {:description "A build system/tool made exclusively for Lux." - :lux {:program ["program/aedifex" "_"] - :test ["test/aedifex" "_"]}}} - ) diff --git a/stdlib/project.lux b/stdlib/project.lux index b0275ebd8..ff120c7cf 100644 --- a/stdlib/project.lux +++ b/stdlib/project.lux @@ -2,11 +2,11 @@ [... An optional identity for the project. ... It can also be specified or overriden in a non-default profile. ... This will be the name given to the project when installed/deployed as a dependency. - "identity" ["com.github.luxlang" "stdlib" "0.7.0-SNAPSHOT"] + "identity" ["com.github.luxlang" "stdlib" "0.7.0"] ... Every piece of information, and the whole "info" bundle, are optional. "info" ["name" "stdlib" - "description" "Standard Library for the Lux programming language." + "description" "Standard library for the Lux programming language." "url" "https://github.com/LuxLang/lux" "scm" "https://github.com/LuxLang/lux.git" "licenses" [["name" "Lux License v0.1.2" @@ -46,7 +46,7 @@ ... The following are alternative profiles to use in various situations. "jvm" [... "lux" specifies the dependency to fetch and use as the compiler. - "lux" ["com.github.luxlang" "lux-jvm" "0.7.0-SNAPSHOT" "jar"] + "lux" ["com.github.luxlang" "lux-jvm" "0.7.0" "jar"] "dependencies" [["com.github.luxlang" "lux-jvm-function" "0.6.5" "jar"]] ... "dependencies" is an optional list of dependencies to fetch. ... The dependencies have the same shape as when specifying the compiler. @@ -58,25 +58,25 @@ ] "js" - ["lux" ["com.github.luxlang" "lux-js" "0.7.0-SNAPSHOT" "js"] + ["lux" ["com.github.luxlang" "lux-js" "0.7.0" "js"] ... The OS command to use when running JS tests. The default is described below. ... "js" ["node" "--stack_size=8192"] ] "lua" - ["lux" ["com.github.luxlang" "lux-lua" "0.7.0-SNAPSHOT" "jar"] + ["lux" ["com.github.luxlang" "lux-lua" "0.7.0" "jar"] ... The OS command to use when running Lua tests. The default is described below. ... "lua" ["lua"] ] "python" - ["lux" ["com.github.luxlang" "lux-python" "0.7.0-SNAPSHOT" "jar"] + ["lux" ["com.github.luxlang" "lux-python" "0.7.0" "jar"] ... The OS command to use when running Python tests. The default is described below. ... "python" ["python3"] ] "ruby" - ["lux" ["com.github.luxlang" "lux-ruby" "0.7.0-SNAPSHOT" "jar"] + ["lux" ["com.github.luxlang" "lux-ruby" "0.7.0" "jar"] ... The OS command to use when running Ruby tests. The default is described below. ... "ruby" ["ruby"] ] @@ -85,7 +85,7 @@ ["test" test/lux._] "scriptum" - ["info" ["description" "Documentation for the Standard Library for the Lux programming language."] + ["info" ["description" "Documentation for the standard library for the Lux programming language."] "program" documentation/lux._ "test" documentation/lux._] diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux index dc378103b..182ebf233 100644 --- a/stdlib/source/program/aedifex.lux +++ b/stdlib/source/program/aedifex.lux @@ -9,7 +9,7 @@ ["[0]" io (.only IO)] ["[0]" maybe] ["[0]" try (.only Try) (.use "[1]#[0]" functor)] - ["[0]" exception] + ["[0]" exception (.only Exception)] [concurrency ["[0]" async (.only Async) (.use "[1]#[0]" monad)]]] [data diff --git a/stdlib/source/program/aedifex/format.lux b/stdlib/source/program/aedifex/format.lux index 771bcc9de..4d76b23e2 100644 --- a/stdlib/source/program/aedifex/format.lux +++ b/stdlib/source/program/aedifex/format.lux @@ -115,7 +115,6 @@ (def (info value) (Format /.Info) (|> ..empty - (..on_maybe "name" (the /.#name value) code.text) (..on_maybe "url" (the /.#url value) code.text) (..on_maybe "scm" (the /.#scm value) code.text) (..on_maybe "description" (the /.#description value) code.text) diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux index 6e64f5bf2..96a717dbc 100644 --- a/stdlib/source/program/aedifex/parser.lux +++ b/stdlib/source/program/aedifex/parser.lux @@ -126,7 +126,6 @@ (.tuple (<>.some (<>.and .text .any))))] (all <>.and - (<>.maybe (..singular input "name" ..name)) (<>.maybe (..singular input "url" ..url)) (<>.maybe (..singular input "scm" ..scm)) (<>.maybe (..singular input "description" ..description)) diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux index eed536317..cafb480a2 100644 --- a/stdlib/source/program/aedifex/pom.lux +++ b/stdlib/source/program/aedifex/pom.lux @@ -126,10 +126,10 @@ [contributor /.Contributor "contributor"] ) -(def (info value) - (-> /.Info (List XML)) +(def (info identity value) + (-> Artifact /.Info (List XML)) (all list#composite - (|> value (the /.#name) (maybe#each (..property "name")) maybe.list) + (|> identity (the //artifact.#name) (..property "name") list) (|> value (the /.#url) (maybe#each (..property ..url_tag)) maybe.list) (|> value (the /.#description) (maybe#each (..property "description")) maybe.list) (|> value (the /.#licenses) (list#each ..license) (..group "licenses") list) @@ -144,16 +144,27 @@ (when (the /.#identity value) {.#Some identity} {try.#Success - {xml.#Node ["" ..project_tag] xml.attributes + {xml.#Node ["" ..project_tag] + xml.attributes (all list#composite (list ..version) (..artifact identity) (|> value (the /.#info) - (maybe#each ..info) + (maybe#each (..info identity)) (maybe.else (list))) - (|> value (the /.#repositories) set.list (list#each ..repository) (..group "repositories") list) - (|> value (the /.#dependencies) set.list (list#each ..dependency) (..group ..dependencies_tag) list) + (|> value + (the /.#repositories) + set.list + (list#each ..repository) + (..group "repositories") + list) + (|> value + (the /.#dependencies) + set.list + (list#each ..dependency) + (..group ..dependencies_tag) + list) )}} _ diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux index e887160b5..674865cdd 100644 --- a/stdlib/source/program/aedifex/profile.lux +++ b/stdlib/source/program/aedifex/profile.lux @@ -107,8 +107,7 @@ (type .public Info (Record - [#name (Maybe Text) - #url (Maybe URL) + [#url (Maybe URL) #scm (Maybe SCM) #description (Maybe Text) #licenses (List License) @@ -122,7 +121,6 @@ (maybe.equivalence text.equivalence) (maybe.equivalence text.equivalence) (maybe.equivalence text.equivalence) - (maybe.equivalence text.equivalence) (list.equivalence ..license_equivalence) (maybe.equivalence ..organization_equivalence) (list.equivalence ..developer_equivalence) @@ -130,8 +128,7 @@ (def .public default_info Info - [#name {.#None} - #url {.#None} + [#url {.#None} #scm {.#None} #description {.#None} #licenses (list) diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux index 4d964ebdd..25eccfa43 100644 --- a/stdlib/source/test/aedifex/profile.lux +++ b/stdlib/source/test/aedifex/profile.lux @@ -98,7 +98,6 @@ (def info (Random /.Info) (all random.and - (random.maybe (random.alphabetic 1)) (random.maybe (random.alphabetic 2)) (random.maybe ..scm) (random.maybe (random.alphabetic 3)) -- cgit v1.2.3