Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
orchestra-v3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alessandro Di Federico
orchestra-v3
Commits
37ed408e
Commit
37ed408e
authored
4 years ago
by
Filippo Cremonese
Browse files
Options
Downloads
Patches
Plain Diff
Improved command line interface, adding short options
parent
1a547097
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
orchestra.py
+2
-2
2 additions, 2 deletions
orchestra.py
orchestra/model/configuration.py
+3
-3
3 additions, 3 deletions
orchestra/model/configuration.py
with
5 additions
and
5 deletions
orchestra.py
+
2
−
2
View file @
37ed408e
...
...
@@ -10,9 +10,9 @@ from orchestra.model.configuration import Configuration
parser
=
argparse
.
ArgumentParser
()
# TODO: set default loglevel to INFO or WARNING
parser
.
add_argument
(
"
--loglevel
"
,
"
-v
"
,
default
=
"
DEBUG
"
,
choices
=
[
"
DEBUG
"
,
"
INFO
"
,
"
WARNING
"
,
"
ERROR
"
,
"
CRITICAL
"
])
parser
.
add_argument
(
"
--quiet
"
,
action
=
"
store_true
"
,
help
=
"
Do not show output of executed commands
"
)
parser
.
add_argument
(
"
--quiet
"
,
"
-q
"
,
action
=
"
store_true
"
,
help
=
"
Do not show output of executed commands
"
)
parser
.
add_argument
(
"
--no-config-cache
"
,
action
=
"
store_true
"
,
help
=
"
Do not cache generated yaml configuration
"
)
parser
.
add_argument
(
"
--
no-binary-archives
"
,
action
=
"
store_true
"
,
help
=
"
Build all components from source
"
)
parser
.
add_argument
(
"
--
from-source
"
,
"
-B
"
,
action
=
"
store_true
"
,
help
=
"
Build all components from source
"
)
subparsers
=
install_subcommands
(
parser
)
...
...
This diff is collapsed.
Click to expand it.
orchestra/model/configuration.py
+
3
−
3
View file @
37ed408e
...
...
@@ -19,7 +19,7 @@ class Configuration:
def
__init__
(
self
,
args
):
self
.
args
=
args
self
.
components
:
Dict
[
str
,
comp
.
Component
]
=
{}
self
.
no_binary_archives
=
args
.
no_binary_archives
self
.
from_source
=
args
.
from_source
self
.
orchestra_dotdir
=
self
.
_locate_orchestra_dotdir
()
if
not
self
.
orchestra_dotdir
:
...
...
@@ -148,7 +148,7 @@ class Configuration:
configure_script
=
build_yaml
[
"
configure
"
]
build
.
configure
=
ConfigureAction
(
build
,
configure_script
,
self
)
from_source
=
component_yaml
.
get
(
"
build_from_source
"
,
False
)
or
self
.
no_binary_archives
from_source
=
component_yaml
.
get
(
"
build_from_source
"
,
False
)
or
self
.
from_source
install_script
=
build_yaml
[
"
install
"
]
build
.
install
=
InstallAction
(
build
,
install_script
,
self
,
from_binary_archives
=
not
from_source
)
...
...
@@ -185,7 +185,7 @@ class Configuration:
build
.
configure
.
external_dependencies
.
add
(
dep_action
)
if
not
component_yaml
.
get
(
"
build_from_source
"
)
\
and
not
self
.
no_binary_archives
\
and
not
self
.
from_source
\
and
not
build_only
:
build
.
install
.
external_dependencies
.
add
(
dep_action
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment