2618 restructured repo - Githubissues

ControlSystemStudio / cs-studio

Control System Studio is an Eclipse-based collections of tools to monitor and operate large scale control systems, such as the ones in the accelerator community.

https://controlsystemstudio.org/

Eclipse Public License 1.0

113 stars 96 forks source link

2618 restructured repo #2633

Closed shroffk closed 4 years ago

shroffk commented 4 years ago

This is in preparation for the newly structured repo

shroffk commented 4 years ago

To test the build: checkout the 2618 branch

mvn clean install -N -D csstudio.composite.repo=C:\git\cs-studio\p2repo-4.6

cd maven-osgi-bundles

mvn clean install -D eclipse.p2.mirrors=false -D org.osgi.framework.bundle.parent=ext -D osgi.framework.extensions=org.eclipse.fx.osgi -D baselineMode=warn -D jgit.dirtyWorkingTree=warning -D tycho.localArtifacts=ignore -D csstudio.composite.repo=C:\git\cs-studio\p2repo-4.6 -D skipTests=true

cd ..

mvn clean verify -D eclipse.p2.mirrors=false -D org.osgi.framework.bundle.parent=ext -D osgi.framework.extensions=org.eclipse.fx.osgi -D baselineMode=warn -D jgit.dirtyWorkingTree=warning -D tycho.localArtifacts=ignore -D csstudio.composite.repo=C:\git\cs-studio\p2repo-4.6 -D skipTests=true

shroffk commented 4 years ago

NOTE: for some people we had to install the maven-osgi-bundles once first because tycho failed to resolve the dependencies that were being installed by it.

DominicOram commented 4 years ago

There's a script for rewriting history at https://gist.github.com/emiller/6769886

willrogers commented 4 years ago

The history of all parts of the repo has been retained, but since the files have have been moved there is a short history for each file.

You can see the entire history of a file using e.g. git log --follow maven-osgi-bundles/pom.xml.

To me this seems sufficient and probably preferable to trying to rewrite history.

DominicOram commented 4 years ago

You can see the entire history of a file using e.g. git log --follow maven-osgi-bundles/pom.xml.

Both github and eclipse don't do this follow so history appears lost in them.

I'm on the fence about re-writing the history.

DominicOram commented 4 years ago

We can run mvn multithreaded using -T: https://cwiki.apache.org/confluence/display/MAVEN/Parallel+builds+in+Maven+3

willrogers commented 4 years ago

I can make this work with the following three steps:

mvn clean verify from the root - this fails on the diirt datasource-extra problem
mvn clean verify inside the core/diirt directory - this succeeds
mvn clean verify from the root again - now this succeeds

willrogers commented 4 years ago

A cleaner option: remove maven-osgi-bundles from the main build. It doesn't seem to be straightforward to resolve the entire maven project when some of the bundles don't exist until maven-osgi-bundles has been built.

If you remove maven-osgi-bundles then you don't have this resolution problem. However, you have to build it in a separate step.

DominicOram commented 4 years ago

A cleaner option: remove maven-osgi-bundles from the main build. It doesn't seem to be straightforward to resolve the entire maven project when some of the bundles don't exist until maven-osgi-bundles has been built.

If you remove maven-osgi-bundles then you don't have this resolution problem. However, you have to build it in a separate step.

This worked for me too