Skip to content

Commit

Permalink
git subrepo pull website
Browse files Browse the repository at this point in the history
subrepo:
  subdir:   "website"
  merged:   "5cdca2d5e2"
upstream:
  origin:   "git@github.com:daisy/pipeline.git"
  branch:   "website"
  commit:   "1d39e5bdc1"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"
  • Loading branch information
bertfrees committed Apr 29, 2024
1 parent 3edba36 commit 5ee4670
Show file tree
Hide file tree
Showing 8 changed files with 57 additions and 11 deletions.
2 changes: 1 addition & 1 deletion website/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
remote = git@github.com:daisy/pipeline.git
branch = website
commit = 1d39e5bdc1707ba58eb67eb2beff34bfca920f9f
parent = 58f6495ff8124412046a54b91229811bc4e2597b
parent = 4e8af02717f019e281522feb3caeee4ffe7b9fbd
cmdver = 0.3.1
10 changes: 10 additions & 0 deletions website/src/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,13 @@ include:
- modules/braille/html-to-pef/src/main/resources/css/_tables.scss/index.md
- modules/braille/dtbook-to-pef/src/main/resources/css/_definition-lists.scss/index.md
- modules/braille/html-to-pef/src/main/resources/css/_definition-lists.scss/index.md
- modules/braille/dtbook-to-pef/src/main/resources/css/_legacy.scss/index.md
- modules/braille/html-to-pef/src/main/resources/css/_legacy.scss/index.md
- modules/braille/dtbook-to-pef/src/main/resources/css/_generate-toc.scss/index.md
- modules/braille/html-to-pef/src/main/resources/css/_generate-toc.scss/index.md
- modules/braille/dtbook-to-pef/src/main/resources/css/_notes.scss/index.md
- modules/braille/html-to-pef/src/main/resources/css/_notes.scss/index.md
- modules/braille/dtbook-to-pef/src/main/resources/css/_page-breaking.scss/index.md
- modules/braille/html-to-pef/src/main/resources/css/_page-breaking.scss/index.md
- modules/braille/dtbook-to-pef/src/main/resources/css/_volume-breaking.scss/index.md
- modules/braille/html-to-pef/src/main/resources/css/_volume-breaking.scss/index.md
42 changes: 39 additions & 3 deletions website/src/_data/downloads.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,47 @@
## Generate with:
## curl -u bertfrees:$(pass github-tokens/curl | head -1) https://api.github.com/repos/daisy/pipeline-assembly/releases | jq --arg version 1.14.17-p1 '.[] | select(.tag_name == ("v"+$version))|{group:"main",version:$version,sort:$version,state:"stable",github_tag:("v"+$version),github_url:.html_url,description:"FIXME",files:.assets|map({platform:.browser_download_url|capture("^.+\\.(?<ext>[^\\.]+)$")["ext"]|(if .=="zip" then "linux" elif .=="deb" then "debian" else "?" end),package:.browser_download_url|capture("^.+\\.(?<ext>[^\\.]+)$")["ext"]|sub("exe";"installer"),content:(if .browser_download_url|endswith(".zip") then ["server", "cli"] else ["server"] end),url:.browser_download_url,size:.size})}' | ruby -ryaml -rjson -e 'puts YAML.dump(JSON.load(ARGF))'
## curl -u bertfrees:$(pass github-tokens/curl | head -1) https://api.github.com/repos/daisy/pipeline-ui/releases | jq --arg version 1.2.7 '.[] | select(.tag_name == $version)|{app_version:$version,app_github_tag:$version,app_github_url:.html_url,files:.assets|map({platform:.browser_download_url|capture("^.+\\.(?<ext>[^\\.]+)$")["ext"]|(if .=="exe" then "windows" elif.=="dmg" then "macosx" else "?" end),package:.browser_download_url|capture("^.+\\.(?<ext>[^\\.]+)$")["ext"]|sub("exe";"installer"),content:["gui","server"],url:.browser_download_url,size:.size})}' | ruby -ryaml -rjson -e 'puts YAML.dump(JSON.load(ARGF))'
## curl -u bertfrees:$(pass github-tokens/curl | head -1) https://api.github.com/repos/daisy/pipeline-ui/releases | jq --arg version 1.3.0 '.[] | select(.tag_name == $version)|{app_version:$version,app_github_tag:$version,app_github_url:.html_url,files:.assets|map({platform:.browser_download_url|capture("^.+\\.(?<ext>[^\\.]+)$")["ext"]|(if .=="exe" then "windows" elif.=="dmg" then "macosx" else "?" end),package:.browser_download_url|capture("^.+\\.(?<ext>[^\\.]+)$")["ext"]|sub("exe";"installer"),content:["gui","server"],url:.browser_download_url,size:.size})}' | ruby -ryaml -rjson -e 'puts YAML.dump(JSON.load(ARGF))'
## curl -u bertfrees:$(pass github-tokens/curl | head -1) https://api.github.com/repos/daisy/pipeline-cli-go/releases | jq --arg version 2.1.8 '.[] | select(.tag_name == ("v"+$version))|{group:"cli",version:$version,state:"stable",github_tag:("v"+$version),github_url:.html_url,files:.assets|map({platform:.browser_download_url|capture("^.+/cli-\\Q"+$version+"\\E-(?<platform>[^\\.]+)\\.zip$")["platform"]|(if .=="windows_amd64" then "windows-64" elif .=="windows_386" then "windows-32" elif .=="linux_amd64" then "linux-64" elif .=="linux_386" then "linux-32" elif .=="darwin_amd64" then "macosx" else "?" end),package:"zip",content: "cli", url:.browser_download_url,size:.size})}' | ruby -ryaml -rjson -e 'puts YAML.dump(JSON.load(ARGF))'

