Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RGM should [optionally] supply a bundle [fragment] with .html pages #156 #184

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ hs_err_pid*
releng/**/.settings/

#tycho
.polyglot.build.properties
.META-INF_MANIFEST.MF
.polyglot..META-INF_MANIFEST.MF
.polyglot.*
*.takari_issue_192
6 changes: 3 additions & 3 deletions .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

<extensions>
<extension>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pomless</artifactId>
<version>2.5.0</version>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>2.7.5</version>
</extension>
</extensions>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
6 changes: 1 addition & 5 deletions bundles/ru.arsysop.loft.rgm.base.emf/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,9 @@ Bundle-Version: 0.2.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: com.fasterxml.jackson.core.jackson-annotations;bundle-version="2.11.4";visibility:=reexport,
com.fasterxml.jackson.core.jackson-core;bundle-version="2.11.4";visibility:=reexport,
com.fasterxml.jackson.core.jackson-databind;bundle-version="2.11.4";visibility:=reexport,
org.eclipse.core.runtime;bundle-version="0.0.0",
Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
org.eclipse.emf.ecore.xmi;bundle-version="0.0.0",
org.eclipse.emf.edit;bundle-version="0.0.0";visibility:=reexport,
org.emfjson.jackson;bundle-version="1.3.0";visibility:=reexport,
ru.arsysop.loft.rgm.seal;bundle-version="0.0.0"
Bundle-ActivationPolicy: lazy
Export-Package: ru.arsysop.loft.rgm.base.emf.command,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ public interface ResolutionContext {

Document document();

String location();
String rootLocation();

String resolveLocation(String suffix);

ContentResolution<Part> parts();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ private void parseLocation(EObject container, SubMonitor split) throws CoreExcep
.filter(Part.class::isInstance)//
.map(Part.class::cast)//
.map(Part::getLocation)//
.orElseGet(context::location);
.orElseGet(context::rootLocation);
Structure structure = new StructureSwitch(context, revision).doSwitch(container);
new PublishedHtml(location, structure).run(split);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,15 @@ public SimpleResolutionContext(String location, Document document) {
}

@Override
public String location() {
public String rootLocation() {
return location;
}

@Override
public String resolveLocation(String suffix) {
return rootLocation() + suffix;
}

@Override
public Document document() {
return document;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ private void completeParagraph(TocChapter chapter, DomElement node, Consumer<Toc
chapters.accept(chapter);
Section section = factory.createSection();
section.setId(chapter.getId());
section.setLocation(context.location() + new IdToLocation().apply(chapter.getId()));
section.setLocation(context.resolveLocation(new IdToLocation().apply(chapter.getId())));
section.setName(chapter.getName());
section.setNumber(chapter.getNumber());
chapter.setPart(section);
Expand All @@ -147,7 +147,7 @@ private void completeIndex(TocChapter chapter, Consumer<TocChapter> chapters, Co
chapters.accept(chapter);
Index index = factory.createIndex();
index.setId(new EncodeId().apply(chapter.getId()));
index.setLocation(context.location() + chapter.getId());
index.setLocation(context.resolveLocation(chapter.getId()));
index.setName(chapter.getName());
chapter.setPart(index);
indexes.accept(index);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public PickId(ResolutionContext context) {

@Override
public String apply(String link) {
return link.replace(context.location(), ""); //$NON-NLS-1$
return link.replace(context.rootLocation(), ""); //$NON-NLS-1$
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
28 changes: 0 additions & 28 deletions features/ru.arsysop.loft.rgm.base.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,32 +48,4 @@
version="0.0.0"
unpack="false"/>

<plugin
id="com.fasterxml.jackson.core.jackson-annotations"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="com.fasterxml.jackson.core.jackson-core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="com.fasterxml.jackson.core.jackson-databind"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.emfjson.jackson"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

</feature>
2 changes: 1 addition & 1 deletion releng/ru.arsysop.loft.rgm.parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<build.label>${unqualifiedVersion}.${buildQualifier}</build.label>

<tycho.scmUrl>scm:git:https://github.com/arsysop/loft-rgm.git</tycho.scmUrl>
<tycho.version>2.5.0</tycho.version>
<tycho.version>2.7.5</tycho.version>
<cbi-plugins.version>1.3.1</cbi-plugins.version>

<tycho-snapshot-repo.url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</tycho-snapshot-repo.url>
Expand Down
78 changes: 21 additions & 57 deletions releng/ru.arsysop.loft.rgm.target/ru.arsysop.loft.rgm.target.target
Original file line number Diff line number Diff line change
Expand Up @@ -15,105 +15,79 @@
# (as an individual or Legal Entity), even if aware of such consequences.
#
-->

<target name="ru.arsysop.loft.rgm.target" sequenceNumber="2">
<target name="ru.arsysop.loft.rgm.target" sequenceNumber="3">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/cbi/updates/license/"/>
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/eclipse/updates/4.21/R-4.21-202109060500/"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.26/R-4.26-202211231800/"/>
<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/ecp/releases/releases_126/1261_RC1a/"/>
<repository location="https://download.eclipse.org/ecp/rt/1270/"/>
<unit id="org.eclipse.emf.ecp.emfforms.runtime.feature.feature.group" version="0.0.0"/>
<unit id="org.eclipse.emfforms.setup.base" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/emfcloud/emfjson-jackson/p2/releases/2.0.0/"/>
<unit id="org.eclipse.emfcloud.emfjson-jackson" version="2.0.0"/>
<unit id="org.eclipse.emfcloud.emfjson-jackson.source" version="2.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.25/"/>
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.32/"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/query/updates/releases/R201805030653/"/>
<repository location="https://download.eclipse.org/modeling/emf/query/updates/releases/R202208101410/"/>
<unit id="org.eclipse.emf.query.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/>
<repository location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935/"/>
<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202008210805/"/>
<repository location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202208271102/"/>
<unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913/"/>
<repository location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334/"/>
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202004160913/"/>
<repository location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202211041032/"/>
<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.12.0/"/>
<repository location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.18.0/"/>
<unit id="org.eclipse.ocl.all.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5/"/>
<unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/sirius/updates/releases/6.5.0/2020-09/"/>
<repository location="https://download.eclipse.org/sirius/updates/releases/7.0.6/2021-06/"/>
<unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952/"/>
<repository location="https://download.eclipse.org/tools/gef/classic/releases/3.15.0/"/>
<unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/passage/updates/release/2.3.0/lic/"/>
<repository location="https://download.eclipse.org/passage/updates/milestone/2.6.1-RC2/lic/"/>
<unit id="org.eclipse.passage.lic.execute.feature.feature.group" version="0.0.0"/>
</location>

<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/2021-09/"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository/"/>
<unit id="org.junit" version="0.0.0"/>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.11.4</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.11.4</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.11.4</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>com.github.jtidy</groupId>
Expand All @@ -123,7 +97,7 @@
</dependency>
</dependencies>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>org.dom4j</groupId>
Expand All @@ -133,15 +107,5 @@
</dependency>
</dependencies>
</location>
<location includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>org.emfjson</groupId>
<artifactId>emfjson-jackson</artifactId>
<version>1.3.0</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
</target>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public abstract class Cxx14IntegrityTest {
public static void performParsing() throws CoreException {
document.setToc(SpecFactory.eINSTANCE.createToc());
new PublishedHtml(//
context.location(), //
context.rootLocation(), //
new TocStructure(document.getToc(), context)//
).run(new NullProgressMonitor());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Bundle-Version: 0.2.0.qualifier
Require-Bundle: org.junit;bundle-version="4.13.0",
ru.arsysop.loft.rgm.spec.model;bundle-version="0.0.0",
ru.arsysop.loft.rgm.cxxdraft;bundle-version="0.0.0",
org.eclipse.core.runtime;bundle-version="3.23.0"
org.eclipse.core.runtime;bundle-version="0.0.0"
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-11
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private void performParsing() throws CoreException {
ResolutionContext context = new SimpleResolutionContext(URL, document);
document.setToc(SpecFactory.eINSTANCE.createToc());
new PublishedHtml(//
context.location(), //
context.rootLocation(), //
new TocStructure(document.getToc(), context)//
).run(new NullProgressMonitor());
document.getSections().stream() //
Expand Down