Skip to content

Commit bcf70b6

Browse files
authored
devonfw#41: reworked documentation (devonfw#46)
1 parent c9517d4 commit bcf70b6

18 files changed

+138
-155
lines changed

.mvn/settings.xml

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
<?xml version="1.0" encoding="UTF-8"?>
32
<settings>
43
<servers>

README.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ See also our latest video https://vimeo.com/808368450/88d4af9d18[devon ide updat
6565
* link:documentation/features.asciidoc[Features]
6666
* link:documentation/setup.asciidoc[Download & Setup]
6767
* link:documentation/usage.asciidoc[Usage]
68-
* link:documentation/devonfw-ide-contribution-getting-started.asciidoc[Contribution]
68+
* link:documentation/IDEasy-contribution-getting-started.asciidoc[Contribution]
6969
* link:documentation/configuration.asciidoc[Configuration]
7070
* link:documentation/structure.asciidoc[Structure]
7171
* link:documentation/cli.asciidoc[Command Line Interface]

documentation/devonfw-ide-contribution-getting-started.asciidoc documentation/IDEasy-contribution-getting-started.asciidoc

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
:toc:
22
toc::[]
33

4-
= Getting started as developer contributing to devonfw-ide
4+
= Getting started as developer contributing to IDEasy
55

66
== Installation
7-
To start developing devonfw-ide, you must first install it on your computer.
7+
To start developing IDEasy, you must first install it on your computer.
88
Therefore simply follow the link:setup.asciidoc[setup] guide.
9-
It is important to notice that this installation gives you the latest published version of the devonfw-ide with which you can execute commands like eclipse or docker whose scripts are located inside the "${DEVON_IDE_HOME}$/scripts/command, but for committing code we use a differing folder structure.
9+
It is important to notice that this installation gives you the latest published version of IDEasy with which you can execute commands like eclipse or docker whose scripts are located inside the "${IDE_HOME}$/scripts/command, but for committing code we use a differing folder structure.
1010
This will be addressed under xref:Contribution[Contribution].
1111

