Skip to content

Commit

Permalink
144: removed dep Xdoc from MANIFEST
Browse files Browse the repository at this point in the history
Task-Url: #144
  • Loading branch information
LorenzoBettini committed Apr 2, 2021
1 parent 8f1c726 commit 01a848b
Show file tree
Hide file tree
Showing 7 changed files with 106 additions and 83 deletions.
1 change: 0 additions & 1 deletion doc/org.eclipse.xsemantics.doc/.classpath
Expand Up @@ -2,7 +2,6 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="xdoc"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1 change: 0 additions & 1 deletion doc/org.eclipse.xsemantics.doc/META-INF/MANIFEST.MF
Expand Up @@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.xsemantics.doc;singleton:=true
Bundle-Version: 1.20.0.qualifier
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.help;bundle-version="3.5.0",
org.eclipse.xtext.xdoc.generator;bundle-version="0.1.0";resolution:=optional,
org.eclipse.xsemantics.runtime;bundle-version="1.0.0",
org.eclipse.xsemantics.example.lambda;bundle-version="1.1.0",
org.eclipse.xtext.ui,
Expand Down
3 changes: 1 addition & 2 deletions doc/org.eclipse.xsemantics.doc/build.properties
Expand Up @@ -2,5 +2,4 @@ bin.includes = META-INF/,\
.,\
plugin.xml,\
contents/
src.includes = src/,\
xdoc/
src.includes = xdoc/
105 changes: 105 additions & 0 deletions doc/org.eclipse.xsemantics.doc/old-xdoc/oldpom.xml
@@ -0,0 +1,105 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2013-2017 Lorenzo Bettini.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/legal/epl-v10.html
Contributors:
Lorenzo Bettini - Initial contribution and API
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<relativePath>../../releng/org.eclipse.xsemantics.parent/pom.xml</relativePath>
<groupId>org.eclipse.xsemantics</groupId>
<artifactId>org.eclipse.xsemantics.parent</artifactId>
<version>1.20.0-SNAPSHOT</version>
</parent>

<artifactId>org.eclipse.xsemantics.doc</artifactId>
<packaging>eclipse-plugin</packaging>

<profiles>
<profile>
<id>generate-xdoc</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.5</version>
<configuration>
<skip>${mwe2.skip}</skip>
<filesets>
<fileset>
<directory>${basedir}/contents</directory>
<includes>
<include>**/*.html</include>
<include>**/*.xml</include>
<include>**/*.jpeg</include>
<include>**/*.png</include>
</includes>
<excludes>
<exclude>**/.gitignore</exclude>
<exclude>**/*.css</exclude>
</excludes>
</fileset>
</filesets>
</configuration>
</plugin>

<plugin>
<groupId>org.fornax.toolsupport</groupId>
<artifactId>fornax-oaw-m2-plugin</artifactId>
<version>${fornax-oaw-m2-plugin-version}</version>
<configuration>
<skip>${mwe2.skip}</skip>
<workflowEngine>mwe2</workflowEngine>
<workflowDescriptor>src/workflow/GenerateHelpArtifacts.mwe2</workflowDescriptor>
</configuration>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>run-workflow</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<!-- copy the images directory into contents, since running Xdoc from
mwe2 does not seem to do that... -->
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<id>copy-images</id>
<phase>compile</phase>
<configuration>
<target>
<copy includeemptydirs="false" todir="${basedir}/contents/images">
<fileset dir="${basedir}/xdoc/images">
<include name="**" />
</fileset>
</copy>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
79 changes: 0 additions & 79 deletions doc/org.eclipse.xsemantics.doc/pom.xml
Expand Up @@ -23,83 +23,4 @@ Contributors:
<artifactId>org.eclipse.xsemantics.doc</artifactId>
<packaging>eclipse-plugin</packaging>

<profiles>
<profile>
<id>generate-xdoc</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>2.5</version>
<configuration>
<skip>${mwe2.skip}</skip>
<filesets>
<fileset>
<directory>${basedir}/contents</directory>
<includes>
<include>**/*.html</include>
<include>**/*.xml</include>
<include>**/*.jpeg</include>
<include>**/*.png</include>
</includes>
<excludes>
<exclude>**/.gitignore</exclude>
<exclude>**/*.css</exclude>
</excludes>
</fileset>
</filesets>
</configuration>
</plugin>

<plugin>
<groupId>org.fornax.toolsupport</groupId>
<artifactId>fornax-oaw-m2-plugin</artifactId>
<version>${fornax-oaw-m2-plugin-version}</version>
<configuration>
<skip>${mwe2.skip}</skip>
<workflowEngine>mwe2</workflowEngine>
<workflowDescriptor>src/workflow/GenerateHelpArtifacts.mwe2</workflowDescriptor>
</configuration>
<executions>
<execution>
<phase>generate-sources</phase>
<goals>
<goal>run-workflow</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<!-- copy the images directory into contents, since running Xdoc from
mwe2 does not seem to do that... -->
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven-antrun-plugin.version}</version>
<executions>
<execution>
<id>copy-images</id>
<phase>compile</phase>
<configuration>
<target>
<copy includeemptydirs="false" todir="${basedir}/contents/images">
<fileset dir="${basedir}/xdoc/images">
<include name="**" />
</fileset>
</copy>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>

0 comments on commit 01a848b

Please sign in to comment.