... | @@ -90,65 +90,43 @@ Adding an repository containing “unoffical” plugins to the AF3 repository. |
... | @@ -90,65 +90,43 @@ Adding an repository containing “unoffical” plugins to the AF3 repository. |
|
--------------------------------------------------------------------------
|
|
--------------------------------------------------------------------------
|
|
|
|
|
|
1. Close eclipse
|
|
1. Close eclipse
|
|
2. Ensure that the command line version of git is installed on your
|
|
2. Ensure that the command line version of git is installed on your system (“git” on Linux/MacOSX, “MsysGit” recommended for windows).
|
|
system (“git” on Linux/MacOSX, “MsysGit” recommended for windows).
|
|
3. Create a new branch in the your local AF3 repository that matches the number of the issue you created before:
|
|
3. Create a new branch in the your local AF3 repository that matches
|
|
|
|
the number of the issue you created before:
|
|
|
|
|
|
|
|
```text">
|
|
|
|
git checkout -b <issuenum> # replace <issuenum>
|
|
git checkout -b <issuenum> # replace <issuenum>
|
|
|
|
|
|
```
|
|
4. open a shell and go to the af3 repository of your eclipse installation (typically <eclipse-root>/autofocus3-master/git/af3).
|
|
4. open a shell and go to the af3 repository of your eclipse
|
|
5. execute the followin sequence of commands, where “project-a” are the plugins to be integrated into “project-b”
|
|
installation (typically <eclipse-root>/autofocus3-master/git/af3).
|
|
|
|
5. execute the followin sequence of commands, where “project-a” are the
|
|
|
|
plugins to be integrated into “project-b”
|
|
|
|
<code class="text">
|
|
|
|
git remote add project-a https://git.fortiss.org/af3/project-a
|
|
git remote add project-a https://git.fortiss.org/af3/project-a
|
|
git fetch project-a
|
|
git fetch project-a
|
|
git merge --allow-unrelated-histories project-a/master # or whichever branch you want to merge
|
|
git merge --allow-unrelated-histories project-a/master # or whichever branch you want to merge
|
|
git remote remove project-a
|
|
git remote remove project-a
|
|
|
|
|
|
```
|
|
|
|
6. afterwards, add the .settings submodule entry in the “.gitmodules”
|
|
6. afterwards, add the .settings submodule entry in the “.gitmodules” file located at the root of the af3 repo. this might have already be done during the merge. see the other entries about the formatting.
|
|
file located at the root of the af3 repo. this might have already be
|
|
|
|
done during the merge. see the other entries about the formatting.
|
|
|
|
7. upload the result to the server by issuing
|
|
7. upload the result to the server by issuing
|
|
<code class="text
|
|
|
|
git push origin <issueNum>:<issueNum> # Replace <issueNum>
|
|
git push origin <issueNum>:<issueNum> # Replace <issueNum>
|
|
|
|
|
|
```
|
|
8. Go to https://git.fortiss.org/af3 and log in. Create a merge request (MR) from your just uploaded branch to master.
|
|
8. Go to https://git.fortiss.org/af3 and log in. Create a merge request
|
|
|
|
(MR) from your just uploaded branch to master.
|
|
|
|
|
|
|
|
Register the plugin with the developer product definitions
|
|
Register the plugin with the developer product definitions
|
|
----------------------------------------------------------
|
|
----------------------------------------------------------
|
|
|
|
|
|
1. Start eclipse.
|
|
1. Start eclipse.
|
|
2. Create a new branch for developer product definition by
|
|
2. Create a new branch for developer product definition by right-clicking `org.fortiss.af3.phoenix.product.feature` and following the typical “switch to” procedure. (see [Development Workflow](Development_Workflow.md))
|
|
right-clicking `org.fortiss.af3.phoenix.product.feature` and
|
|
3. Add the plugin to `org.fortiss.af3.phoenix.product.feature/feature.xml` to the “require” section (keep lexicographic order!)
|
|
following the typical “switch to” procedure. (see [Development
|
|
4. Upload the result and create a MR in the [af3 repository](https://git.fortiss.org/af3/af3)
|
|
Workflow](Development
|
|
|
|
____Workflow))
|
|
|
|
3. Add the plugin to
|
|
|
|
`org.fortiss.af3.phoenix.product.feature/feature.xml` to the
|
|
|
|
“require” section (keep lexicographic order!)
|
|
|
|
4. Upload the result and create a MR in the af3\_dev\_product
|
|
|
|
repository (https://git.fortiss.org/af3/af3\_dev\_product)
|
|
|
|
|
|
|
|
Update Oomph installation script
|
|
Update Oomph installation script
|
|
--------------------------------
|
|
--------------------------------
|
|
|
|
|
|
1. Import the plugin fortiss-std-dev into your local workspace:
|
|
1. Import the plugin fortiss-std-dev into your local workspace: File >Import >Git >Local repository >Select the git
|
|
File >Import >Git >Local repository >Select the git
|
|
folder of your eclipse installation (see above) >Select “fortiss-std-env” and finish the import.
|
|
folder of your eclipse installation (see above) >Select
|
|
2. Create a branch for this plugin nambed by the issue number from the above steps.
|
|
“fortiss-std-env” and finish the import.
|
|
3. Open the Oomph setup file (oomph/af3.setup) in eclipse and go to “Working sets”.
|
|
2. Create a branch for this plugin nambed by the issue number from the
|
|
4. Add the plugin to the corresponding plugin set, e.g., “Behaviour”, if it is not yet captured by any of the existing regular
|
|
above steps.
|
|
|
|
3. Open the Oomph setup file (oomph/af3.setup) in eclipse and go to
|
|
|
|
“Working sets”.
|
|
|
|
4. Add the plugin to the corresponding plugin set, e.g., “Behaviour”,
|
|
|
|
if it is not yet captured by any of the existing regular
|
|
|
|
expressions.
|
|
expressions.
|
|
5. Commit & push the result.
|
|
5. Commit & push the result.
|
|
6. Create a MR to master at https://git.fortiss.org/af3/fortiss-std-env
|
|
6. Create a MR to master at https://git.fortiss.org/af3/fortiss-std-env
|
... | @@ -156,11 +134,6 @@ Update Oomph installation script |
... | @@ -156,11 +134,6 @@ Update Oomph installation script |
|
Adjust the Maven build process to consider the added plugins
|
|
Adjust the Maven build process to consider the added plugins
|
|
------------------------------------------------------------
|
|
------------------------------------------------------------
|
|
|
|
|
|
1. Perform a local installation for local AF3 RCP builds as described
|
|
1. Perform a local installation for local AF3 RCP builds as described in the [Local Build](Setting_up_a_local_build.md) documentation.
|
|
in the [Local Build](AF3\_Build\_Management\#Local-Build)
|
|
2. After a successful local build of the AF3 RCP, follow the steps described in [Adding plugins / modifying the plugin list](Setting_up_a_local_build.md).
|
|
documentation.
|
|
|
|
2. After a successful local build of the AF3 RCP, follow the steps
|
|
|
|
described in
|
|
|
|
[Adding
|
|
|
|
plugins / modifying the plugin list](AF3\_Build\_Management\#Adding-plugins-modifying-the-plugin-list).
|
|
|
|
|
|
|