1212
== Contribution
1313
To begin, read through the https://github.com/devonfw/.github/blob/master/CONTRIBUTING.asciidoc[Contribution Guidelines], which you should be sure to follow.
1414
First steps regarding forks or cloning of repos and creating branches, as well as some git commands, can be found in the https://github.com/firstcontributions/first-contributions[first contributions guideline].
15-
To contribute code or documentation regarding the devonfw-ide at first you need to fork the https://github.com/devonfw/ide[devonfw-ide] repository and then you can clone your fork into the folder `workspaces/main` in your devonfw-ide installation.
16-
Open git-bash in the cloned fork at `workspaces/main/ide` and run the following command:
15+
To contribute code or documentation regarding IDEasy at first you need to fork the https://github.com/devonfw/ideasy[IDEasy] repository and then you can clone your fork into the folder `workspaces/main` in your IDEasy installation.
16+
Open git-bash in the cloned fork at `workspaces/main/IDEasy` and run the following command:
1717
```
18-
git remote add upstream https://github.com/devonfw/ide.git
18+
git remote add upstream https://github.com/devonfw/ideasy.git
1919
git fetch upstream
2020
```
2121
Whenever you want to implement a new change first do the following things:
@@ -27,27 +27,27 @@ git checkout -b feature/«issue-id»-«brief-feature-description»
2727
```
2828
Now you can do the changes, improvements, and fixes.
2929
Once they are tested and seem to work, you can commit them (`git commit -m "#«issue-id»: «description»"`).
30-
If some days have passed meanwhile you should merge changes that meanwhile happened on the official `ide` repo:
30+
If some days have passed meanwhile you should merge changes that meanwhile happened on the official `IDEasy` repo:
3131
```
3232
git pull upstream master
3333
```
3434
Once you are complete and everything is merged and comitted, you can push your local feature branch and make it a remote branch of your fork on github:
3535
```
3636
git push -u origin feature/«issue-id»-«brief-feature-description»
3737
```
38-
Now you can go to https://github.com/devonfw/ide/pulls and create the pull-request (PR) from your new feature.
38+
Now you can go to https://github.com/devonfw/ideasy/pulls and create the pull-request (PR) from your new feature.
3939
Therefore, please click on the right down arrow of the green button and choose `Create draft pull request` and then click on `Draft pull request`.
4040
When the checks have completed you can check the link:DoD.asciidoc[Definition-of-Done] (DoD).
4141
Once, all checks of the DoD are addressed, you can go the the very bottom of the PR and click on `Ready for review` what will take the PR out of the draft mode.
4242
FYI: If you forgot the upstream merge (`git pull upstream/master`) or the upstream changed again while your PR is still open, you will see `This branch is out-of-date with the base branch` at the bottom of your PR and can click on `Update branch`.
4343

44-
For further development and testing, it is recommended to xref:symbolic-links[symlink] the modified scripts into your devonfw-ide installation.
44+
For further development and testing, it is recommended to xref:symbolic-links[symlink] the modified scripts into your IDEasy installation.
4545
Alternatively, the scripts can be adapted in the installation folder and then committed to the project.
4646
For creating a contribution also check the link:DoD.asciidoc[Definition of Done] (DoD).
4747

4848
=== ShellCheck
4949

50-
To improve the code quality the https://github.com/koalaman/shellcheck/[ShellCheck] is used for devonfw-ide.
50+
To improve the code quality the https://github.com/koalaman/shellcheck/[ShellCheck] is used for IDEasy.
5151
There is a GitHub action _CI build PR_ for this. If this fails at the PR, you can find the error messages in the big logfile under _Build project with Maven_.
5252
For example, these look like this:
5353

@@ -109,12 +109,12 @@ The first part of the script contains the autocompletion, which should return th
109109
Functions like setup or run or other additional functions follow.
110110
Finally, it defines which function should be executed depending on the parameter.
111111

112-
Use the `doInstall` method for the installation, which downloads the tool based on the mirrors, unpacks it if necessary and puts it in the software folder in the `devonfw-ide` installation:
112+
Use the `doInstall` method for the installation, which downloads the tool based on the mirrors, unpacks it if necessary and puts it in the software folder in the `IDEasy` installation:
113113
```
114114
doInstall "-" "«installation-folder»" "«tool-name»" "«tool-version»"
115115
```
116116

117-
For standard installations omit `"«installation-folder»"` (use the empty string arg `""`) what will install to `${DEVON_IDE_HOME}/software/«tool-name»`.
117+
For standard installations omit `"«installation-folder»"` (use the empty string arg `""`) what will install to `${IDE_HOME}/software/«tool-name»`.
118118

119119
=== LICENSE
120120
Find the license for the new tool and add the tool to the table of `Third party components` of the link:LICENSE.asciidoc[LICENSE].
@@ -128,17 +128,17 @@ In the configuration files many link:variables.asciidoc[variables] can be define
128128

129129
== Tips and tricks
130130

131-
The following sub-sections give you some tips and tricks to boost your productivity when developing features for `devonfw-ide`.
131+
The following sub-sections give you some tips and tricks to boost your productivity when developing features for `IDEasy`.
132132

133133
== Symbolic Links
134134
With link:advanced-tooling-windows.asciidoc##create-symbolic-links[symbolic links] you can use one file or folder that is located inside one directory in one or multiple other directories, without copying the whole file or folder into the other directories.
135135
The file is still only saved at the initial location, but can be accessed through the created links in a much more comfortable way.
136136
So you are actually just linked to the original file and therefore don't have to worry about differing versions of the file in your directories.
137-
This is very helpful for testing our devonfw-ide, because e.g. the commandlets folder for testing is not the same as the commandlets folder for git-commits.
137+
This is very helpful for testing our IDEasy, because e.g. the commandlets folder for testing is not the same as the commandlets folder for git-commits.
138138
Install https://schinagl.priv.at/nt/hardlinkshellext/linkshellextension.html[link shell extension] and follow the instructions for installation and usage first.
139139
Later on you can make symbolic links of files or folder from your "git folder" and add them into the folder in which the testing is supposed to take place:
140140

141-
So select the folder `${DEVON_IDE_HOME}/workspaces/ide/scripts/src/main/resources/scripts/command/` and choose `Pick Link Source` and then go to `${DEVON_IDE_HOME}/scripts/` delete the `command` folder and re-create it as symbolic link via `Drop as... > Symbolic link`.
141+
So select the folder `${IDE_HOME}/workspaces/ide/scripts/src/main/resources/scripts/command/` and choose `Pick Link Source` and then go to `${IDE_HOME}/scripts/` delete the `command` folder and re-create it as symbolic link via `Drop as... > Symbolic link`.
142142
Do the same also for `functions`, `functions-core`, `commandlet-cli`, `environment-project`, `environment-project.bat`, `devon`, `devon.bat`, `autocomplete`, and `devon-autocomplete`.
143143
Now changes you make in the first mentioned file will directly be available in your testing environment through the created file-link in the testing environment.
144144

@@ -151,13 +151,13 @@ Have a look at https://github.com/devonfw/ide/blob/master/documentation/advanced
151151
You probably know this black box on Windows (the Command Prompt) that accepts commands like 'dir' that shows the content of the directory you are currently in,
152152
or 'cd' with which you can change the directory you are currently in and many more commands that allow you to interact with your Windows Operating System in a more direct and eventually faster way.
153153
Now for users of a Linux Distribution there is something similar, but way more powerful, usually called "Bourne Again Shell", or in short Bash.
154-
This Command Line Interface or "Shell" is what we use most often when implementing something new for our Command-Line-Tool with the name devonfw-ide. https://www.youtube.com/watch?v=I4EWvMFj37g[Have a look at Bash in 150 Seconds.]
154+
This Command Line Interface or "Shell" is what we use most often when implementing something new for our Command-Line-Tool with the name IDEasy. https://www.youtube.com/watch?v=I4EWvMFj37g[Have a look at Bash in 150 Seconds.]
155155
For MacOS you often also use BASH.
156156
That's why it is often enough to implement code for Mac or Linux (at least to some extend as you'll see soon enough) to be able to use it on both Operating Systems.
157157

158158
Let's get to the practical part of the Bash-usage.
159159

160-
**If you are using Windows**, make sure that you have git-bash installed, so you can execute the Bash commands mentioned in this introduction. [Here you can find git for windows](https://git-scm.com/download/win). In some cases later on you may want or need to use WSL. Our project teams standard way is to install WSL via Rancher Desktop, which is easily installable with the devonfw-ide by using the command `devon docker setup`. If you don't have the devonfw-ide yet, then you can follow [this guide](https://github.com/devonfw/ide/blob/master/documentation/setup.asciidoc)
160+
**If you are using Windows**, make sure that you have git-bash installed, so you can execute the Bash commands mentioned in this introduction. [Here you can find git for windows](https://git-scm.com/download/win). In some cases later on you may want or need to use WSL. Our project teams standard way is to install WSL via Rancher Desktop, which is easily installable with the IDEasy by using the command `ide install docker`. If you don't have the IDEasy yet, then you can follow [this guide](https://github.com/devonfw/ide/blob/master/documentation/setup.asciidoc)
161161

162162
The https://www.youtube.com/watch?v=oxuRxtrO2Ag[following video] gives you some important and helpful basics, still you don't need to know all of these commands directly by heart. Instead under the video you'll find a list with the commands mentioned in the video to make a command return to your mind. Also directly play around with those commands while watching the video to learn faster.
163163

@@ -187,4 +187,4 @@ In case you want to get your hands dirty with code that is already in use and co
187187
There are also some basic exercises related to our project that are not official yet, but you can ask for if you want to try some of them out to learn and challenge yourself a bit.
188188

189189
== Documentation
190-
Scroll down on https://github.com/devonfw/ide[this site] to get an overview of the documentation sections for the devonfw-ide, e.g. Home, Features, Download & Setup or have a look at https://github.com/devonfw/ide/tree/master/documentation[the documentation files folder].
190+
Scroll down on https://github.com/devonfw/ideasy[this site] to get an overview of the documentation sections for the IDEasy, e.g. Home, Features, Download & Setup or have a look at https://github.com/devonfw/ideasy/tree/main/documentation[the documentation files folder].

documentation/advanced-tooling-mac.asciidoc

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ toc::[]
55

66
== Finder
77

8-
If you want to open a terminal from a folder in Finder and automatically get your environment set properly for `devonfw-ide` you will find the perfect solution here.
8+
If you want to open a terminal from a folder in Finder and automatically get your environment set properly for `IDEasy` you will find the perfect solution here.
99

10-
image::images/finder-integration.png["devonfw-ide integration in MacOS Finder"]
10+
image::images/finder-integration.png["IDEasy integration in MacOS Finder"]
1111

12-
So after installing (see below) the integration(s) provided here, you can easily open a terminal ready for your `devonfw-ide`:
12+
So after installing (see below) the integration(s) provided here, you can easily open a terminal ready for your `IDEasy`:
1313

1414
* right click (`[control]` + click) on file or folder in `Finder`
1515
* Expand the `Quick-Actions` sub-menu
@@ -20,14 +20,14 @@ So after installing (see below) the integration(s) provided here, you can easily
2020
mvn -v
2121
```
2222

