Skip to content

slapos
slapos
Commit 00fcd8ea authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

theia version up 

version up to current version (0.13.0) and include configuration to make use of nexedi/slapos.core!218

Also switch to gopls and include jdk, with all preliminary support for patchelf.

See merge request nexedi/slapos!774
parents 0c93b19c 16d9b557
Pipeline #10615 failed with stage
    Show whitespace changes
    Inline Side-by-side
    Showing with 1883 additions and 2039 deletions
    component/golang/buildout.cfg
    View file @ 00fcd8ea
    ...@@ -64,7 +64,7 @@ environment-extra = ...@@ -64,7 +64,7 @@ environment-extra =
    url = https://dl.google.com/go/go1.12.9.src.tar.gz url = https://dl.google.com/go/go1.12.9.src.tar.gz
    md5sum = 6132109d4050da349eadc9f7b0304ef4 md5sum = 6132109d4050da349eadc9f7b0304ef4
    # go1.11 needs go1.4 to bootstrap # go1.12 needs go1.4 to bootstrap
    environment-extra = environment-extra =
    GOROOT_BOOTSTRAP=${golang14:location} GOROOT_BOOTSTRAP=${golang14:location}
    ...@@ -77,6 +77,15 @@ md5sum = 4ad8b04f962be93a32f3021e6f35b3b9 ...@@ -77,6 +77,15 @@ md5sum = 4ad8b04f962be93a32f3021e6f35b3b9
    environment-extra = environment-extra =
    GOROOT_BOOTSTRAP=${golang14:location} GOROOT_BOOTSTRAP=${golang14:location}
    [golang1.14]
    <= golang-common
    url = https://dl.google.com/go/go1.14.3.src.tar.gz
    md5sum = 6b1fb42d219e2ea8925002013c76d4c7
    # go1.14 needs go1.4 to bootstrap
    environment-extra =
    GOROOT_BOOTSTRAP=${golang14:location}
    # ---- infrastructure to build Go workspaces / projects ---- # ---- infrastructure to build Go workspaces / projects ----
    # gowork is a top-level section representing workspace # gowork is a top-level section representing workspace
    ......
    component/java-jdk/buildout.cfg 0 → 100644
    View file @ 00fcd8ea
    [buildout]
    extends =
    ../patchelf/buildout.cfg
    ../zlib/buildout.cfg
    parts =
    java-jdk
    [java-jdk]
    recipe = plone.recipe.command
    command = echo "Error: unsupported platform" && false
    stop-on-error = true
    location =
    [java-jdk:linux and bits64]
    recipe = slapos.recipe.cmmi
    shared = true
    url = https://download.java.net/java/GA/jdk12.0.2/e482c34c86bd4bf8b56c0b35558996b9/10/GPL/openjdk-12.0.2_linux-x64_bin.tar.gz
    md5sum = f5da6f4dec81bdd2a096184ec1d69216
    configure-command = :
    make-binary = :
    pre-install =
    mkdir -p @@LOCATION@@
    cp -r * @@LOCATION@@
    post-install =
    for file in @@LOCATION@@/bin/* ; do
    echo appending rpath to $file
    ${patchelf:location}/bin/patchelf --set-rpath ${:rpath} $file
    done
    rpath = ${zlib:location}/lib:@@LOCATION@@/lib
    location = @@LOCATION@@
    component/patchelf/buildout.cfg 0 → 100644
    View file @ 00fcd8ea
    [buildout]
    extends =
    ../autoconf/buildout.cfg
    ../automake/buildout.cfg
    ../pkgconfig/buildout.cfg
    parts =
    patchelf
    [patchelf]
    recipe = slapos.recipe.cmmi
    shared = true
    url = https://github.com/NixOS/patchelf/archive/0.11.tar.gz
    md5sum = 6cffb77ee7a95bd314d954a6aeb53a02
    pre-configure =
    autoreconf -vif
    environment =
    PATH=${pkgconfig:location}/bin:${autoconf:location}/bin:${automake:location}/bin:%(PATH)s
    software/theia/buildout.hash.cfg
    View file @ 00fcd8ea
    ...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
    [instance] [instance]
    filename = instance.cfg.in filename = instance.cfg.in
    md5sum = 42d21dc3f5d3e57e142eea8e016195f0 md5sum = d8ad39bc93c492026a93c28b33a5dc3a
    [yarn.lock] [yarn.lock]
    filename = yarn.lock filename = yarn.lock
    md5sum = ae1b596804715acd3512f1e8e6cbae3b md5sum = 89d0a4d0c3ae90b9c5c0923b57766f0f
    [python-language-server-requirements.txt] [python-language-server-requirements.txt]
    filename = python-language-server-requirements.txt filename = python-language-server-requirements.txt
    ......
    software/theia/gowork.cfg deleted 100644 → 0
    View file @ 0c93b19c
    # Code generated by gowork-snapshot; DO NOT EDIT.
    # list of go git repositories to fetch
    [gowork.goinstall]
    depends_gitfetch =
    ${go_github.com_9fans_go:recipe}
    ${go_github.com_acroca_go-symbols:recipe}
    ${go_github.com_alecthomas_gometalinter:recipe}
    ${go_github.com_alecthomas_units:recipe}
    ${go_github.com_beorn7_perks:recipe}
    ${go_github.com_cosiner_argv:recipe}
    ${go_github.com_cweill_gotests:recipe}
    ${go_github.com_davidrjenni_reftools:recipe}
    ${go_github.com_derekparker_delve:recipe}
    ${go_github.com_fatih_camelcase:recipe}
    ${go_github.com_fatih_gomodifytags:recipe}
    ${go_github.com_fatih_structtag:recipe}
    ${go_github.com_flynn_go-shlex:recipe}
    ${go_github.com_gogo_protobuf:recipe}
    ${go_github.com_golang_lint:recipe}
    ${go_github.com_golang_protobuf:recipe}
    ${go_github.com_google_shlex:recipe}
    ${go_github.com_google_uuid:recipe}
    ${go_github.com_hashicorp_golang-lru:recipe}
    ${go_github.com_haya14busa_goplay:recipe}
    ${go_github.com_josharian_impl:recipe}
    ${go_github.com_karrick_godirwalk:recipe}
    ${go_github.com_kisielk_gotool:recipe}
    ${go_github.com_mattn_go-isatty:recipe}
    ${go_github.com_mattn_go-runewidth:recipe}
    ${go_github.com_matttproud_golang_protobuf_extensions:recipe}
    ${go_github.com_mholt_caddy:recipe}
    ${go_github.com_neelance_parallel:recipe}
    ${go_github.com_nicksnyder_go-i18n:recipe}
    ${go_github.com_nsf_gocode:recipe}
    ${go_github.com_opentracing_basictracer-go:recipe}
    ${go_github.com_opentracing_opentracing-go:recipe}
    ${go_github.com_pelletier_go-toml:recipe}
    ${go_github.com_peterh_liner:recipe}
    ${go_github.com_pkg_errors:recipe}
    ${go_github.com_pmezard_go-difflib:recipe}
    ${go_github.com_prometheus_client_golang:recipe}
    ${go_github.com_prometheus_client_model:recipe}
    ${go_github.com_prometheus_common:recipe}
    ${go_github.com_prometheus_procfs:recipe}
    ${go_github.com_ramya-rao-a_go-outline:recipe}
    ${go_github.com_rogpeppe_godef:recipe}
    ${go_github.com_sirupsen_logrus:recipe}
    ${go_github.com_skratchdot_open-golang:recipe}
    ${go_github.com_slimsag_godocmd:recipe}
    ${go_github.com_sourcegraph_ctxvfs:recipe}
    ${go_github.com_sourcegraph_go-langserver:recipe}
    ${go_github.com_sourcegraph_go-lsp:recipe}
    ${go_github.com_sourcegraph_jsonrpc2:recipe}
    ${go_github.com_spf13_cobra:recipe}
    ${go_github.com_spf13_pflag:recipe}
    ${go_github.com_sqs_goreturns:recipe}
    ${go_github.com_tylerb_gotype-live:recipe}
    ${go_github.com_uudashr_gopkgs:recipe}
    ${go_github.com_zmb3_gogetdoc:recipe}
    ${go_golang.org_x_arch:recipe}
    ${go_golang.org_x_crypto:recipe}
    ${go_golang.org_x_lint:recipe}
    ${go_golang.org_x_net:recipe}
    ${go_golang.org_x_sys:recipe}
    ${go_golang.org_x_tools:recipe}
    ${go_gopkg.in_alecthomas_kingpin.v3-unstable:recipe}
    ${go_gopkg.in_yaml.v2:recipe}
    ${go_honnef.co_go_tools:recipe}
    ${go_sourcegraph.com_sqs_goreturns:recipe}
    [go_github.com_9fans_go]
    <= go-git-package
    go.importpath = github.com/9fans/go
    repository = https://github.com/9fans/go
    revision = 5d4fa602e1
    [go_github.com_acroca_go-symbols]
    <= go-git-package
    go.importpath = github.com/acroca/go-symbols
    repository = https://github.com/acroca/go-symbols
    revision = 953befd75e
    [go_github.com_alecthomas_gometalinter]
    <= go-git-package
    go.importpath = github.com/alecthomas/gometalinter
    repository = https://github.com/alecthomas/gometalinter
    revision = 8edca99e8a
    [go_github.com_alecthomas_units]
    <= go-git-package
    go.importpath = github.com/alecthomas/units
    repository = https://github.com/alecthomas/units
    revision = 2efee857e7
    [go_github.com_beorn7_perks]
    <= go-git-package
    go.importpath = github.com/beorn7/perks
    repository = https://github.com/beorn7/perks
    revision = 3a771d9929
    [go_github.com_cosiner_argv]
    <= go-git-package
    go.importpath = github.com/cosiner/argv
    repository = https://github.com/cosiner/argv
    revision = 13bacc38a0
    [go_github.com_cweill_gotests]
    <= go-git-package
    go.importpath = github.com/cweill/gotests
    repository = https://github.com/cweill/gotests
    revision = c51312f508
    [go_github.com_davidrjenni_reftools]
    <= go-git-package
    go.importpath = github.com/davidrjenni/reftools
    repository = https://github.com/davidrjenni/reftools
    revision = 654d0ba4f9
    [go_github.com_derekparker_delve]
    <= go-git-package
    go.importpath = github.com/derekparker/delve
    repository = https://github.com/derekparker/delve
    revision = ea3428550d
    [go_github.com_fatih_camelcase]
    <= go-git-package
    go.importpath = github.com/fatih/camelcase
    repository = https://github.com/fatih/camelcase
    revision = 9db1b65eb3
    [go_github.com_fatih_gomodifytags]
    <= go-git-package
    go.importpath = github.com/fatih/gomodifytags
    repository = https://github.com/fatih/gomodifytags
    revision = 141225bf62
    [go_github.com_fatih_structtag]
    <= go-git-package
    go.importpath = github.com/fatih/structtag
    repository = https://github.com/fatih/structtag
    revision = 76ae1d6d21
    [go_github.com_flynn_go-shlex]
    <= go-git-package
    go.importpath = github.com/flynn/go-shlex
    repository = https://github.com/flynn/go-shlex
    revision = 3f9db97f85
    [go_github.com_gogo_protobuf]
    <= go-git-package
    go.importpath = github.com/gogo/protobuf
    repository = https://github.com/gogo/protobuf
    revision = 6f222ca738
    [go_github.com_golang_lint]
    <= go-git-package
    go.importpath = github.com/golang/lint
    repository = https://github.com/golang/lint
    revision = 1baf3a9d7d
    [go_github.com_golang_protobuf]
    <= go-git-package
    go.importpath = github.com/golang/protobuf
    repository = https://github.com/golang/protobuf
    revision = 5e0eda4b6d
    [go_github.com_google_shlex]
    <= go-git-package
    go.importpath = github.com/google/shlex
    repository = https://github.com/google/shlex
    revision = 6f45313302
    [go_github.com_google_uuid]
    <= go-git-package
    go.importpath = github.com/google/uuid
    repository = https://github.com/google/uuid
    revision = 9b3b1e0f5f
    [go_github.com_hashicorp_golang-lru]
    <= go-git-package
    go.importpath = github.com/hashicorp/golang-lru
    repository = https://github.com/hashicorp/golang-lru
    revision = 20f1fb78b0
    [go_github.com_haya14busa_goplay]
    <= go-git-package
    go.importpath = github.com/haya14busa/goplay
    repository = https://github.com/haya14busa/goplay
    revision = v1.0.0-0-gf2d63a841a
    [go_github.com_josharian_impl]
    <= go-git-package
    go.importpath = github.com/josharian/impl
    repository = https://github.com/josharian/impl
    revision = 3d0f908298
    [go_github.com_karrick_godirwalk]
    <= go-git-package
    go.importpath = github.com/karrick/godirwalk
    repository = https://github.com/karrick/godirwalk
    revision = v1.7.5-0-g2de2192f9e
    [go_github.com_kisielk_gotool]
    <= go-git-package
    go.importpath = github.com/kisielk/gotool
    repository = https://github.com/kisielk/gotool
    revision = 80517062f5
    [go_github.com_mattn_go-isatty]
    <= go-git-package
    go.importpath = github.com/mattn/go-isatty
    repository = https://github.com/mattn/go-isatty
    revision = 3fb116b820
    [go_github.com_mattn_go-runewidth]
    <= go-git-package
    go.importpath = github.com/mattn/go-runewidth
    repository = https://github.com/mattn/go-runewidth
    revision = b20a3daf6a
    [go_github.com_matttproud_golang_protobuf_extensions]
    <= go-git-package
    go.importpath = github.com/matttproud/golang_protobuf_extensions
    repository = https://github.com/matttproud/golang_protobuf_extensions
    revision = v1.0.0-2-gc12348ce28
    [go_github.com_mholt_caddy]
    <= go-git-package
    go.importpath = github.com/mholt/caddy
    repository = https://lab.nexedi.com/nexedi/caddy.git
    revision = v0.11.0-3-g12438f6cff
    [go_github.com_neelance_parallel]
    <= go-git-package
    go.importpath = github.com/neelance/parallel
    repository = https://github.com/neelance/parallel
    revision = 4de9ce63d1
    [go_github.com_nicksnyder_go-i18n]
    <= go-git-package
    go.importpath = github.com/nicksnyder/go-i18n
    repository = https://github.com/nicksnyder/go-i18n
    revision = fc57a7d765
    [go_github.com_nsf_gocode]
    <= go-git-package
    go.importpath = github.com/nsf/gocode
    repository = https://github.com/nsf/gocode
    revision = 7b1d4e18cd
    [go_github.com_opentracing_basictracer-go]
    <= go-git-package
    go.importpath = github.com/opentracing/basictracer-go
    repository = https://github.com/opentracing/basictracer-go
    revision = 98b91394c2
    [go_github.com_opentracing_opentracing-go]
    <= go-git-package
    go.importpath = github.com/opentracing/opentracing-go
    repository = https://github.com/opentracing/opentracing-go
    revision = be550b025b
    [go_github.com_pelletier_go-toml]
    <= go-git-package
    go.importpath = github.com/pelletier/go-toml
    repository = https://github.com/pelletier/go-toml
    revision = v0.2.0-212-g81a861c69d
    [go_github.com_peterh_liner]
    <= go-git-package
    go.importpath = github.com/peterh/liner
    repository = https://github.com/peterh/liner
    revision = v1.1.0-0-g5a0dfa99e2
    [go_github.com_pkg_errors]
    <= go-git-package
    go.importpath = github.com/pkg/errors
    repository = https://github.com/pkg/errors
    revision = v0.8.0-17-g059132a15d
    [go_github.com_pmezard_go-difflib]
    <= go-git-package
    go.importpath = github.com/pmezard/go-difflib
    repository = https://github.com/pmezard/go-difflib
    revision = v1.0.0-0-g792786c740
    [go_github.com_prometheus_client_golang]
    <= go-git-package
    go.importpath = github.com/prometheus/client_golang
    repository = https://github.com/prometheus/client_golang
    revision = v0.9.0-6-g16f375c74d
    [go_github.com_prometheus_client_model]
    <= go-git-package
    go.importpath = github.com/prometheus/client_model
    repository = https://github.com/prometheus/client_model
    revision = model-0.0.2-18-g5c3871d899
    [go_github.com_prometheus_common]
    <= go-git-package
    go.importpath = github.com/prometheus/common
    repository = https://github.com/prometheus/common
    revision = 7e9e6cabbd
    [go_github.com_prometheus_procfs]
    <= go-git-package
    go.importpath = github.com/prometheus/procfs
    repository = https://github.com/prometheus/procfs
    revision = 185b428841
    [go_github.com_ramya-rao-a_go-outline]
    <= go-git-package
    go.importpath = github.com/ramya-rao-a/go-outline
    repository = https://github.com/ramya-rao-a/go-outline
    revision = 9e9d089bb6
    [go_github.com_rogpeppe_godef]
    <= go-git-package
    go.importpath = github.com/rogpeppe/godef
    repository = https://github.com/rogpeppe/godef
    revision = v1.0.0-0-g7b4626be9f
    [go_github.com_sirupsen_logrus]
    <= go-git-package
    go.importpath = github.com/sirupsen/logrus
    repository = https://github.com/sirupsen/logrus
    revision = 4fabf2fffc
    [go_github.com_skratchdot_open-golang]
    <= go-git-package
    go.importpath = github.com/skratchdot/open-golang
    repository = https://github.com/skratchdot/open-golang
    revision = 75fb7ed420
    [go_github.com_slimsag_godocmd]
    <= go-git-package
    go.importpath = github.com/slimsag/godocmd
    repository = https://github.com/slimsag/godocmd
    revision = a1005ad29f
    [go_github.com_sourcegraph_ctxvfs]
    <= go-git-package
    go.importpath = github.com/sourcegraph/ctxvfs
    repository = https://github.com/sourcegraph/ctxvfs
    revision = 2b65f1b1ea
    [go_github.com_sourcegraph_go-langserver]
    <= go-git-package
    go.importpath = github.com/sourcegraph/go-langserver
    repository = https://github.com/sourcegraph/go-langserver
    revision = 2b83206020
    [go_github.com_sourcegraph_go-lsp]
    <= go-git-package
    go.importpath = github.com/sourcegraph/go-lsp
    repository = https://github.com/sourcegraph/go-lsp
    revision = 4631ffd93a
    [go_github.com_sourcegraph_jsonrpc2]
    <= go-git-package
    go.importpath = github.com/sourcegraph/jsonrpc2
    repository = https://github.com/sourcegraph/jsonrpc2
    revision = 549eb959f0
    [go_github.com_spf13_cobra]
    <= go-git-package
    go.importpath = github.com/spf13/cobra
    repository = https://github.com/spf13/cobra
    revision = fe5e611709
    [go_github.com_spf13_pflag]
    <= go-git-package
    go.importpath = github.com/spf13/pflag
    repository = https://github.com/spf13/pflag
    revision = 082b515c94
    [go_github.com_sqs_goreturns]
    <= go-git-package
    go.importpath = github.com/sqs/goreturns
    repository = https://github.com/sqs/goreturns
    revision = 83e02874ec
    [go_github.com_tylerb_gotype-live]
    <= go-git-package
    go.importpath = github.com/tylerb/gotype-live
    repository = https://github.com/tylerb/gotype-live
    revision = 440f9c77a4
    [go_github.com_uudashr_gopkgs]
    <= go-git-package
    go.importpath = github.com/uudashr/gopkgs
    repository = https://github.com/uudashr/gopkgs
    revision = 84fe2e5def
    [go_github.com_zmb3_gogetdoc]
    <= go-git-package
    go.importpath = github.com/zmb3/gogetdoc
    repository = https://github.com/zmb3/gogetdoc
    revision = 0d07153ccc
    [go_golang.org_x_arch]
    <= go-git-package
    go.importpath = golang.org/x/arch
    repository = https://go.googlesource.com/arch
    revision = b19384d3c1
    [go_golang.org_x_crypto]
    <= go-git-package
    go.importpath = golang.org/x/crypto
    repository = https://go.googlesource.com/crypto
    revision = 85e1b3f913
    [go_golang.org_x_lint]
    <= go-git-package
    go.importpath = golang.org/x/lint
    repository = https://go.googlesource.com/lint
    revision = 1baf3a9d7d
    [go_golang.org_x_net]
    <= go-git-package
    go.importpath = golang.org/x/net
    repository = https://go.googlesource.com/net
    revision = 9b4f9f5ad5
    [go_golang.org_x_sys]
    <= go-git-package
    go.importpath = golang.org/x/sys
    repository = https://go.googlesource.com/sys
    revision = d989b31c87
    [go_golang.org_x_tools]
    <= go-git-package
    go.importpath = golang.org/x/tools
    repository = https://go.googlesource.com/tools
    revision = a2dc47679d
    [go_gopkg.in_alecthomas_kingpin.v3-unstable]
    <= go-git-package
    go.importpath = gopkg.in/alecthomas/kingpin.v3-unstable
    repository = https://gopkg.in/alecthomas/kingpin.v3-unstable
    revision = df19058c87
    [go_gopkg.in_yaml.v2]
    <= go-git-package
    go.importpath = gopkg.in/yaml.v2
    repository = https://gopkg.in/yaml.v2
    revision = v2.1.1-17-g5420a8b674
    [go_honnef.co_go_tools]
    <= go-git-package
    go.importpath = honnef.co/go/tools
    repository = https://github.com/dominikh/go-tools
    revision = e3ad64cb4e
    [go_sourcegraph.com_sqs_goreturns]
    <= go-git-package
    go.importpath = sourcegraph.com/sqs/goreturns
    repository = https://github.com/sqs/goreturns
    revision = 83e02874ec
    software/theia/instance.cfg.in
    View file @ 00fcd8ea
    ...@@ -121,7 +121,7 @@ recipe = slapos.cookbook:userinfo ...@@ -121,7 +121,7 @@ recipe = slapos.cookbook:userinfo
    recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
    wrapper-path = $${directory:services}/$${:_buildout_section_name_} wrapper-path = $${directory:services}/$${:_buildout_section_name_}
    command-line = command-line =
    env LC_ALL=C.UTF-8 TMP=$${directory:tmp} THEIA_WEBVIEW_EXTERNAL_ENDPOINT='{{hostname}}' THEIA_SHELL=$${theia-shell:wrapper-path} ${theia-wrapper:rendered} --hostname=$${:hostname} --port=$${:port} $${directory:project} env LC_ALL=C.UTF-8 TMP=$${directory:tmp} THEIA_WEBVIEW_EXTERNAL_ENDPOINT='{{hostname}}' THEIA_SHELL=$${theia-shell:rendered} ${theia-wrapper:rendered} --hostname=$${:hostname} --port=$${:port} $${directory:project}
    ip = $${instance-parameter:ipv4-random} ip = $${instance-parameter:ipv4-random}
    hostname = $${:ip} hostname = $${:ip}
    ...@@ -132,12 +132,18 @@ hash-existing-files = ...@@ -132,12 +132,18 @@ hash-existing-files =
    ${theia-wrapper:rendered} ${theia-wrapper:rendered}
    [theia-shell] [theia-shell]
    recipe = slapos.cookbook:wrapper recipe = slapos.recipe.template:jinja2
    wrapper-path = $${directory:bin}/$${:_buildout_section_name_} rendered = $${directory:bin}/$${:_buildout_section_name_}
    # reset GIT_EXEC_PATH to workaround https://github.com/eclipse-theia/theia/issues/7555 mode = 0700
    # activate slapos configuration template = inline:
    command-line = #!${python:location}/bin/python
    ${bash:location}/bin/bash -c ". $${slapos-standalone-activate:rendered} && exec env GIT_EXEC_PATH= ${bash:location}/bin/bash" import sys
    import os
    args = sys.argv[1:]
    # when running interactively, activate slapos configuration and reset GIT_EXEC_PATH to workaround https://github.com/eclipse-theia/theia/issues/7555
    if not args: args = ["-c", ". $${slapos-standalone-activate:rendered} && exec env GIT_EXEC_PATH= ${bash:location}/bin/bash", ]
    os.execv('${bash:location}/bin/bash', ['${bash:location}/bin/bash'] + args)
    [slapos-standalone-activate] [slapos-standalone-activate]
    recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
    ...@@ -147,7 +153,16 @@ mode = 0700 ...@@ -147,7 +153,16 @@ mode = 0700
    template = template =
    inline:#!/bin/sh inline:#!/bin/sh
    export PATH=${buildout:bin-directory}:$PATH export PATH=${buildout:bin-directory}:$PATH
    ${slapos-standalone:script-path} $${directory:slapos} $${:ipv4} $${:ipv6} $${:port} ${slapos-standalone:script-path} \
    $${directory:slapos} \
    $${:ipv4} \
    $${:ipv6} \
    $${:port} \
    $${slap-connection:server-url} \
    $${slap-connection:computer-id} \
    $${slap-connection:partition-id} \
    --key='$${slap-connection:key-file}' \
    --cert='$${slap-connection:cert-file}'
    export SLAPOS_CONFIGURATION=$${directory:slapos}/etc/slapos.cfg export SLAPOS_CONFIGURATION=$${directory:slapos}/etc/slapos.cfg
    export SLAPOS_CLIENT_CONFIGURATION=$SLAPOS_CONFIGURATION export SLAPOS_CLIENT_CONFIGURATION=$SLAPOS_CONFIGURATION
    ......
    software/theia/software.cfg
    View file @ 00fcd8ea
    ...@@ -10,15 +10,11 @@ extends = ...@@ -10,15 +10,11 @@ extends =
    ../../component/vim/buildout.cfg ../../component/vim/buildout.cfg
    ../../component/curl/buildout.cfg ../../component/curl/buildout.cfg
    ../../component/coreutils/buildout.cfg ../../component/coreutils/buildout.cfg
    ../../component/java-jdk/buildout.cfg
    ../../stack/slapos.cfg ../../stack/slapos.cfg
    ../../stack/monitor/buildout.cfg ../../stack/monitor/buildout.cfg
    ./gowork.cfg ../../component/defaults.cfg
    ./buildout.hash.cfg ./buildout.hash.cfg
    # this gowork.cfg includes the one from caddy, because they share the only gowork
    # workspace (not intentionnaly, as far as I see there's only one gowork per SR)
    # it is included after caddy, otherwise only caddy is installed. The problem of this
    # approach is that caddy's version will be the one pinned here, so we have to update
    # here as well.
    parts = parts =
    theia-wrapper theia-wrapper
    ...@@ -28,6 +24,11 @@ parts = ...@@ -28,6 +24,11 @@ parts =
    # default for slapos-standalone # default for slapos-standalone
    shared-part-list = shared-part-list =
    # We keep the gcc part in sync with the one from erp5 software, so that when we install
    # erp5 inside theia's slapos parts can be shared.
    [gcc]
    max_version = 0
    [nodejs] [nodejs]
    <= nodejs-10.19.0 <= nodejs-10.19.0
    ...@@ -64,14 +65,33 @@ initialization = ...@@ -64,14 +65,33 @@ initialization =
    parser.add_argument('ipv4') parser.add_argument('ipv4')
    parser.add_argument('ipv6') parser.add_argument('ipv6')
    parser.add_argument('server_port', type=int) parser.add_argument('server_port', type=int)
    forwarded_arguments = parser.add_argument_group('forwarded')
    forwarded_arguments.add_argument('master_url')
    forwarded_arguments.add_argument('computer')
    forwarded_arguments.add_argument('partition')
    # cert and key are optional
    forwarded_arguments.add_argument('--cert')
    forwarded_arguments.add_argument('--key')
    args = parser.parse_args() args = parser.parse_args()
    shared_part_list = [x.strip() for x in '''${buildout:shared-part-list}'''.splitlines() if x.strip()] shared_part_list = [x.strip() for x in '''${buildout:shared-part-list}'''.splitlines() if x.strip()]
    partition_forward_configuration = (
    slapos.slap.standalone.PartitionForwardAsPartitionConfiguration(
    master_url=args.master_url,
    computer=args.computer,
    partition=args.partition,
    cert=args.cert,
    key=args.key,
    software_release_list=(
    'http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg',
    ),
    ),
    )
    standalone = slapos.slap.standalone.StandaloneSlapOS( standalone = slapos.slap.standalone.StandaloneSlapOS(
    args.base_directory, args.base_directory,
    args.ipv4, args.ipv4,
    args.server_port, args.server_port,
    shared_part_list=shared_part_list shared_part_list=shared_part_list,
    partition_forward_configuration=partition_forward_configuration,
    ) )
    standalone.start() standalone.start()
    partition_count = 20 partition_count = 20
    ...@@ -139,7 +159,8 @@ mode = 0644 ...@@ -139,7 +159,8 @@ mode = 0644
    [package.json] [package.json]
    recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
    # this comes from https://github.com/theia-ide/theia-apps/blob/2991e3a433f031b22bc80e274f80620d1e6898e5/theia-full-docker/latest.package.json # this comes from https://github.com/theia-ide/theia-apps/blob/3391dd07cba7ddc5cc833420349a27beb66a5433/theia-full-docker/latest.package.json
    # but with a more recent version of vscode-java-redhat, where https://github.com/redhat-developer/vscode-java/issues/1301 was fixed
    template = template =
    inline:{ inline:{
    "private": true, "private": true,
    ...@@ -163,17 +184,20 @@ template = ...@@ -163,17 +184,20 @@ template =
    "**/node_modules/**": true "**/node_modules/**": true
    }, },
    "editor.multiCursorModifier": "ctrlCmd", "editor.multiCursorModifier": "ctrlCmd",
    "plantuml.webservice": "//plantuml.host.vifib.net/svg/", "editor.tabSize": 2,
    "plantuml.monochrome": false, "plantuml.monochrome": false,
    "editor.tabSize": 2 "plantuml.webservice": "//plantuml.host.vifib.net/svg/",
    "gitlens.remotes": [{ "domain": "lab.nexedi.com", "type": "GitLab" }],
    "java.home": "${java-jdk:location}"
    } }
    } }
    } }
    }, },
    "dependencies": { "dependencies": {
    "@theia/callhierarchy": "latest", "@theia/callhierarchy": "latest",
    "@theia/console": "latest",
    "@theia/core": "latest", "@theia/core": "latest",
    "@theia/cpp": "latest", "@theia/cpp-debug": "latest",
    "@theia/debug": "latest", "@theia/debug": "latest",
    "@theia/editor": "latest", "@theia/editor": "latest",
    "@theia/editor-preview": "latest", "@theia/editor-preview": "latest",
    ...@@ -200,9 +224,11 @@ template = ...@@ -200,9 +224,11 @@ template =
    "@theia/preview": "latest", "@theia/preview": "latest",
    "@theia/process": "latest", "@theia/process": "latest",
    "@theia/rust": "latest", "@theia/rust": "latest",
    "@theia/scm": "latest",
    "@theia/search-in-workspace": "latest", "@theia/search-in-workspace": "latest",
    "@theia/task": "latest", "@theia/task": "latest",
    "@theia/terminal": "latest", "@theia/terminal": "latest",
    "@theia/typehierarchy": "latest",
    "@theia/userstorage": "latest", "@theia/userstorage": "latest",
    "@theia/variable-resolver": "latest", "@theia/variable-resolver": "latest",
    "@theia/vsx-registry": "latest", "@theia/vsx-registry": "latest",
    ...@@ -211,8 +237,9 @@ template = ...@@ -211,8 +237,9 @@ template =
    "resolutions": { "resolutions": {
    "vscode-json-languageserver": "1.2.2", "vscode-json-languageserver": "1.2.2",
    "vscode-languageserver-protocol": "3.15.0-next.9", "vscode-languageserver-protocol": "3.15.0-next.9",
    "vscode-languageserver-types": "3.15.0-next.4", "vscode-languageserver-types": "3.15.0-next.5",
    "**/vscode-json-languageserver/**/vscode-languageserver": "6.0.0-next.1" "**/vscode-json-languageserver/**/vscode-languageserver": "6.0.0-next.1",
    "**/moment": "2.24.0"
    }, },
    "devDependencies": { "devDependencies": {
    "@theia/cli": "latest" "@theia/cli": "latest"
    ...@@ -285,7 +312,7 @@ template = ...@@ -285,7 +312,7 @@ template =
    "vscode-go": "https://github.com/microsoft/vscode-go/releases/download/0.12.0/Go-0.12.0.vsix", "vscode-go": "https://github.com/microsoft/vscode-go/releases/download/0.12.0/Go-0.12.0.vsix",
    "vscode-java-debug": "https://github.com/microsoft/vscode-java-debug/releases/download/0.24.0/vscjava.vscode-java-debug-0.24.0.vsix", "vscode-java-debug": "https://github.com/microsoft/vscode-java-debug/releases/download/0.24.0/vscjava.vscode-java-debug-0.24.0.vsix",
    "vscode-java-dependency-viewer": "https://github.com/microsoft/vscode-java-dependency/releases/download/0.6.0/vscode-java-dependency-0.6.0.vsix", "vscode-java-dependency-viewer": "https://github.com/microsoft/vscode-java-dependency/releases/download/0.6.0/vscode-java-dependency-0.6.0.vsix",
    "vscode-java-redhat": "https://github.com/redhat-developer/vscode-java/releases/download/v0.54.2/redhat.java-0.54.2.vsix", "vscode-java-redhat": "https://github.com/redhat-developer/vscode-java/releases/download/v0.61.0/redhat.java-0.61.0.vsix",
    "vscode-java-test": "https://github.com/microsoft/vscode-java-test/releases/download/0.22.0/vscjava.vscode-java-test-0.22.0.vsix", "vscode-java-test": "https://github.com/microsoft/vscode-java-test/releases/download/0.22.0/vscjava.vscode-java-test-0.22.0.vsix",
    "vscode-python": "https://github.com/microsoft/vscode-python/releases/download/2020.1.58038/ms-python-release.vsix", "vscode-python": "https://github.com/microsoft/vscode-python/releases/download/2020.1.58038/ms-python-release.vsix",
    "vscode-ruby": "https://github.com/rubyide/vscode-ruby/releases/download/v0.25.0/ruby-0.25.0.vsix", "vscode-ruby": "https://github.com/rubyide/vscode-ruby/releases/download/v0.25.0/ruby-0.25.0.vsix",
    ...@@ -297,29 +324,15 @@ mode = 0644 ...@@ -297,29 +324,15 @@ mode = 0644
    [gowork] [gowork]
    # Install go-language-server in workspace golang = ${golang1.14:location}
    # Note that this is the same workspace as caddy.
    # install list comes from https://github.com/theia-ide/go-language-server/blob/d259749c8f263c4d845055833b03b1d2dbefa5b3/README.md#prerequisites [gowork.goinstall]
    install += command =
    github.com/ramya-rao-a/go-outline bash -c ". ${gowork:env.sh} && GO111MODULE=on go get golang.org/x/tools/gopls@v0.4.3"
    github.com/acroca/go-symbols
    github.com/nsf/gocode
    github.com/rogpeppe/godef
    golang.org/x/tools/cmd/godoc
    github.com/zmb3/gogetdoc
    golang.org/x/lint/golint
    github.com/fatih/gomodifytags
    github.com/uudashr/gopkgs/cmd/gopkgs
    golang.org/x/tools/cmd/gorename
    sourcegraph.com/sqs/goreturns
    github.com/cweill/gotests/...
    golang.org/x/tools/cmd/guru
    github.com/josharian/impl
    github.com/haya14busa/goplay/cmd/goplay
    github.com/davidrjenni/reftools/cmd/fillstruct
    [cli-utilities] [cli-utilities]
    PATH = ${nodejs:location}/bin/:${bash:location}/bin/:${fish-shell:location}/bin/:${tig:location}/bin/:${vim:location}/bin/:${tmux:location}/bin/:${git:location}/bin/:${curl:location}/bin PATH = ${nodejs:location}/bin/:${bash:location}/bin/:${fish-shell:location}/bin/:${tig:location}/bin/:${vim:location}/bin/:${tmux:location}/bin/:${git:location}/bin/:${curl:location}/bin:${python2.7:location}/bin/
    [theia-wrapper] [theia-wrapper]
    recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
    ...@@ -329,7 +342,7 @@ template = ...@@ -329,7 +342,7 @@ template =
    inline: inline:
    #!/bin/bash #!/bin/bash
    . ${gowork:env.sh} . ${gowork:env.sh}
    export PATH=${python-language-server:location}/bin/:${cli-utilities:PATH}:$PATH export PATH=${python-language-server:location}/bin/:${java-jdk:location}/bin/:${cli-utilities:PATH}:$PATH
    export THEIA_DEFAULT_PLUGINS="local-dir:${theia:THEIA_DEFAULT_PLUGINS}" export THEIA_DEFAULT_PLUGINS="local-dir:${theia:THEIA_DEFAULT_PLUGINS}"
    # reset PS1 from gowork # reset PS1 from gowork
    export PS1='$ ' export PS1='$ '
    ......
    software/theia/test/test.py
    View file @ 00fcd8ea
    ...@@ -29,6 +29,7 @@ from __future__ import unicode_literals ...@@ -29,6 +29,7 @@ from __future__ import unicode_literals
    import os import os
    import textwrap import textwrap
    import logging import logging
    import subprocess
    import tempfile import tempfile
    import time import time
    from six.moves.urllib.parse import urlparse, urljoin from six.moves.urllib.parse import urlparse, urljoin
    ...@@ -89,6 +90,15 @@ class TestTheia(SlapOSInstanceTestCase): ...@@ -89,6 +90,15 @@ class TestTheia(SlapOSInstanceTestCase):
    # use a large enough terminal so that slapos proxy show table fit in the screen # use a large enough terminal so that slapos proxy show table fit in the screen
    process.setwinsize(5000, 5000) process.setwinsize(5000, 5000)
    # log process output for debugging
    logger = logging.getLogger('theia-shell')
    class DebugLogFile:
    def write(self, msg):
    logger.info("output from theia-shell: %s", msg)
    def flush(self):
    pass
    process.logfile = DebugLogFile()
    process.expect_exact('Standalone SlapOS: Formatting 20 partitions') process.expect_exact('Standalone SlapOS: Formatting 20 partitions')
    process.expect_exact('Standalone SlapOS for computer `local` activated') process.expect_exact('Standalone SlapOS for computer `local` activated')
    ...@@ -122,3 +132,13 @@ class TestTheia(SlapOSInstanceTestCase): ...@@ -122,3 +132,13 @@ class TestTheia(SlapOSInstanceTestCase):
    process.terminate() process.terminate()
    process.wait() process.wait()
    def test_theia_shell_execute_tasks(self):
    # shell needs to understand -c "comamnd" arguments for theia tasks feature
    test_file = '{}/test file'.format(self.computer_partition_root_path)
    subprocess.check_call([
    '{}/bin/theia-shell'.format(self.computer_partition_root_path),
    '-c',
    'touch "{}"'.format(test_file)
    ])
    self.assertTrue(os.path.exists(test_file))
    software/theia/yarn.lock
    View file @ 00fcd8ea
    This source diff could not be displayed because it is too large. You can view the blob instead.
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7