Commit graph

265 commits

Author SHA1 Message Date
Karsten Thoms
c7b439923d [#512] Maven AppAssembler - Reduce length of classpath
On windows the generated classpath in start scripts might become too
long. This can be avoided by additional configuration of the
appassembler-maven-plugin plugin:
- added option repositoryLayout=flat
- added option useWildcardClassPath=true

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-10-19 14:31:17 +02:00
Karsten Thoms
5b7f5ecf90 [525746] Set Xbase/Xtend lib lower version constraint
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-10-09 21:39:12 +02:00
Karsten Thoms
1ecb623d5f [525746] Set lower bound for org.eclipse.xtext.xbase.lib
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-10-09 12:29:55 +02:00
Karsten Thoms
3512bacf62 [#355] Update repository URLs
- MWE 2.9.1
- Oxygen.1

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-09-28 11:03:57 +02:00
Karsten Thoms
715bcb249b [eclipse/xtext-eclipse#299] Added support for Language Server Jar
The IDE project's build can be extended to create an executable Language
Server. The Language Server can be configured to be built either as a
distribution with seperate jars or as a fat jar.
Due to a limitation of the maven-shade-plugin in a Maven/Tycho
environment the build must be tweaked a bit to materialize dependencies
with the maven-dependencies-plugin and attached for inclusion with the
addjars-maven-plugin.

Extended the test suite for the different configurations with language
server support:
- plain Maven
- Maven/Tycho
- Gradle

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-08-03 17:31:40 +02:00
Karsten Thoms
ba4bd8afea [eclipse/xtext-eclipse#299] Added support for Language Server Jar
The IDE project's build can be extended to create an executable Language
Server. The Language Server can be configured to be built either as a
distribution with seperate jars or as a fat jar.
Due to a limitation of the maven-shade-plugin in a Maven/Tycho
environment the build must be tweaked a bit to materialize dependencies
with the maven-dependencies-plugin and attached for inclusion with the
addjars-maven-plugin.

Extended the test suite for the different configurations with language
server support:
- plain Maven
- Maven/Tycho
- Gradle

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-08-03 14:33:21 +02:00
Karsten Thoms
4a5f5e5e15 [eclipse/xtext-eclipse#299] Added support for Language Server Jar
The IDE project's build can be extended to create an executable Language
Server. The Language Server can be configured to be built either as a
distribution with seperate jars or as a fat jar.
Due to a limitation of the maven-shade-plugin in a Maven/Tycho
environment the build must be tweaked a bit to materialize dependencies
with the maven-dependencies-plugin and attached for inclusion with the
addjars-maven-plugin.

Extended the test suite for the different configurations with language
server support:
- plain Maven
- Maven/Tycho
- Gradle

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-07-31 10:05:33 +02:00
Karsten Thoms
f46a269fdd gradleprojectbuilder added by Buildship project import
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-07-01 23:09:36 +02:00
Christian Dietrich
197ad484d7 updated target platform to oxygen. fixes https://github.com/eclipse/xtext-eclipse/issues/242
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-06-29 12:55:55 +02:00
Christian Dietrich
1466ed1675 use gradle 3.5 in new project wizard
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-06-09 09:08:19 +02:00
Christian Dietrich
7168c3a175 Fixed problem with the initial build after project creation in maven
tycho
https://github.com/eclipse/xtext-eclipse/issues/272

Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-05-29 14:06:58 +02:00
Miro Spönemann
a75bac8287 Increased version number to 2.13.0-SNAPSHOT 2017-05-24 13:41:16 +02:00
Miro Spönemann
f60ead2a56 Remvoed Gradle wrapper from source bundle 2017-05-18 08:54:05 +02:00
Christian Dietrich
a08820b6af update to tycho 1.0.0
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-03-27 13:34:32 +02:00
Christian Dietrich
a061aa6fb1 Merge remote-tracking branch 'origin/maintenance_2.11' 2017-02-27 15:57:13 +01:00
Christian Dietrich
fcce289084 [Wizard] Include .xtext file in jar created by gradle #284
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-02-22 20:16:08 +01:00
Christian Dietrich
db782ad5bd [Wizard] Use Current Gradle Version in Wizard. #222
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-02-15 13:22:22 +01:00
Christian Dietrich
a31ea419d2 Fixed Broken Launch Config. Resolves #273
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2017-02-06 09:11:01 +01:00
Miro Spönemann
eaa0a66288 [build] Increased version number to 2.11.1-SNAPSHOT 2017-02-01 11:20:39 +01:00
Miro Spönemann
0bc4eb7975 Merge branch 'release_2.11.0' 2017-01-31 13:16:13 +01:00
Moritz Eysholdt
8cbddaa4d8 fixed #265: Create pom.xml that installs Xtend Debug Info
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@typefox.io>
2017-01-28 15:14:07 +01:00
Miro Spönemann
ba911b4790 Lifted version number to 2.12.0-SNAPSHOT 2017-01-18 11:47:03 +01:00
Lorenzo Bettini
98c0aa4c94 244: .xtext.junit4 .xbase.junit added to ui.tests by the project wizard
Task-Url: https://github.com/eclipse/xtext-core/issues/244
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-16 11:08:39 +01:00
Miro Spönemann
0515d22685 Refreshed projects with Buildship 2.0 2017-01-12 10:32:06 +01:00
Lorenzo Bettini
9eb9ad3345 479196: get antlr-generator version using a method
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-11 15:24:46 +01:00
Lorenzo Bettini
8fca65f7ee 479196: added xtext-antlr-generator also in the build.gradle
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-11 15:22:16 +01:00
Lorenzo Bettini
7d2675ba40 479196: AntlrToolFacade always downloads antlr-generator in Maven build
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=479196
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2017-01-11 14:11:56 +01:00
Karsten Thoms
c11fc9bb46 Change by Xtend compiler update
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-01-04 13:14:13 +01:00
Miro Spönemann
0e312a85c8 Fixed #215: Wrong version dependency to org.eclipse.emf.mwe2.launch generated by wizard 2017-01-03 16:52:52 +01:00
Karsten Thoms
56f1d1079e [492072] Regenerated Xtend code
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2017-01-02 14:33:55 +01:00
Karsten Thoms
55b7531d74 Merge pull request #210 from eclipse/kth_bug492072
[492072] Minimized usage of local variables
2016-12-22 14:20:40 +01:00
Christian Schneider
290b698f95 [xtext.testing + xtext.wizard] fix/improvement of build config of test projects in 'TestProjectDescriptor'
* consolidated version of 'org.junit' with our reference in 'gradle/versions.gradle' (currently 4.12)
* added dependency to 'junit:junit:4.12' with scope 'testCompile' to templates of 'pom.xml' + 'build.gradle'

Signed-off-by: Christian Schneider <christian.schneider@typefox.io>
2016-12-22 10:44:42 +01:00
Karsten Thoms
c9b7bf5af2 [492072] Minimized usage of local variables
The Xtend compiler was optimized to minimize the usage of synthetic variables for member feature calls and right-hand assignments

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-12-22 00:54:25 +01:00
Christian Schneider
8846f34734 [xtext.wizard] added 'org.eclipse.xtext.common.types' to dependencies of MWE executions in 'RuntimeProjectDescriptor's build file templates.
Signed-off-by: Christian Schneider <christian.schneider@typefox.io>
2016-12-20 17:48:09 +01:00
Miro Spönemann
7bceda03da Switched test project dependency created by wizard from xbase.junit to xbase.testing 2016-12-20 10:31:18 +01:00
Karsten Thoms
f2b5cdfe39 [507077] Do not emit empty concatenation
Changes to generated Xtend code due to compiler optimization

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-12-19 15:47:59 +01:00
Karsten Thoms
396f8e3ce3 [eclipse/xtext#1089] Replace (not)equal operators by triple (not)equals
For comparison with null the triple (not) equal operator should be used.
Resolved compiler warnings


Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-12-05 16:03:22 +01:00
Karsten Thoms
b4d74f732b [eclipse/xtext#1089] Regenerated xtend-gen code
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-12-02 16:47:33 +01:00
Karsten Thoms
08194ce996 [eclipse/xtext#1089] Replace (not)equal operators by triple (not)equals
For comparison with null the triple (not) equal operator should be used. Resolved compiler warnings

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-12-02 16:46:25 +01:00
Karsten Thoms
79c3eab77c [#5] Changes to .classpath generated by Buildship import
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-11-30 10:00:21 +01:00
Karsten Thoms
13ba597bc4 Merge branch 'master' of git@github.com:eclipse/xtext-core 2016-11-29 15:33:08 +01:00
Karsten Thoms
c4ba710623 Classpath inclusion/exclusion rules changed by buildship import
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-11-29 15:32:57 +01:00
Karsten Thoms
8c381f8d59 Gradle composite
see https://github.com/eclipse/xtext-umbrella/issues/3

Remove org.eclipse.buildship.core.prefs
Files are generated on Gradle project import or by Oomph setup

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-11-28 14:41:08 +01:00
Karsten Thoms
c637df9451 Gradle composite
connection.project.dir changed to composite build location in new
umbrella project
value 'containers' added by Buildship

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-11-25 08:49:49 +01:00
Sven Efftinge
baebe053cd [LSP] migrated to lsp4j 0.1.0 2016-11-05 20:52:35 +01:00
Miro Spönemann
b92f63bc54 eclipse/xtext#1080: Add name and description to generated poms
Signed-off-by: Miro Spönemann <miro.spoenemann@typefox.io>
2016-10-23 13:36:04 +02:00
Miro Spönemann
2a449c744e Merge pull request #157 from eclipse/cd_issue156
[WEB][Wizard][Generator] Update JS Libary Versions. Fixed #156
2016-10-20 15:32:16 +02:00
Christian Dietrich
fd6afda9bf [WEB][Wizard][Generator] Update JS Libary Versions. Fixed #156
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
2016-10-20 13:04:49 +02:00
Sven Efftinge
89733c8ab9 updated wizard to currently used gradle version 2016-10-20 09:15:37 +02:00
Karsten Thoms
9697786f3d [#101] Configure lineDelimiter in workflows
Add 'lineDelimiter' to project configuration and generate it to the
'code' configuration in the workflow.
Adjusted test expectations.


Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-10-07 15:07:30 +02:00
Karsten Thoms
eba4be8428 [#108] Ecore2Xtext use new formatter fragment
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-09-26 08:11:50 +02:00
Karsten Thoms
4b1737a6a7 [#112] Generate launch configs for Xtext workflow and Runtime Eclipse
- Launch config for Runtime Eclipse is only generated when the runtime
project is a plugin project.
- Launch config for Xtext workflow is dependent on the build system. For
plain Maven projects the launch config uses the m2e launcher, for Gradle
builds buildship is launched.

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-09-23 14:03:06 +02:00
Moritz Eysholdt
467ee9cf51 Merge pull request #83 from kthoms/kth/bug484500
Kth/bug484500
2016-08-12 13:38:03 +02:00
Karsten Thoms
735ea5d929 [484500] Add bin.excludes to build.properties
- the runtime project excludes .mwe2 and .xtend files
- the feature sdk project excludes nothing
- all other Eclipse projects exclude .xtend
- add test case WizardConfigurationTest#binExcludes

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-08-12 11:04:13 +02:00
Karsten Thoms
ae123abe38 [#79] Upgrade Eclipse & MWE p2 repository URLs
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-08-12 08:30:48 +02:00
Karsten Thoms
337e4371e4 [#76] Upgrade to Tycho 0.25.0
Covered by test CliWizardIntegrationTest

Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
2016-08-11 23:07:08 +02:00
Lorenzo Bettini
316b42e334 Merge pull request #29 from LorenzoBettini/lb/bug494176
494176: Warning: The file "plugin.xml" does not exist in the workspace
2016-07-18 11:06:33 +02:00
Lorenzo Bettini
fb8f005e06 30: ui.tests depends on the new testing bundle
Task-Url: https://github.com/eclipse/xtext-core/issues/30
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2016-07-11 11:25:26 +02:00
Lorenzo Bettini
df2293746f 494176: Warning: The file "plugin.xml" does not exist in the workspace
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=494176
Signed-off-by: Lorenzo Bettini <lorenzo.bettini@gmail.com>
2016-07-11 10:48:22 +02:00
Miro Spönemann
950eb8ae74 Removed old Gradle integration prefs 2016-07-07 11:22:13 +02:00
Miro Spönemann
decf9b22aa Checked in project metadata based on Buildship 2016-07-07 10:19:04 +02:00
Moritz Eysholdt
ffa109f37f Smaller changes 2016-06-17 18:31:26 +02:00
Miro Spönemann
e1a4782403 Generated code 2016-06-14 09:45:31 +02:00
Miro Spönemann
96edcf48ae Removed buildship.core.prefs 2016-06-14 09:44:34 +02:00
Miro Spönemann
4270986cba Moved projects to root of repository 2016-06-14 08:30:25 +02:00