23-
To get this feature for macOS `Terminal.app` open Finder and run the workflow `system/mac/terminal/Open_devonfw-Terminal_here.workflow` (in `${DEVON_IDE_HOME}`). For iTerm2.app (that can be installed from `App Store`) do the same with `system/mac/iterm/Open_devonfw-iTerm_here.workflow`.
23+
To get this feature for macOS `Terminal.app` open Finder and run the workflow `system/mac/terminal/Open_devonfw-Terminal_here.workflow` (in `${IDE_HOME}`). For iTerm2.app (that can be installed from `App Store`) do the same with `system/mac/iterm/Open_devonfw-iTerm_here.workflow`.
2424

2525
== Keyboard
2626

2727
Keyboard support is not an integration however, some users coming from other platforms may struggle with the way macOS deals with (external non-apple) keyboards.
2828
So to make it short: if you are happy with your keyboard and shortcuts, you can skip all the following.
2929
Otherwise, if you think that pressing keys like `Home`, `End`, etc. should just work as expected or pressing `Alt Gr` should allow you to type the special characters as printed on your German keyboard then here you will find a solution to your problems!
30-
To get all automated you can just run the script `system/mac/keyboard/install-mac-keyboard-support.sh` (in `${DEVON_IDE_HOME}`).
30+
To get all automated you can just run the script `system/mac/keyboard/install-mac-keyboard-support.sh` (in `${IDE_HOME}`).
3131
If you would like to understand what is going on, you want to customize the keyboard settings to your needs, or you want a keyboard layout other than German ISO, please read on.
3232

