Skip to Content

Changes for page Using Git

Last modified by Richard Kreissig on 2023/09/14 08:49
From version 17.1
edited by cds
on 2013/04/16 18:00
Change comment: Migrated to Confluence 5.3
To version 19.1
edited by aas2
on 2015/11/10 21:36
Change comment: There is no comment for this version

Summary

Details

Page properties
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.cds
1 +XWiki.aas2
Content
... ... @@ -33,8 +33,39 @@
33 33  If you have already cloned the KIELER repository and are only looking for a way to import it into EGit, follow these steps:
34 34  
35 35  1. Click the button //Add an existing local Git Repository to this view// in the //Git Repositories// view and enter the local path.
36 -1. Right-click the //Working directory// entry in the added repository, select //Import Projects//, //Next//, select the projects that you want in your workspace, //Finish.//
36 +1. Import the plugin projects that you need.
37 37  
38 +== Importing Plugins to the Eclipse Workspace ==
39 +
40 +In the Git Repository View, perform **Right-click > Import Projects...** on the //Working directory// or //Plugins// folder. Hit //Next//. In the following dialog you can //Deselect all// and afterwards select the plugins that you need for your developing task.
41 +
42 +[[image:attach:git_repo_browser_import_plugins.png]]
43 +
44 +For example, if you want to start **KIELER with SCCharts** you need to import
45 +
46 +1. (((
47 +**all core plugins** (core.*) from the semantics and pragmatics repositories
48 +)))
49 +1. **all SCCharts plugins** (sccharts.*) from the semantics repository, **unless sccharts.prio.dependencies**,** sccharts.prio.dependencies.klighd**, **sccharts.prio.s**,** sccharts.prio.sim.s**
50 +1. **all required plugins** for the already imported ones
51 +
52 +As a result you will have the following plugin projects in your workspace:
53 +
54 +1. **From** the **pragmatics repo**: core, core.kgraph, core.kgraph.text, core.kgraph.text.ui, core.kivi, core.krendering, core.krendering.extensions, core.ui, kiml, kiml.formats, kiml.graphviz.dot, kiml.graphviz.layouter, kiml.service, kiml.ui, klay.layered, klighd, klighd.piccolo, klighd.ui, edu.umd.cs.piccolo
55 +1. **From** the **semantics repo**: core.annotations, core.annotations.edit, core.annotations.text, core.annotations.text.ui, core.kexpressions, core.kexpressions.edit, core.kexpressions.keffects, core.kexpressions.keffects.edit, core.kexpressions.keffects.ui, core.kexpressions.text, core.kexpressions.text.ui, core.kexpressions.ui, core.model, core.perspectives, core.product, kex, kex.ui, kico, kico.klighd, kico.ui, kitt, kitt.klighd, klay.layered, klighd, klighd.piccolo, klighd.ui, prom, s, s.sc, s.sim, s.sim.kivi, s.sim.sc, s.sim.sj, s.sj, s.ui, sc, sccharts, sccharts.edit, sccharts.editor, sccharts.eso, sccharts.kivi, sccharts.klighd, sccharts.prom, sccharts.s, sccharts.scg, sccharts.sim.c, sccharts.sim.s, sccharts.text, sccharts.text.ui, scg, scg.s, scl, sim.benchmark, sim.instructions, sim.kiem, sim.kiem.config, sim.kiem.ui.datacomponent, sim.kivi, sim.signals, sim.signals.ui, sim.syncsignalreset, sim.table, sjl, org.freemarker, org.json
56 +
57 +=== Troubleshooting / Resolving Plugin Dependencies ===
58 +
59 +If there are errors in your workspace, they are most likely the result of missing plugins. To solve this, check if the MANIFEST.MF file of the project has error markers. **Import missing plugin dependencies** if required.
60 +
61 +[[image:attach:resolve_missing_plugins.png]]
62 +
63 +After all dependencies are solved and there are still errors, you should clean your workspace via **Project > Clean > All projects**.
64 +
65 +If there are errors in an xtend-gen folder you can delete this folder so that the contents are re-compiled. (It sometimes happens that this folder is not deleted as part of the clean.)
66 +
67 +There should not be any errors after all required plugins are imported and compiled correctly.
68 +
38 38  = Updating the Repository =
39 39  
40 40  Your working copy must be clean before you can merge any updates into it. Therefore, always commit your changes locally before you pull. If you don't want to commit them into the master branch, commit them into a new branch. Note that pulling is the same as fetching remote changes and merging them into your local branch. Since a normal merge operation is involved, this can lead to conflicts, which need to be resolved as described below. Note that pulling always merges the remote changes into your current branch. If that's not what you want, checkout the correct branch first or just do a //fetch//.
Confluence.Code.ConfluencePageClass[0]
Id
... ... @@ -1,1 +1,1 @@
1 -13763405
1 +13763593
URL
... ... @@ -1,1 +1,1 @@
1 -https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/KIELER/pages/13763405/Using Git
1 +https://rtsys.informatik.uni-kiel.de/confluence//wiki/spaces/KIELER/pages/13763593/Using Git