Commit graph

4228 commits

Author SHA1 Message Date
Stefan Oehme
6752b2a579 fixed test expectation 2015-10-02 17:26:34 +02:00
Stefan Oehme
9c99083366 [wizard] fixed test expectations 2015-10-02 15:03:31 +02:00
Dennis Huebner
cddb1b10de [web] Fixed typos
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-02 13:52:18 +02:00
Stefan Oehme
e58e4b4fb6 Merge pull request #640 from eclipse/so_improve_xtextprojectconfig
[wizard/generator] expose project names in XtextProjectConfig
2015-10-02 13:34:17 +02:00
Stefan Oehme
fa6e2f0c58 Merge remote-tracking branch 'origin/master' into so_improve_xtextprojectconfig
Conflicts:
	plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
	plugins/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java
2015-10-02 13:10:53 +02:00
Stefan Oehme
73bff184ff Back to snapshot development 2015-10-02 11:29:58 +02:00
Stefan Oehme
d0c24c3f1c Merge pull request #638 from eclipse/so_wizard_improvements
Fix jar/war contents for plain Maven/Gradle build
2015-10-02 11:28:11 +02:00
Dennis Huebner
c209e3c590 [releng] Prepare beta5
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-02 08:23:11 +02:00
Stefan Oehme
cccde266c9 Merge branch 'master' into so_wizard_improvements
Conflicts:
	plugins/org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.xtend
	plugins/org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/RuntimeProjectDescriptor.java