- group: main
version: "1.14.17-p1"
sort: "1.14.17-p1"
version: "1.14.18"
sort: "1.14.18"
state: stable
github_tag: "v1.14.18"
github_url: "https://github.com/daisy/pipeline-assembly/releases/tag/v1.14.18"
app_version: "1.3.0"
app_github_tag: "1.3.0"
app_github_url: "https://github.com/daisy/pipeline-ui/releases/tag/1.3.0"
description: >
Includes the standalone desktop application and the web server. Versions available for
Windows (an installer EXE) and Mac OS (an installer PKG). The Linux packages (ZIP and
DEB files) include only the web server. The ZIP package also includes the command line
interface.
files:
- platform: macosx
package: pkg
content: [gui, server]
url: "https://github.com/daisy/pipeline-ui/releases/download/1.3.0/daisy-pipeline-1.3.0-mac.pkg"
size: 192171973
- platform: windows
package: installer
content: [gui, server]
url: "https://github.com/daisy/pipeline-ui/releases/download/1.3.0/daisy-pipeline-setup-1.3.0.exe"
size: 145502104
- platform: debian
package: deb
content: [server]
url: "https://github.com/daisy/pipeline-assembly/releases/download/v1.14.18/pipeline2-1.14.18_debian.deb"
size: 77256190
- platform: linux
package: zip
content: [server, cli]
url: "https://github.com/daisy/pipeline-assembly/releases/download/v1.14.18/pipeline2-1.14.18_linux.zip"
size: 85229284

