Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,17 @@ BK_LHCFILL_PROTO="https://raw.githubusercontent.com/AliceO2Group/Bookkeeping/mai
VERBOSE_1 := -v
VERBOSE_2 := -v -x

WHAT := o2-aliecs-core o2-aliecs-executor coconut peanut walnut o2-apricot
WHAT := o2-aliecs-core o2-aliecs-executor coconut peanut o2-apricot
WHAT_o2-aliecs-core_BUILD_FLAGS=$(BUILD_ENV_FLAGS)
WHAT_o2-aliecs-executor_BUILD_FLAGS=$(BUILD_ENV_FLAGS)
WHAT_coconut_BUILD_FLAGS=$(BUILD_ENV_FLAGS)
WHAT_peanut_BUILD_FLAGS=$(BUILD_ENV_FLAGS)
WHAT_walnut_BUILD_FLAGS=$(BUILD_ENV_FLAGS)
WHAT_o2-apricot_BUILD_FLAGS=$(BUILD_ENV_FLAGS)

INSTALL_WHAT:=$(patsubst %, install_%, $(WHAT))

GENERATE_DIRS := ./apricot ./coconut/cmd ./common ./common/runtype ./common/system ./core ./core/integration/ccdb ./core/integration/dcs ./core/integration/ddsched ./core/integration/kafka ./core/integration/odc ./executor ./walnut ./core/integration/trg ./core/integration/bookkeeping
SRC_DIRS := ./apricot ./cmd/* ./core ./coconut ./executor ./common ./configuration ./occ/peanut ./walnut
GENERATE_DIRS := ./apricot ./coconut/cmd ./common ./common/runtype ./common/system ./core ./core/integration/ccdb ./core/integration/dcs ./core/integration/ddsched ./core/integration/kafka ./core/integration/odc ./executor ./core/integration/trg ./core/integration/bookkeeping
SRC_DIRS := ./apricot ./cmd/* ./core ./coconut ./executor ./common ./configuration ./occ/peanut
TEST_DIRS := ./apricot/local ./common/gera ./common/utils ./common/utils/safeacks ./configuration/cfgbackend ./configuration/componentcfg ./configuration/template ./core/task/sm ./core/workflow ./core/integration/odc/fairmq ./core/integration/ccdb ./core/integration ./core/environment
GO_TEST_DIRS := ./core/repos ./core/integration/dcs ./common/monitoring

Expand Down
32 changes: 0 additions & 32 deletions cmd/walnut/main.go

This file was deleted.

5 changes: 2 additions & 3 deletions docs/building.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ AliECS consists of:
* coconut - Go, runs locally or wherever you like and connects to core
* process control plugin + library (OCC) - C++, runs throughout the cluster linked by user processes
* peanut - Go, local debugging tool
* walnut - Go, local workflow conversion tool

## Building with aliBuild

Expand All @@ -29,7 +28,7 @@ For development purposes, due to the significant differences in building and dep
$ aliBuild init --defaults o2-dataflow Control-OCCPlugin
$ aliBuild build --defaults o2-dataflow Control-OCCPlugin

# Includes core and executor in default build, can be used to build coconut, peanut and walnut locally
# Includes core and executor in default build, can be used to build coconut and peanut locally
$ aliBuild init --defaults o2-dataflow Control-Core
$ aliBuild build --defaults o2-dataflow Control-Core
```
Expand Down Expand Up @@ -87,4 +86,4 @@ For subsequent builds (after the first one), plain `make` (instead of `make all`

If you wish to also build the process control library and/or plugin, see [the OCC readme](./occ/README.md).

This build of AliECS can be run locally and connected to an existing O²/FLP Suite cluster by passing a `--mesosUrl` parameter. If you do this, remember to `systemctl stop o2-aliecs-core` on the head node, in order to stop the core that came with the O²/FLP Suite and use your own.
This build of AliECS can be run locally and connected to an existing O²/FLP Suite cluster by passing a `--mesosUrl` parameter. If you do this, remember to `systemctl stop o2-aliecs-core` on the head node, in order to stop the core that came with the O²/FLP Suite and use your own.
75 changes: 0 additions & 75 deletions walnut/README.md

This file was deleted.

31 changes: 0 additions & 31 deletions walnut/app/constants.go

This file was deleted.

83 changes: 0 additions & 83 deletions walnut/cmd/about.go

This file was deleted.

75 changes: 0 additions & 75 deletions walnut/cmd/check.go

This file was deleted.

Loading