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

Fix maven build configuration, include MWE2 workflow execution for xtext generation #90

Open
wants to merge 40 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
bece6bb
Include travis build conf file for continuous integration.
Dec 7, 2015
47070f4
Change JDKs, remove maven -X flag.
Dec 7, 2015
89fac02
update kepler p2 url.
Feb 1, 2016
833d856
update kepler p2 url in product pom.
Feb 1, 2016
732d251
Try to configure maven for xtext DSL generation.
Feb 1, 2016
6c0bebb
Specify xtext version
Feb 1, 2016
f8ee78d
Specify xtext repository.
JKatzwinkel Feb 1, 2016
1b77bfa
Update xtext version number for egy dsl pom.
Feb 1, 2016
0c71d7e
Drop Java 6, fix typo in MWE workflow path.
Feb 1, 2016
55e6119
Merge branch 'build' into travis_CI_xtext
JKatzwinkel Aug 16, 2016
61b9945
Merge branch 'build' into travis_CI_xtext
JKatzwinkel Aug 17, 2016
a88abbc
Remove travis build in Java 7.
Aug 17, 2016
cb99861
Move xtend plugin management to master pom.
Aug 17, 2016
07667de
Change grammar locator from classpath entry to platform resource.
Aug 17, 2016
c2cf178
Update bundle ids and version qualifiers to fix maven build.
Jul 4, 2017
80c5a15
Merge branch 'mvn-bld' into travis_CI_xtext
Jul 4, 2017
63e133f
Define projectName and runtimeProject in correct order.
Jul 4, 2017
cac84f0
ignore xbase
Jul 4, 2017
fe68ae6
Don't generate test code, explicitly set src-gen folder.
Jul 4, 2017
0dd4be7
Fix egydsl mwe2 source gen
jaseg Jul 5, 2017
ebc5dac
egydsl: Add missing maven xtend plugin
jaseg Jul 5, 2017
861d7c2
egydsl: Fix exec-maven invocation
jaseg Jul 5, 2017
0619b0c
egydsl: Fix mwe2 formatting
jaseg Jul 5, 2017
a0b2ff5
egydsl.ui: Add missing xtend plugin
jaseg Jul 5, 2017
010c0f7
egydsl: Remove superfluous mww2 runtime dependency
jaseg Jul 5, 2017
bd0396e
egydsl: set paths relative to project basedir instead of basedir.
Jul 5, 2017
2d3044a
Merge branch 'travis_CI_xtext' of https://github.com/telota/bts into …
Jul 5, 2017
d6174cf
egydsl: Comment and prettify pom.xml
jaseg Jul 5, 2017
8ee0b60
Remove debug flag in travis configuration.
Jul 5, 2017
f0fbc08
Merge branch 'travis_CI_xtext' of https://github.com/telota/bts into …
Jul 5, 2017
42261cb
toplevel: pom.xml: Fix target config version
jaseg Jul 5, 2017
5badd91
Merge branch 'travis_CI_xtext' of https://github.com/telota/bts into …
Jul 5, 2017
4c5c602
egydsl pom: prettify further (xmllint)
Jul 5, 2017
c53ccfb
Include travis build status badge in project readme.
Jul 5, 2017
63d78aa
fix badge
JKatzwinkel Nov 20, 2018
025fece
Merge remote-tracking branch 'cp/master' into travis_CI_xtext
JKatzwinkel Nov 21, 2018
b43fd66
workaround for security exception in xtend-maven-plugin execution
JKatzwinkel Nov 21, 2018
76f9fe2
explicitly set dist:precise in travis yaml
JKatzwinkel Nov 21, 2018
823feb1
untrack generated source directories
JKatzwinkel Nov 21, 2018
956b06f
use github actions for maven build
JKatzwinkel Feb 4, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
name: maven

on: [push, pull_request]

jobs:
build:

runs-on: ubuntu-latest

steps:

- name: Checkout source code
uses: actions/checkout@v2

- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8

- name: Build with Maven
run: mvn install

...
9 changes: 9 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
dist: precise
os: linux
group: stable
language: java
jdk:
- oraclejdk8
script:
mvn clean install

9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Berlin Text System
## Collaborative Editing of Ancient Egyptian Texts and Dictionaries


# Berlin Text System
## Collaborative Editing of Ancient Egyptian Texts and Dictionaries