2015-10-01 15:35:45 +02:00
Stefan Oehme
354f9404b6 [wizard/generator] expose project names in XtextProjectConfig 2015-10-01 14:41:21 +02:00
Stefan Oehme
f3244b7f26 [wizard] fixed test expectations 2015-10-01 12:05:46 +02:00
Sven Efftinge
297ca7a0c5 [wizard] reverted to old EMFFragment 2015-10-01 11:44:21 +02:00
Stefan Oehme
0c79111b47 [maven] remove unused icu4j dependency (10mb!)
Icu4j is only used in the Generator and UI. But up until now it was
pulled in by xtext runtime.
2015-10-01 11:02:38 +02:00
Stefan Oehme
12c95b807a [wizard] fix jar packaging for plain maven projects 2015-10-01 10:57:49 +02:00
Dennis Huebner
4188a27078 Fixed mwe2 dependency version
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-01 09:43:03 +02:00
Dennis Huebner
00efb66b13 Prepare for beta4
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-10-01 09:31:21 +02:00
Miro Spönemann
03640ffee0 Added resolution:=optional to mwe2.lib dependency
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-10-01 09:30:01 +02:00
Miro Spönemann
dc4f960413 Merge pull request #629 from eclipse/msp/generatorFragment
Migrated more generator fragments
2015-10-01 09:06:22 +02:00
Stefan Oehme
1bd153ea55 [wizard] fix jar content for Gradle build
include model/generated
exclude .xtend, ._trace, .g etc.
2015-09-30 18:22:07 +02:00
Dennis Huebner
acf8f88f46 Bug 478407 - [web/gradle] 'jettyRun' exits immediately
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-30 16:06:56 +02:00
Sebastian Zarnekow
5c4a73d28b Merge pull request #636 from eclipse/sz/xtext_grammar_enhancement
Expose accessors for new properties in AbstractContentAssistParser
2015-09-30 13:10:10 +02:00
Stefan Oehme
8a5681c61a [wizard] make sure noone accidently adds old asm dependency 2015-09-30 11:16:17 +02:00
Stefan Oehme
5e6dae5c5c [wizard] add maven/idea upload tasks
this way, users only need to insert their repository URLs to upload
their language artifacts to a Maven repository
2015-09-30 11:16:14 +02:00
Sven Efftinge
6976a0ab53 [web/generator] generate .* as CONTAINER_JAR_PATTERN 2015-09-30 10:58:19 +02:00
Sebastian Zarnekow
5a74aa3698 Expose accessors for new properties in AbstractContentAssistParser 2015-09-30 10:06:32 +02:00
Stefan Oehme
f6f513de79 [wizard] let generated projects use latest idea eap 2015-09-29 17:57:41 +02:00
Stefan Oehme
0b02838196 use latest idea-gradle-plugin 2015-09-29 17:54:48 +02:00
Stefan Oehme
0455b188ff make intellij recognize the ideaProvided dependencies 2015-09-29 14:51:18 +02:00
Stefan Oehme
d16079950f make gradle plugin versions dependent on Xtext version 2015-09-29 14:47:36 +02:00
Stefan Oehme
fa24700451 Merge pull request #631 from eclipse/so_fix_classpath_typeprovider
Stale JvmTypes in the incremental builder
2015-09-28 16:42:09 -04:00
Stefan Oehme
12da06469b fixed stale JvmTypes in the index when using Java source language 2015-09-28 18:00:21 +02:00
Dennis Huebner
eb2fac4f97 Bug 478040 - [api] We need a way to obtain the current versions we use
to generate build files

Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-28 15:15:48 +02:00
Dennis Huebner
45e8153cee [wizard] Plugin repository entry in generated pom. Fixed test
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-28 09:49:57 +02:00
Dennis Huebner
050b03db10 Bug 478388 - [wizard] Plugin repository entry in generated pom is
missing for snapshots

Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-25 17:23:28 +02:00
Miro Spönemann
d9ef0ff6f5 [wizard] Added copyright headers 2015-09-25 14:57:14 +02:00
Miro Spönemann
224c8e835a [generator] implemented new EMF fragment 2015-09-25 14:57:14 +02:00
Miro Spönemann
4f2a136d72 [generator] implemented new validator fragment
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-09-25 14:57:14 +02:00
Miro Spönemann
67752cd1bd [generator] Implemented new types fragment
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-09-25 14:57:14 +02:00
Miro Spönemann
7e61163931 [generator] Implemented new scoping fragment
Signed-off-by: Miro Spönemann <miro.spoenemann@itemis.de>
2015-09-25 14:57:13 +02:00
Dennis Huebner
20c3b99973 [idea] Fixed NPE
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-25 14:24:02 +02:00
Dennis Huebner
afe25fefe1 Merge remote-tracking branch 'origin/master' into dh/idea-wizard
Conflicts:
	.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
	intellij/org.eclipse.xtext.xtext.idea.tests/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs


Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-24 16:28:06 +02:00
Dennis Huebner
06694ea9cd [wizard] Apply Facet and set up output configuration
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-24 16:15:45 +02:00
Sebastian Zarnekow
64e08e5d0a Merge pull request #625 from eclipse/sz/xtext_grammar_enhancement
Fixed validation of actions in fragments
2015-09-24 10:52:25 +02:00
Stefan Oehme
9782dd1925 Merge pull request #627 from eclipse/so_wizard_fixes
[wizard] Make upgrading to Xbase seamless
2015-09-23 21:09:48 -04:00
Stefan Oehme
d2669e2e03 include xbase.web dependency by default
This way, users can upgrade to using Xbase without touching their
buildscripts. Users who are very build performance aware can easily
remove it.
2015-09-23 21:47:47 +02:00
Stefan Oehme
c98a50ed20 make AlternateJdkLoader usable for Gradle without Xtend dependency 2015-09-23 20:01:11 +02:00
Dennis Huebner
374858a89f [wizard] Allow creation of module in existing project. Some Tests.
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-23 14:47:09 +02:00
Sebastian Zarnekow
954a4867cd Fixed validation of actions in fragments
Added test
2015-09-23 14:01:54 +02:00
Dennis Huebner
01f98cb305 [idea] [wizard] First draft - WIP
Signed-off-by: Dennis Huebner <dennis.huebner@itemis.de>
2015-09-23 09:09:44 +02:00
Sebastian Zarnekow
25b27bb8c3 Fixed RegEx for line endings 2015-09-22 19:18:37 +02:00