3333
=== Keyboard Layouts
@@ -42,7 +42,7 @@ To install keyboard layouts simply double-click the `bundle` or copy it to `~/Li
4242
To actually use them go to `System Preferences` and select `Keyboard`.
4343
Then, select the tab `Input Sources`.
4444
With the `+` button you can add a keyboard layout for your daily usage with your Mac.
45-
Please note that the keyboard layout shipped with `devonfw-ide` is called `German-ISO` and can be found in the `Others` section at the end of the list.
45+
Please note that the keyboard layout shipped with `IDEasy` is called `German-ISO` and can be found in the `Others` section at the end of the list.
4646
It can be used as an example or template, if you want to create your own layout.
4747

4848
image::images/keyboard-layouts.png["Keyboard Preferences / Input Sources"]

documentation/cli.asciidoc

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
:toc:
22
toc::[]
33

4-
= Devon CLI
4+
= Ide CLI
55

6-
The `devonfw-ide` is shipped with a central command `devon`. The link:setup.asciidoc[setup] will automatically register this command so it is available in any shell on your system. This page describes the Command Line Interface (CLI) of this command.
6+
`IDEasy` is shipped with a central command `ide`. The link:setup.asciidoc[setup] will automatically register this command so it is available in any shell on your system. This page describes the Command Line Interface (CLI) of this command.
77

8-
== Devon
9-
Without any argument the `devon` command will determine your `DEVON_IDE_HOME` and setup your link:variables.asciidoc[environment variables] automatically. In case you are not inside of a `devonfw-ide` folder the command will echo a message and do nothing.
8+
== Ide
9+
Without any argument the `ide` command will determine your `IDE_HOME` and setup your link:variables.asciidoc[environment variables] automatically. In case you are not inside of a `IDEasy` folder the command will echo a message and do nothing.
1010

1111
[source,bash]
1212
--------
13-
[/]$ devon
14-
You are not inside a devon IDE installation: /
13+
[/]$ ide
14+
You are not inside an IDEasy installation: /
1515
[/]$ cd /projects/my-project/workspaces/test/my-git-repo
16-
[my-git-repo]$ devon
17-
devonfw-ide has environment variables have been set for /projects/my-project in workspace main
18-
[my-git-repo]$ echo $DEVON_IDE_HOME
19-
/projects/devon
16+
[my-git-repo]$ ide
17+
IDEasy environment variables have been set for /projects/my-project in workspace main
18+
[my-git-repo]$ echo $IDE_HOME
19+
/projects/ide
2020
[my-git-repo]$ echo $JAVA_HOME
2121
/projects/my-project/software/java
2222
--------
2323

2424
== Commandlets
25-
The `devon` command supports a pluggable set of _commandlets_. Such commandlet is provided as first argument to the devon command and may take additional arguments:
25+
The `ide` command supports a pluggable set of _commandlets_. Such commandlet is provided as first argument to the ide command and may take additional arguments:
2626

27-
`devon «commandlet» [«arg»]*`
27+
`ide «commandlet» [«arg»]*`
2828

29-
Technically, a commandlet is a bash script located in `$DEVON_IDE_HOME/scripts/command`. So if you want to integrate another tool with `devonfw-ide` we are awaiting your pull-request.
29+
Technically, a commandlet is a bash script located in `$IDE_HOME/.ide/scripts/command`. So if you want to integrate another tool with `IDEasy` we are awaiting your pull-request.
3030
Every commandlet takes the following generic arguments:
3131

3232
.Generic arguments of every commandlet
@@ -38,13 +38,13 @@ Every commandlet takes the following generic arguments:
3838
|=======================
3939

4040
=== Command-wrapper
41-
For many commandlets the `devon` command acts as a wrapper.
41+
For many commandlets the `ide` command acts as a wrapper.
4242
Similar to `mvnw` or `gradlew` you can use it as a proxy command.
43-
Therefore `devon mvn clean install` will be the same as `mvn clean install`.
44-
The benefit when using `devon` as wrapper is that it will even work when the command (`mvn`, `node`, `npm`, etc.) is not on your `PATH` variable or even not yet installed.
43+
Therefore `ide mvn clean install` will be the same as `mvn clean install`.
44+
The benefit when using `ide` as wrapper is that it will even work when the command (`mvn`, `node`, `npm`, etc.) is not on your `PATH` variable or even not yet installed.
4545
We see the main benefit in this for writing portable scripts that you may commit to your git repository and that will then run everywhere and will lazily install the required tools on the fly.
46-
In your daily usage you can and surely should avoid to always type `devon` as prefix to every command.
47-
However, when you automate and want to avoid "command not found" errors, you can simply prefix the command with `devon`.
46+
In your daily usage you can and surely should avoid to always type `ide` as prefix to every command.
47+
However, when you automate and want to avoid "command not found" errors, you can simply prefix the command with `ide`.
4848

4949
=== Commandlet overview
5050

0 commit comments

Comments
 (0)