[![Build Status](https://travis-ci.org/JKatzwinkel/bts.svg?branch=travis_CI_xtext)](https://travis-ci.org/JKatzwinkel/bts)

This file was deleted.

This file was deleted.

9 changes: 5 additions & 4 deletions org.bbaw.bts.corpus.text.egy.egydsl.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,19 @@ Require-Bundle: org.bbaw.bts.corpus.text.egy.egydsl;visibility:=reexport,
org.bbaw.bts.model.corpus,
org.bbaw.bts.core.corpus.controller,
org.bbaw.bts.ui.commons.corpus,
com.google.inject
com.google.inject,
org.eclipse.xtext.xbase.lib
Import-Package: org.apache.log4j,
org.bbaw.bts.core.commons.staticAccess,
org.eclipse.e4.core.contexts,
org.eclipse.xtext.xbase.lib
Bundle-RequiredExecutionEnvironment: JavaSE-1.6,
JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.6,JavaSE-1.7
Export-Package: org.bbaw.bts.corpus.text.egy.ui,
org.bbaw.bts.corpus.text.egy.ui.contentassist,
org.bbaw.bts.corpus.text.egy.ui.contentassist.antlr,
org.bbaw.bts.corpus.text.egy.ui.custom,
org.bbaw.bts.corpus.text.egy.ui.internal,
org.bbaw.bts.corpus.text.egy.ui.quickfix
org.bbaw.bts.corpus.text.egy.ui.quickfix,
org.bbaw.bts.corpus.text.egy.ui.contentassist.antlr.internal
Bundle-Activator: org.bbaw.bts.corpus.text.egy.ui.internal.EgyDslActivator
Bundle-Version: 3.1.1.qualifier
77 changes: 53 additions & 24 deletions org.bbaw.bts.corpus.text.egy.egydsl.ui/plugin.xml_gen
Original file line number Diff line number Diff line change
Expand Up @@ -223,34 +223,36 @@
</resourceServiceProvider>
</extension>

<!-- marker definitions for org.bbaw.bts.corpus.text.egy.EgyDsl -->
<extension
id="egydsl.check.fast"
name="EgyDsl Problem"
point="org.eclipse.core.resources.markers">
<super type="org.eclipse.xtext.ui.check.fast"/>
<persistent value="true"/>
</extension>
<extension
id="egydsl.check.normal"
name="EgyDsl Problem"
point="org.eclipse.core.resources.markers">
<super type="org.eclipse.xtext.ui.check.normal"/>
<persistent value="true"/>
</extension>
<extension
id="egydsl.check.expensive"
name="EgyDsl Problem"
point="org.eclipse.core.resources.markers">
<super type="org.eclipse.xtext.ui.check.expensive"/>
<persistent value="true"/>
</extension>

<!-- marker definitions for org.bbaw.bts.corpus.text.egy.EgyDsl -->
<extension
id="egydsl.check.fast"
name="EgyDsl Problem"
point="org.eclipse.core.resources.markers">
<super type="org.eclipse.xtext.ui.check.fast"/>
<persistent value="true"/>
</extension>
<extension
id="egydsl.check.normal"
name="EgyDsl Problem"
point="org.eclipse.core.resources.markers">
<super type="org.eclipse.xtext.ui.check.normal"/>
<persistent value="true"/>
</extension>
<extension
id="egydsl.check.expensive"
name="EgyDsl Problem"
point="org.eclipse.core.resources.markers">
<super type="org.eclipse.xtext.ui.check.expensive"/>
<persistent value="true"/>
</extension>

<extension
point="org.eclipse.xtext.builder.participant">
<participant
class="org.bbaw.bts.corpus.text.egy.ui.EgyDslExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant">
class="org.bbaw.bts.corpus.text.egy.ui.EgyDslExecutableExtensionFactory:org.eclipse.xtext.builder.IXtextBuilderParticipant"
fileExtensions="egydsl"
>
</participant>
</extension>
<extension
Expand All @@ -277,6 +279,27 @@
<filter name="projectNature" value="org.eclipse.xtext.ui.shared.xtextNature"/>
</page>
</extension>
<extension point="org.eclipse.ui.menus">
<menuContribution locationURI="popup:#TextEditorContext?after=xtext.ui.openDeclaration">
<command
commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand"
id="org.bbaw.bts.corpus.text.egy.EgyDsl.OpenGeneratedCode"
style="push">
<visibleWhen checkEnabled="false">
<reference definitionId="org.bbaw.bts.corpus.text.egy.EgyDsl.Editor.opened" />
</visibleWhen>
</command>
</menuContribution>
</extension>
<extension point="org.eclipse.ui.handlers">
<handler
class="org.bbaw.bts.corpus.text.egy.ui.EgyDslExecutableExtensionFactory:org.eclipse.xtext.ui.generator.trace.OpenGeneratedFileHandler"
commandId="org.eclipse.xtext.ui.OpenGeneratedFileCommand">
<activeWhen>
<reference definitionId="org.bbaw.bts.corpus.text.egy.EgyDsl.Editor.opened" />
</activeWhen>
</handler>
</extension>

<!-- Quick Outline -->
<extension
Expand Down Expand Up @@ -392,6 +415,12 @@
extensions="egydsl">
</provider>
</extension>
<extension point="org.eclipse.team.core.fileTypes">
<fileTypes
extension="egydsl"
type="text">
</fileTypes>
</extension>

<!-- marker definitions for org.bbaw.bts.corpus.text.egy.EgyDsl -->
<extension
Expand Down
50 changes: 41 additions & 9 deletions org.bbaw.bts.corpus.text.egy.egydsl.ui/pom.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.bbaw.bts</groupId>
<artifactId>aaew-bts</artifactId>
<version>3.1.3</version>
</parent>
<groupId>org.bbaw.bts</groupId>
<artifactId>aaew-bts</artifactId>
<version>3.1.3</version>
</parent>
<groupId>org.bbaw.bts</groupId>
<artifactId>org.bbaw.bts.corpus.text.egy.egydsl.ui</artifactId>
<version>3.1.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<artifactId>org.bbaw.bts.corpus.text.egy.egydsl.ui</artifactId>
<version>3.1.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<xtext.version>2.9.0</xtext.version>
</properties>

<build>
<plugins>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
<version>${xtext.version}</version>
<dependencies>
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.equinox.common</artifactId>
<version>3.10.0</version>
</dependency>
</dependencies>
<executions>
<execution>
<goals>
<goal>compile</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/xtend-gen</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
Loading