Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore[facade]: use picocli for processing command line options #4157

Merged
merged 30 commits into from
Aug 14, 2021
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
a096796
chore[facade]: use picocli for processing command line options
keturn Sep 22, 2020
ab816f5
chore[facade]: update run configs to match new spellings
keturn Sep 30, 2020
fe770d8
Merge remote-tracking branch 'origin/develop' into feat/picocli
keturn Sep 30, 2020
bbd2934
chore[facade]: set project path for annotation output as recommended …
keturn Sep 30, 2020
43eb770
chore[facade]: update .idea for annotation project value
keturn Oct 1, 2020
fd781dd
chore[facade]: use `implementation` configuration instead of deprecat…
keturn Oct 1, 2020
c1d63f5
chore[IntelliJ]: exclude compiler.xml from version control
keturn Oct 1, 2020
425470b
Merge remote-tracking branch 'origin/develop' into feat/picocli
keturn Nov 14, 2020
c0f114b
chore (build): add picocli dependency to facade
keturn Nov 15, 2020
3c5845e
fix (build): use posix-style args in game tasks
keturn Nov 15, 2020
0ce3dfb
Merge remote-tracking branch 'origin/develop' into feat/picocli
keturn Nov 27, 2020
3442265
chore (git): ignore .idea/caches
keturn Nov 15, 2020
96ac14b
fix (facade): remove extra validation on homedir
keturn Nov 27, 2020
2a75286
fix (facade): revert removal of "override default" from name of option
keturn Nov 27, 2020
7797484
fix (facade): `--help` is handled by `usageHelp=true`, not unused.
keturn Nov 27, 2020
3c38a35
fix (idea): revert accidental insertion of platform-specific path
keturn Nov 27, 2020
14238c8
Merge remote-tracking branch 'origin/develop' into feat/picocli
keturn Dec 12, 2020
dcae3a3
Merge remote-tracking branch 'origin/develop' into feat/picocli
keturn Dec 12, 2020
59f8ef5
Merge remote-tracking branch 'origin/develop' into feat/picocli
keturn Dec 20, 2020
5942300
fix (docs): update command-line options used in documentation examples
keturn Dec 20, 2020
4b0053d
chore: checkstyle tidying
keturn Dec 20, 2020
10c248c
chore (facade): remove individual options from class docstring
keturn Dec 20, 2020
bdd524c
chore (facade): add link to launcher in help footer
keturn Dec 20, 2020
245534a
Merge remote-tracking branch 'origin/develop' into feat/picocli
keturn Jan 30, 2021
7afa54f
Merge remote-tracking branch 'origin/develop' into feat/picocli
keturn Feb 6, 2021
d27f72d
Merge remote-tracking branch 'origin/develop' into feat/picocli
keturn Mar 10, 2021
ac19044
Merge remote-tracking branch 'origin/develop' into feat/picocli
keturn Jul 27, 2021
9537828
Merge branch 'develop' into feat/picocli
keturn Aug 7, 2021
ad546a1
Merge remote-tracking branch 'origin/develop' into feat/picocli
keturn Aug 14, 2021
d4c11dc
fix(PathManager): remove redundant elements from home path
keturn Aug 14, 2021
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
3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions .idea/compiler.xml

This file was deleted.

4 changes: 3 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/TerasologyPC.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/TerasologyPC__2nd_client_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/TerasologyPC__3rd_client_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/TerasologyPC__CR_enabled_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/TerasologyPC__EXTREME_8GB_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/TerasologyPC__Headless_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/TerasologyPC__Splash_disabled_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/TerasologyPC__load_latest_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/TerasologyPC__no_audio_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/TerasologyPC__no_saves_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/TerasologyPC__recreate_latest_.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 10 additions & 15 deletions facades/PC/build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
/*
* Copyright 2020 MovingBlocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2020 The Terasology Foundation
// SPDX-License-Identifier: Apache-2.0

// The PC facade is responsible for the primary distribution - a plain Java application runnable on PCs

Expand Down Expand Up @@ -95,6 +82,9 @@ println "PC VERSION: $version"
group = 'org.terasology.facades'

dependencies {
implementation 'info.picocli:picocli:4.5.1'
annotationProcessor 'info.picocli:picocli-codegen:4.5.1'

implementation project(':engine')
implementation group: 'org.reflections', name: 'reflections', version: '0.9.10'

Expand All @@ -121,6 +111,11 @@ configurations {
}
}

compileJava {
// according to https://picocli.info/#_gradle_2
options.compilerArgs += ["-Aproject=${project.group}/${project.name}"]
}

run {
description = "Run 'Terasology' to play the game as a standard PC application"
group = "terasology run"
Expand Down
Loading