Skip to content

Commit 104852f

Browse files
Merge pull request #5 from vectorgrp/release-v2.2.x
OCS Domain Plugin Release v2.2.0
2 parents 4236115 + a65a524 commit 104852f

55 files changed

Lines changed: 1992 additions & 2295 deletions

File tree

Some content is hidden

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

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
/buildSrc/.gradle
55
/buildSrc/build
66
/plugins/*/build
7-
7+
/_bswmd/build

README.md

Lines changed: 53 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -19,62 +19,58 @@ Furthermore, it allows the extension of the existing functionality.
1919
## Getting Started
2020
The MICROSAR Automation SDK offers everything that is needed to build an OCS Custom App and the Domain Plugins. It
2121
can be downloaded from the Vector Download Center in the
22-
[DaVinci Team](https://www.vector.com/de/de/support-downloads/download-center/#product=%5B%2251284%22%5D&tab=1&pageSize=15&sort=date&order=desc) product category.
22+
[DaVinci Team](https://www.vector.com/de/de/support-downloads/download-center/#product=%5B%2271683%22%5D&tab=1&pageSize=15&sort=date&order=desc) product category.
2323
Most important artifact which is required from the MICROSAR Automation SDK is the so called OCS Core. For more
2424
information we strongly recommend to read the contained documentation.
2525

2626
### Preparation
2727
For simplification of the build setup we recommend as a first step to arrange the required files and folders as follows:
2828
```
2929
├── BswPackage
30-
| └── MICROSAR_Classic_R31
30+
| └── MICROSAR_Classic_R35
3131
| | └── Components
32-
| | └── DaVinciConfigurator
33-
| | └── ...
34-
| └── MICROSAR_Classic_R33
35-
| | └── Components
36-
| | └── DaVinciConfigurator
3732
| | └── ...
3833
├── ocs-custom-app
3934
├── ocs-domain-plugins
4035
└── repository
4136
```
42-
Within the BswPackage folder different MICROSAR Classic BSW Package releases can be stored. In this cases one for R31
43-
and one for R33. The ocs-custom-app and the repository folder are both part of the MICROSAR Automation SDK. The
44-
ocs-domain-plugins directory contains the content of this repository. Arranging the folder in this way will simplify the
45-
customization of the gradle properties.
37+
Within the BswPackage folder different MICROSAR Classic BSW Package releases can be stored. In this cases one for R35.
38+
The ocs-custom-app and the repository folder are both part of the MICROSAR Automation SDK. The ocs-domain-plugins directory
39+
contains the content of this repository. Arranging the folder in this way will simplify the customization of the gradle properties.
4640

4741
### Customization of the Gradle properties
4842
Within the `ocs-domain-plugins` folder you can find the `gradle.properties` file:
4943
```
5044
#localSipStore=path/to/sip/store/directory
5145
#localSip=path/to/used/sip/external
5246
ocsRepo=../repository
53-
54-
vOcsCore=1.7.0
55-
vPluginsCommon=1.5.0
56-
vOcsCom=1.8.0
57-
vOcsDiag=1.8.0
58-
vOcsNvM=1.8.0
59-
vOcsEcuState=1.8.0
60-
vOcsRuntime=1.8.0
61-
vOcsSecurity=1.6.0
47+
#cfg6=path/to/davinci configurator/directory
48+
49+
vOcsCore=3.1.0
50+
vPluginsCommon=2.2.0
51+
vOcsCom=2.2.0
52+
vOcsDiag=2.2.0
53+
vOcsNvM=2.2.0
54+
vOcsEcuState=2.2.0
55+
vOcsRuntime=2.2.0
56+
vOcsSecurity=2.2.0
6257
```
6358
Based on the folder structure example above the explanation of the properties becomes easier.
6459
Adapt the properties as following:
6560
```
6661
localSipStore=D:/dev/ocs/BswPackages
67-
localSip=MICROSAR_Classic_R31
62+
localSip=MICROSAR_Classic_R35
6863
ocsRepo=../repository
69-
70-
vOcsCore=1.7.0
71-
vPluginsCommon=my-company-1.5.0
72-
vOcsCom=my-company-1.8.0
73-
vOcsDiag=my-company-1.8.0
74-
vOcsNvM=my-company-1.8.0
75-
vOcsEcuState=my-company-1.8.0
76-
vOcsRuntime=my-company-1.8.0
77-
vOcsSecurity=my-company-1.6.0
64+
cfg6=<installation path of DaVinci Configurator Classic 6.2>
65+
66+
vOcsCore=3.1.0
67+
vPluginsCommon=my-company-2.2.0
68+
vOcsCom=my-company-2.2.0
69+
vOcsDiag=my-company-2.2.0
70+
vOcsNvM=my-company-2.2.0
71+
vOcsEcuState=my-company-2.2.0
72+
vOcsRuntime=my-company-2.2.0
73+
vOcsSecurity=my-company-2.2.0
7874
```
7975
The `localSipStore` should point to the root directory of the BSW Packages while the `localSip` itself mentions a
8076
dedicated BSW Package against which the source code will be compiled. The gradle project of the `ocs-custom-app` and
@@ -86,8 +82,8 @@ We kindly ask you to adapt the version information mentioned in the `gradle.prop
8682
that the plugins you build by yourself can be distinguished from those delivered as pre-build artifacts in the MICROSAR
8783
Automation SDK. Here an example for the resulting files:
8884
```groovy
89-
ocs-communication-plugin-1.7.0.jar // without adaptions
90-
ocs-communication-plugin-my-company-1.7.0.jar // with adaptions
85+
ocs-communication-plugin-2.2.0.jar // without adaptions
86+
ocs-communication-plugin-my-company-2.2.0.jar // with adaptions
9187
```
9288

9389
### Build the OCS Domain Plugins
@@ -112,7 +108,7 @@ above. Reason for this is a simple conceptional decision that this `repository`
112108
delivered by Vector. In most cases, local maven repository which is used for the publication can be found under you
113109
Windows user account, for example:
114110
```batch
115-
C:\Users\<your user account>\.m2\repository\com\vector\ocs\plugins\ocs-communication-plugin\my-company-1.7.0\ocs-communication-plugin-my-company-1.7.0.jar
111+
C:\Users\<your user account>\.m2\repository\com\vector\ocs\plugins\ocs-communication-plugin\my-company-2.2.0\ocs-communication-plugin-my-company-2.2.0.jar
116112
```
117113

118114
## Building an OCS Custom App
@@ -123,33 +119,35 @@ file:
123119
#localSipStore=path/to/sip/store/directory
124120
#localSip=path/to/used/sip/
125121
ocsRepo=../repository
126-
127-
vOcsCore=2.2.0
128-
vPluginsCommon=1.5.0
129-
vOcsCom=1.8.0
130-
vOcsDiag=1.8.0
131-
vOcsNvM=1.8.0
132-
vOcsEcuState=1.8.0
133-
vOcsRuntime=1.8.0
134-
vOcsSecurity=1.6.0
122+
#cfg6=path/to/davinci configurator/directory
123+
124+
vOcsCore=3.1.0
125+
vPluginsCommon=2.2.0
126+
vOcsCom=2.2.0
127+
vOcsDiag=2.2.0
128+
vOcsNvM=2.2.0
129+
vOcsEcuState=2.2.0
130+
vOcsRuntime=2.2.0
131+
vOcsSecurity=2.2.0
135132
```
136133
The `localSipStore`, `localSip` and `ocsRepo` should be configured in the same way as for the `ocs-domain-plugins`.
137134
If you keep the other version numbers as stated in the file you would build the OCS Custom App based on the Vector
138135
pre-build artifacts. In fact, you want to use the plugins you built by yourself, therefore you also need to adapt those
139136
properties, so that the result looks as follows:
140137
```
141138
localSipStore=D:/dev/ocs/BswPackages
142-
localSip=MICROSAR_Classic_R31
139+
localSip=MICROSAR_Classic_R35
143140
ocsRepo=../repository
144-
145-
vOcsCore=1.7.0
146-
vPluginsCommon=my-company-1.5.0
147-
vOcsCom=my-company-1.8.0
148-
vOcsDiag=my-company-1.8.0
149-
vOcsNvM=my-company-1.8.0
150-
vOcsEcuState=my-company-1.8.0
151-
vOcsRuntime=my-company-1.8.0
152-
vOcsSecurity=my-company-1.6.0
141+
cfg6=<installation path of DaVinci Configurator Classic 6.2>
142+
143+
vOcsCore=3.1.0
144+
vPluginsCommon=my-company-2.2.0
145+
vOcsCom=my-company-2.2.0
146+
vOcsDiag=my-company-2.2.0
147+
vOcsNvM=my-company-2.2.0
148+
vOcsEcuState=my-company-2.2.0
149+
vOcsRuntime=my-company-2.2.0
150+
vOcsSecurity=my-company-2.2.0
153151
```
154152
Please note that the gradle project of the OCS Custom App is prepared in a way that it handles the ocsRepo as well as
155153
the local maven repository.
@@ -171,15 +169,16 @@ Beside the mentioned dependencies the shared gradle project may point to additio
171169

172170
| External Tool | Description |
173171
|---------------|-------------|
174-
| JAVA JDK | 1.8 |
175-
| Gradle | 8.13 |
172+
| JAVA JDK | 21.0 |
173+
| Gradle | 8.14.3 |
176174

177175
## Release Information
178176
| Release | Belongs to | Supports MICROSAR Classic Releases |
179177
|---------|--------------------------------|------------------------------------|
180178
| v1.6.0 | MICROSAR Automation SDK v1.5.0 | R31 - R34 |
181179
| v1.7.0 | MICROSAR Automation SDK v1.6.0 | R31 - R34 |
182180
| v1.8.0 | MICROSAR Automation SDK v1.7.0 | R31 - R34 |
181+
| v2.2.0 | MICROSAR Automation SDK v2.0.0 | R35 |
183182

184183
## Abbreviations
185184
| Abbreviation | Description |

0 commit comments

Comments
 (0)