Commit graph

4250 commits

Author SHA1 Message Date
Christian Schneider
cecacb3085 [xtext generator] Migration of 'QuickfixProviderFragment'
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-06 10:17:54 +02:00
Stefan Oehme
7594456e64 Merge pull request #656 from eclipse/so_fix_xbase_generator
set rootpath and basename in GenerateXbase
2015-10-06 09:11:24 +02:00
Stefan Oehme
66cde8ea28 set rootpath and basename in GenerateXbase
also add a validation so that this doesn't go unnoticed again
2015-10-06 08:47:58 +02:00
Stefan Oehme
d21cbe1da1 Merge pull request #655 from eclipse/so_fix_generator_bundlename
[generator 2] fix manifest bundle name
2015-10-05 18:00:43 +02:00
Stefan Oehme
7bc3cccf1b [generator 2]fix manifest bundle name 2015-10-05 16:53:26 +02:00
Moritz Eysholdt
5ce4f91a62 Merge pull request #652 from eclipse/me/move_FlattenedGrammarAccess_to_xtext.xtext
Me/move flattened grammar access to xtext.xtext
2015-10-05 16:09:25 +02:00
Moritz Eysholdt
4825c50e78 Merge pull request #651 from eclipse/me/move_RuleName_to_xtext.xtext
Move class 'RuleNames' to o.e.xtext.xtext
2015-10-05 15:05:49 +02:00
Stefan Oehme
5c92b49d98 Merge pull request #649 from eclipse/so_maven_clean_task
[wizard][maven] clean test-src-gen folders
2015-10-05 14:40:59 +02:00
Stefan Oehme
dc40b98081 Merge pull request #648 from eclipse/so_m2e_buildship_integration
[wizard] generate m2e/buildship integration
2015-10-05 14:40:54 +02:00
Stefan Oehme
5a64d76ee0 Merge pull request #647 from eclipse/so_fix_container_jar_pattern
make container_jar_pattern more restrictive
2015-10-05 14:40:37 +02:00
Moritz Eysholdt
23a90dc931 moved 'FlattenedGrammarAccess' to o.e.xtext.xtext
This makes it accessible for the serializer

Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-05 14:22:35 +02:00
Moritz Eysholdt
71c030d1f9 Move class 'RuleNames' to o.e.xtext.xtext
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-05 14:04:55 +02:00
Stefan Oehme
0befbf41f1 [wizard][maven] clean test-src-gen folders 2015-10-05 11:47:53 +02:00
Stefan Oehme
42e4881ef4 [wizard] fixed test expectations 2015-10-05 11:28:08 +02:00
Stefan Oehme
eb00888154 make container_jar_pattern more restrictive 2015-10-05 11:19:36 +02:00
Moritz Eysholdt
fb3e180f8a added support for grammar fragments and refactored pda providers
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-05 10:53:49 +02:00
Stefan Oehme
31bdc4f9a4 [wizard] generate m2e/buildship integration 2015-10-05 10:20:36 +02:00
Moritz Eysholdt
2b95508568 Make XtextInjectorProvider accessible for all test projects
Signed-off-by: Moritz Eysholdt <moritz.eysholdt@itemis.de>
2015-10-05 09:36:23 +02:00
Stefan Oehme
4d064aa885 Merge pull request #644 from eclipse/so_remove_naming_setters
[generator2] remove package setters from naming
2015-10-03 23:35:32 +02:00
Sven Efftinge
c62b28a5f3 Merge pull request #641 from sailingKieler/cs/generatorFragments/OutlineTreeProvider
[xtext generator] Migration of the 'OutlineTreeProviderFragment'
2015-10-02 22:20:46 +02:00
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
Stefan Oehme
ef5b19b6a3 [generator2] remove package setters from naming 2015-10-02 14:39:47 +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
Christian Schneider
2ae64ef6ec [xtext generator] migrated OutlineTreeProviderFragment
Signed-off-by: Christian Schneider <christian.schneider@itemis.de>
2015-10-02 10:32:13 +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