- group: main
version: "1.14.17"
sort: "1.14.17"
state: stable
github_tag: "v1.14.17-p1"
github_url: "https://github.com/daisy/pipeline-assembly/releases/tag/v1.14.17-p1"
Expand Down
2 changes: 1 addition & 1 deletion website/src/_data/versions.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
assembly: 1.14.17-p1
assembly: 1.14.18
css-spec: 20210129
2 changes: 1 addition & 1 deletion website/src/_wiki/Configuration-Files.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ the `pipeline.properties` file.
running on the same machine as the server
: **Allowed values**: "true" or "false"
: **Required**: No
: **Default**: "true"
: **Default**: "false"
: May be overwritten by the
[`local`](Pipeline-as-Service#arguments-for-pipeline2-executable) ("true")
and [`remote`](Pipeline-as-Service#arguments-for-pipeline2-executable) ("false")
Expand Down
3 changes: 2 additions & 1 deletion website/src/_wiki/Get-Help/API-Documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,14 @@ FIXME: add short description for every package
- [`org.daisy.common.messaging`](http://daisy.github.io/pipeline/api/org/daisy/common/messaging/package-summary.html)
- [`org.daisy.common.priority`](http://daisy.github.io/pipeline/api/org/daisy/common/priority/package-summary.html)
- [`org.daisy.common.saxon`](http://daisy.github.io/pipeline/api/org/daisy/common/saxon/package-summary.html)
- [`org.daisy.common.saxon.xslt`](http://daisy.github.io/pipeline/api/org/daisy/common/saxon/xslt/package-summary.html)
- [`org.daisy.common.shell`](http://daisy.github.io/pipeline/api/org/daisy/common/shell/package-summary.html)
- [`org.daisy.common.slf4j`](http://daisy.github.io/pipeline/api/org/daisy/common/slf4j/package-summary.html)
- [`org.daisy.common.stax`](http://daisy.github.io/pipeline/api/org/daisy/common/stax/package-summary.html)
- [`org.daisy.common.transform`](http://daisy.github.io/pipeline/api/org/daisy/common/transform/package-summary.html)
- [`org.daisy.common.xpath.saxon`](http://daisy.github.io/pipeline/api/org/daisy/common/xpath/saxon/package-summary.html)
- [`org.daisy.common.xproc`](http://daisy.github.io/pipeline/api/org/daisy/common/xproc/package-summary.html)
- [`org.daisy.common.xproc.calabash`](http://daisy.github.io/pipeline/api/org/daisy/common/xproc/calabash/package-summary.html)
- [`org.daisy.common.xslt`](http://daisy.github.io/pipeline/api/org/daisy/common/xslt/package-summary.html)
- [`org.daisy.common.zip`](http://daisy.github.io/pipeline/api/org/daisy/common/zip/package-summary.html)
- [`org.daisy.pipeline.braille.common`](http://daisy.github.io/pipeline/api/org/daisy/pipeline/braille/common/package-summary.html)
- [`org.daisy.pipeline.client.filestorage`](http://daisy.github.io/pipeline/api/org/daisy/pipeline/client/filestorage/package-summary.html)
Expand Down
5 changes: 2 additions & 3 deletions website/src/_wiki/Get-Help/User-Guide/Scripts.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@
"Scripts" is the term we use for the conversion tasks you can perform
with DAISY Pipeline 2. The complete list of available scripts is:


* [DAISY 2.02 Unscrambler](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/daisy202-unscrambler/)
* [DAISY 2.02 Validator](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/daisy202-validator/)
* [DAISY 2.02 to DAISY 3](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/daisy202-to-daisy3/)
* [DAISY 2.02 to EPUB 3](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/daisy202-to-epub3/)
* [DAISY 2.02 to MegaVoice multi-level](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/daisy202-to-mp3/)
* [DAISY 2.02 to navigable MP3 file-set](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/daisy202-to-mp3/)
* [DAISY 3 Upgrader](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/daisy3-upgrader/)
* [DAISY 3 to DAISY 2.02](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/daisy3-to-daisy202/)
* [DAISY 3 to EPUB 3](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/daisy3-to-epub3/)
* [DAISY 3 to MegaVoice multi-level](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/daisy3-to-mp3/)
* [DAISY 3 to navigable MP3 file-set](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/daisy3-to-mp3/)
* [DTBook Validator](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/dtbook-validator/)
* [DTBook to DAISY 3](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/dtbook-to-daisy3/)
* [DTBook to EPUB3](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/dtbook-to-epub3/)
Expand Down
2 changes: 1 addition & 1 deletion website/target/maven/pom.xml

Large diffs are not rendered by default.

0 comments on commit 5ee4670

Please sign in to comment.