Skip to content

Commit 23fb071

Browse files
authored
Merge pull request #38 from IBM/merlin-2.0.0-ide
Merlin 2.0.0 ide
2 parents 1cb632a + 381e094 commit 23fb071

File tree

160 files changed

+615
-471
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+615
-471
lines changed

docs/guides/cicd/Configure_Log_Level.md

-6
This file was deleted.

docs/guides/cicd/Manage_Logs.md

+16-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1-
IBM i CI/CD supports configuring log levels and viewing GUI logs.
2-
* [Configure Log Level](Configure_Log_Level.md)
3-
* [View Logs](View_Logs.md)
1+
# Manage Logs
2+
3+
## Configure Log Level
4+
IBM i CI/CD GUI supports configuring the log level. The default log level is INFO. The log level can be set to a different level.
5+
6+
The log levels supported for GUI are **OFF**, **SEVERE**, **WARNING**, **INFO**, **FINEST**, **ALL**.
7+
8+
![CICD_Configure_Log_Level](../../images/guides/CICD_Configure_Log_Level.png)
9+
10+
## View Logs
11+
IBM i CI/CD GUI supports viewing and downloading GUI logs.
12+
13+
* View logs - Double-click the log file or click the **View** button to open the log file.
14+
* Download logs - Click the **Download** button to download the log file to the local file system.
15+
16+
![CICDViewGUILog](../../images/guides/CICDViewGuiLogs.png)

docs/guides/cicd/View_Logs.md

-7
This file was deleted.

docs/guides/ide/debug.md

+12-16
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
# Debugging
22

3-
The Integrated Development Environment (IDE) is based on Eclipse Che/Theia and it has a similar user experiences as Visual Studio (VS) Code.
4-
5-
For a demonstration, see the Debugging video in the [Merlin Getting Started for Users](https://www.youtube.com/playlist?list=PLPELYviDwCnY6L5r5ZnmCneqhakLcB7ko) playlist.
6-
73
The IBM i Debugger for Merlin v2.0 consists of a host component called **IBM i Debug Service**, and a client **IBM i Debug** extension included in the IDE. IBM i Debug Service is delivered as host [PTFs](../platform/ManageIBMiServer.md#running-actions-on-the-ibm-i-server) on the 7.3, 7.4, and 7.5 release levels. A Java 11 JRE is required to run IBM i Debug Service v2.0.
84

95
- Run **Validate the dependent PTFs** action on a template from **Connections** to verify the required PTFs are applied.
106
- Run **Enable IBM i debug service** action on a template from **Connections** to start the debug service on the IBM i.
11-
12-
## Supported Features
7+
8+
For a demonstration, see the Debugging video in the [Merlin Getting Started for Users](https://www.youtube.com/playlist?list=PLPELYviDwCnY6L5r5ZnmCneqhakLcB7ko) playlist.
9+
10+
## Supported Features
1311

1412
Supported language types:
1513

@@ -49,27 +47,25 @@ The following features are not supported in the current release:
4947

5048
## Debugging from IBM i Project Explorer
5149

52-
With a project in IBM i Project Explorer, connect to the IBM i. Under the IBM i connection, using Library List or a QSYS query under My Queries, show a program object. Two debug actions will be available from the Debug popup menu:
53-
- **As Batch**: Prompt for the command to start a batch debug session. The user can enter program parameters in the prompt. This action is only available on program objects (*PGM).
54-
- **Set Service Entry Point**: Set a Service Entry Point (SEP) on the selected target. The default Service Entry Point location is presented in the prompt. The user can modify the value to set a SEP on a module or a procedure. This action is available on program (*PGM) and service program (*SRVPGM) objects.
50+
With a project in **IBM i Project Explorer**, connect to the IBM i. Once you are connected to an IBM i, navigate to the program you would like to debug using the **Library List** or **Object Libraries**. Two debug actions will be available from the Debug popup menu:
51+
- **As Batch**: Prompt for the command to start a batch debug session. The user can enter program parameters in the prompt. This action is only available on program objects (`*PGM`).
52+
- **Set Service Entry Point**: Set a Service Entry Point (SEP) on the selected target. The default Service Entry Point location is presented in the prompt. The user can modify the value to set a SEP on a module or a procedure. This action is available on program (`*PGM`) and service program (`*SRVPGM`) objects.
5553

56-
57-
![Debug Action](../../images/guides/ideiprojdebug2.png)
54+
![Debug Action](../../images/guides/debugActions.png ':size=650')
5855

5956
When a batch debug session starts, the debug panel will open on the left and the source will open in the editor. From the debug panel, the following actions are available: **Continue**, **Step Over**, **Step into**, **Step out**, **Restart**, and **Stop**. In the editor, breakpoints can be set on lines in the left margin.
6057

61-
![Debug](../../images/guides/idedebug.png)
58+
![Debug](../../images/guides/debugButtons.png ':size=750')
6259

6360
While debugging, the **Variables** view will show the variable values. In the editor, hovering over a variable will show its value.
6461

65-
![Debug Hover](../../images/guides/idedebughover.png)
66-
62+
![Debug Hover](../../images/guides/debugHover.png ':size=850')
6763

6864
## Managing Service Entry Points
6965

70-
Service Entry Point (SEP) can be set using the **Set Service Entry Point** popup menu action from the **Project Explorer** and **Object Browser**. SEP can also be set using the **Create Service Entry Point** toolbar action from the **Service Entry Points** view in the **Run and Debug** side bar. The action will prompt for the Service Entry Point location. The Service Entry Point location can be in a short format which includes the library name and program name (e.g. MY_LIB/MY_PGM), or in a long format which also includes the program type, module name and procedure name (e.g. MY_LIB/MY_PGM *PGM/MY_MOD/MY_PROC). The supported program types are *PGM and *SRVPGM.
66+
Service Entry Point (SEP) can be set using the **Set Service Entry Point** popup menu action from the **Project Explorer** and **Object Browser**. SEP can also be set using the **Create Service Entry Point** toolbar action from the **Service Entry Points** view in the **Run and Debug** side bar. The action will prompt for the Service Entry Point location. The Service Entry Point location can be in a short format which includes the library name and program name (e.g. `MY_LIB/MY_PGM`), or in a long format which also includes the program type, module name and procedure name (e.g. `MY_LIB/MY_PGM *PGM/MY_MOD/MY_PROC`). The supported program types are `*PGM` and `*SRVPGM`.
7167

72-
![Debug Service Entry Point](../../images/guides/idedebugsepview.png)
68+
![Debug Service Entry Point](../../images/guides/debugSEPView.png ':size=600')
7369

7470
A checkbox at a SEP indicates that the SEP is enabled. You can clear the checkbox to disable the SEP.
7571

0 commit comments

Comments
 (0)