Tools/RDL-Editor
8
0
Fork 0
mirror of https://github.com/Minres/RDL-Editor.git synced 2024-12-22 07:28:02 +01:00
Code Issues 1 Packages Releases Wiki Activity

Merge pull request #1 from Minres/develop

Browse Source 
Develop
This commit is contained in:
Eyck Jentzsch 2017-09-13 19:24:41 +00:00 committed by GitHub
commit 006b636c68
41 changed files with 6185 additions and 3869 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -1,9 +1,5 @@
com.minres.rdl.parent/com.minres.rdl/.launch com.minres.rdl.parent/com.minres.rdl/.launch
com.minres.rdl.parent/com.minres.rdl.ui/target com.minres.rdl.parent/*/target
com.minres.rdl.parent/com.minres.rdl.ui.tests/target
com.minres.rdl.parent/com.minres.rdl.tests/target
com.minres.rdl.parent/com.minres.rdl.ide/target
com.minres.rdl.parent/com.minres.rdl/target
*.xtextbin *.xtextbin
*.xtendbin *.xtendbin
*._trace *._trace

71
com.minres.rdl.parent/com.minres.rdl.feature/feature.xml
View File

@ -1,23 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<feature id="com.minres.rdl.feature" <feature
label="RDL Feature " id="com.minres.rdl.feature"
version="1.0.0.qualifier"> label="RDL Feature "
<plugin version="1.0.0.qualifier">
id="com.minres.rdl"
download-size="0" <requires>
install-size="0" <import plugin="org.eclipse.xtext"/>
version="0.0.0" <import plugin="org.eclipse.xtext.xbase"/>
unpack="false"/> <import plugin="org.eclipse.equinox.common" version="3.5.0" match="greaterOrEqual"/>
<plugin <import plugin="org.eclipse.emf.ecore"/>
id="com.minres.rdl.ide" <import plugin="org.eclipse.xtext.xbase.lib"/>
download-size="0" <import plugin="org.antlr.runtime"/>
install-size="0" <import plugin="org.eclipse.xtext.util"/>
version="0.0.0" <import plugin="org.eclipse.xtend.lib"/>
unpack="false"/> <import plugin="org.eclipse.emf.common"/>
<plugin <import plugin="org.eclipse.equinox.preferences"/>
id="com.minres.rdl.ui" <import plugin="org.apache.log4j"/>
download-size="0" <import plugin="org.eclipse.xtext.ide"/>
install-size="0" <import plugin="org.eclipse.xtext.xbase.ide"/>
version="0.0.0" <import plugin="org.eclipse.xtext.ui"/>
unpack="false"/> <import plugin="org.eclipse.xtext.ui.shared"/>
<import plugin="org.eclipse.xtext.ui.codetemplates.ui"/>
<import plugin="org.eclipse.ui.editors" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.ide" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.compare"/>
<import plugin="org.eclipse.xtext.builder"/>
</requires>
<plugin
id="com.minres.rdl"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.minres.rdl.ide"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="com.minres.rdl.ui"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature> </feature>

2
com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/RDLParser.java
View File

@ -206,7 +206,7 @@ public class RDLParser extends AbstractContentAssistParser {
@Override @Override
protected String[] getInitialHiddenTokens() { protected String[] getInitialHiddenTokens() {
return new String[] { "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT" }; return new String[] { "RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_ESCAPE_JSP", "RULE_ESCAPE_ORDL" };
} }
public RDLGrammarAccess getGrammarAccess() { public RDLGrammarAccess getGrammarAccess() {

6
com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.g
View File

@ -7643,10 +7643,14 @@ RULE_ID : '\\'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
RULE_WS : (' '|'\t'|'\r'|'\n')+; RULE_WS : (' '|'\t'|'\r'|'\n')+;
RULE_ML_COMMENT : ('/*' ( options {greedy=false;} : . )*'*/'|'<%' ( options {greedy=false;} : . )*'%>'|'(' ( options {greedy=false;} : . )*')'); RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?; RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
RULE_ESCAPE_JSP : '<%' ( options {greedy=false;} : . )*'%>';
RULE_ESCAPE_ORDL : '(' ( options {greedy=false;} : . )*')';
RULE_NUM : (('0'..'9')+ '\'b' ('0'|'1'|'_')+|('0'..'9')+ '\'o' ('0'..'7'|'_')+|('0'..'9')+ '\'h' ('0'..'9'|'a'..'f'|'A'..'F'|'_')+|('0'..'9')+ '\'d' ('0'..'9'|'_')+|'0x' ('0'..'9'|'a'..'f'|'A'..'F')+|('0'..'9')+); RULE_NUM : (('0'..'9')+ '\'b' ('0'|'1'|'_')+|('0'..'9')+ '\'o' ('0'..'7'|'_')+|('0'..'9')+ '\'h' ('0'..'9'|'a'..'f'|'A'..'F'|'_')+|('0'..'9')+ '\'d' ('0'..'9'|'_')+|'0x' ('0'..'9'|'a'..'f'|'A'..'F')+|('0'..'9')+);
RULE_STR : '"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'; RULE_STR : '"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"';

252
com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDL.tokens
View File

@ -1,126 +1,128 @@
'%='=125 '%='=127
'+='=124 '+='=126
','=122 ','=124
'->'=129 '->'=131
'.'=130 '.'=132
':'=128 ':'=130
';'=115 ';'=117
'='=117 '='=119
'@'=123 '@'=125
'UNDEFINED'=95 'UNDEFINED'=97
'['=126 '['=128
']'=127 ']'=129
'`include'=111 '`include'=113
'accesswidth'=79 'accesswidth'=81
'activehigh'=58 'activehigh'=60
'activelow'=59 'activelow'=61
'addressing'=82 'addressing'=84
'addrmap'=13 'addrmap'=15
'alias'=121 'alias'=123
'alignment'=75 'alignment'=77
'all'=19 'all'=21
'anded'=38 'anded'=40
'arbiter'=22 'arbiter'=24
'async'=55 'async'=57
'bigendian'=47 'bigendian'=49
'boolean'=12 'boolean'=14
'bothedge'=108 'bothedge'=110
'bridge'=50 'bridge'=52
'clock'=86 'clock'=88
'compact'=103 'compact'=105
'component'=119 'component'=121
'counter'=41 'counter'=43
'cpuif_reset'=56 'cpuif_reset'=58
'decr'=63 'decr'=65
'decrsaturate'=69 'decrsaturate'=71
'decrthreshold'=71 'decrthreshold'=73
'decrvalue'=67 'decrvalue'=69
'decrwidth'=65 'decrwidth'=67
'default'=118 'default'=120
'desc'=21 'desc'=23
'dontcompare'=72 'dontcompare'=74
'donttest'=73 'donttest'=75
'enable'=88 'enable'=90
'encode'=84 'encode'=86
'enum'=131 'enum'=133
'errextbus'=44 'errextbus'=46
'external'=132 'external'=134
'false'=97 'false'=99
'field'=16 'field'=18
'field_reset'=57 'field_reset'=59
'fieldwidth'=77 'fieldwidth'=79
'fullalign'=105 'fullalign'=107
'halt'=93 'halt'=95
'haltenable'=92 'haltenable'=94
'haltmask'=91 'haltmask'=93
'hw'=81 'hw'=83
'hwclr'=32 'hwclr'=34
'hwenable'=89 'hwenable'=91
'hwmask'=90 'hwmask'=92
'hwset'=31 'hwset'=33
'incr'=62 'incr'=64
'incrvalue'=66 'incrvalue'=68
'incrwidth'=64 'incrwidth'=66
'internal'=74 'internal'=76
'intr'=37 'intr'=39
'level'=109 'level'=111
'littleendian'=46 'littleendian'=48
'lsb0'=53 'lsb0'=55
'mask'=87 'mask'=89
'msb0'=52 'msb0'=54
'na'=102 'na'=104
'name'=20 'name'=22
'negedge'=107 'negedge'=109
'next'=94 'next'=96
'nonsticky'=110 'nonsticky'=112
'number'=11 'number'=13
'ored'=39 'ored'=41
'overflow'=42 'overflow'=44
'posedge'=106 'posedge'=108
'precedence'=83 'precedence'=85
'property'=112 'property'=114
'r'=100 'r'=102
'rclr'=24 'rclr'=26
'ref'=17 'ref'=19
'reg'=14 'reg'=16
'regalign'=104 'regalign'=106
'regfile'=15 'regfile'=17
'regwidth'=76 'regwidth'=78
'reset'=45 'reset'=47
'resetsignal'=85 'resetsignal'=87
'rset'=23 'rset'=25
'rsvdset'=48 'rsvdset'=50
'rsvdsetX'=49 'rsvdsetX'=51
'rw'=98 'rw'=100
'saturate'=68 'saturate'=70
'shared'=51 'shared'=53
'sharedextbus'=43 'sharedextbus'=45
'signal'=18 'signal'=20
'signalwidth'=78 'signalwidth'=80
'singlepulse'=60 'singlepulse'=62
'sticky'=35 'sticky'=37
'stickybit'=36 'stickybit'=38
'string'=10 'string'=12
'sw'=80 'sw'=82
'swacc'=34 'swacc'=36
'swmod'=33 'swmod'=35
'swwe'=29 'swwe'=31
'swwel'=30 'swwel'=32
'sync'=54 'sync'=56
'threshold'=70 'threshold'=72
'true'=96 'true'=98
'type'=116 'type'=118
'underflow'=61 'underflow'=63
'w'=101 'w'=103
'we'=27 'we'=29
'wel'=28 'wel'=30
'woclr'=25 'woclr'=27
'woset'=26 'woset'=28
'wr'=99 'wr'=101
'xored'=40 'xored'=42
'{'=113 '{'=115
'|'=120 '|'=122
'}'=114 '}'=116
RULE_ESCAPE_JSP=10
RULE_ESCAPE_ORDL=11
RULE_ID=5 RULE_ID=5
RULE_ML_COMMENT=8 RULE_ML_COMMENT=8
RULE_NUM=6 RULE_NUM=6
@ -137,7 +139,6 @@ T__106=106
T__107=107 T__107=107
T__108=108 T__108=108
T__109=109 T__109=109
T__10=10
T__110=110 T__110=110
T__111=111 T__111=111
T__112=112 T__112=112
@ -148,7 +149,6 @@ T__116=116
T__117=117 T__117=117
T__118=118 T__118=118
T__119=119 T__119=119
T__11=11
T__120=120 T__120=120
T__121=121 T__121=121
T__122=122 T__122=122
@ -163,6 +163,8 @@ T__12=12
T__130=130 T__130=130
T__131=131 T__131=131
T__132=132 T__132=132
T__133=133
T__134=134
T__13=13 T__13=13
T__14=14 T__14=14
T__15=15 T__15=15

2701
com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDLLexer.java
View File

File diff suppressed because it is too large Load Diff

870
com.minres.rdl.parent/com.minres.rdl.ide/src-gen/com/minres/rdl/ide/contentassist/antlr/internal/InternalRDLParser.java
View File

File diff suppressed because it is too large Load Diff

23
com.minres.rdl.parent/com.minres.rdl.platform.feature/.project Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>com.minres.rdl.platform.feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>

2
com.minres.rdl.parent/com.minres.rdl.platform.feature/.settings/org.eclipse.core.resources.prefs Normal file
View File

@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8

4
com.minres.rdl.parent/com.minres.rdl.platform.feature/.settings/org.eclipse.m2e.core.prefs Normal file
View File

@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

1
com.minres.rdl.parent/com.minres.rdl.platform.feature/build.properties Normal file
View File

@ -0,0 +1 @@
bin.includes = feature.xml

1904
com.minres.rdl.parent/com.minres.rdl.platform.feature/feature.xml Normal file
View File

File diff suppressed because it is too large Load Diff

15
com.minres.rdl.parent/com.minres.rdl.platform.feature/pom.xml Normal file
View File

@ -0,0 +1,15 @@
<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>
<groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>com.minres.rdl.platform.feature</artifactId>
<packaging>eclipse-feature</packaging>
<dependencies>
</dependencies>
</project>

23
com.minres.rdl.parent/com.minres.rdl.product.feature/.project Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>com.minres.rdl.product.feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>

2
com.minres.rdl.parent/com.minres.rdl.product.feature/.settings/org.eclipse.core.resources.prefs Normal file
View File

@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8

1
com.minres.rdl.parent/com.minres.rdl.product.feature/build.properties Normal file
View File

@ -0,0 +1 @@
bin.includes = feature.xml

20
com.minres.rdl.parent/com.minres.rdl.product.feature/feature.xml Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="com.minres.rdl.product.feature"
label="RDL Feature "
version="1.0.0.qualifier">
<requires>
<import feature="com.minres.rdl.feature" version="1.0.0.qualifier"/>
<import feature="com.minres.rdl.platform.feature" version="1.0.0.qualifier"/>
<import plugin="org.eclipse.core.runtime" version="3.12.0" match="greaterOrEqual"/>
</requires>
<plugin
id="com.minres.rdl.product"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
</feature>

15
com.minres.rdl.parent/com.minres.rdl.product.feature/pom.xml Normal file
View File

@ -0,0 +1,15 @@
<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>
<groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>com.minres.rdl.product.feature</artifactId>
<packaging>eclipse-feature</packaging>
<dependencies>
</dependencies>
</project>

7
com.minres.rdl.parent/com.minres.rdl.product/.classpath Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>

40
com.minres.rdl.parent/com.minres.rdl.product/.project Normal file
View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>com.minres.rdl.product</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

2
com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.core.resources.prefs Normal file
View File

@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8

7
com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.jdt.core.prefs Normal file
View File

@ -0,0 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8

4
com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.m2e.core.prefs Normal file
View File

@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

7
com.minres.rdl.parent/com.minres.rdl.product/.settings/org.eclipse.xtend.core.Xtend.prefs Normal file
View File

@ -0,0 +1,7 @@
//outlet.DEFAULT_OUTPUT.sourceFolder.src/main/java.directory=xtend-gen
//outlet.DEFAULT_OUTPUT.sourceFolder.src/test/java.directory=xtend-gen
BuilderConfiguration.is_project_specific=true
eclipse.preferences.version=1
outlet.DEFAULT_OUTPUT.hideLocalSyntheticVariables=true
outlet.DEFAULT_OUTPUT.installDslAsPrimarySource=false
outlet.DEFAULT_OUTPUT.userOutputPerSourceFolder=true

8
com.minres.rdl.parent/com.minres.rdl.product/META-INF/MANIFEST.MF Normal file
View File

@ -0,0 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: RDL Editor
Bundle-SymbolicName: com.minres.rdl.product;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: MINRES
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0"

5
com.minres.rdl.parent/com.minres.rdl.product/build.properties Normal file
View File

@ -0,0 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml

119
com.minres.rdl.parent/com.minres.rdl.product/com.minres.rdl.product.product Normal file
View File

@ -0,0 +1,119 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
<product name="RDL" uid="com.minres.rdl.product.product" id="com.minres.rdl.product.product" application="org.eclipse.ui.ide.workbench" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
<launcherArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
</launcherArgs>
<windowImages/>
<launcher>
<solaris/>
<win useIco="false">
<bmp/>
</win>
</launcher>
<vm>
</vm>
<plugins>
<plugin id="com.ibm.icu"/>
<plugin id="com.minres.rdl.product"/>
<plugin id="javax.inject"/>
<plugin id="javax.xml"/>
<plugin id="org.apache.batik.css"/>
<plugin id="org.apache.batik.util"/>
<plugin id="org.apache.batik.util.gui"/>
<plugin id="org.apache.commons.jxpath"/>
<plugin id="org.eclipse.core.commands"/>
<plugin id="org.eclipse.core.contenttype"/>
<plugin id="org.eclipse.core.databinding"/>
<plugin id="org.eclipse.core.databinding.observable"/>
<plugin id="org.eclipse.core.databinding.property"/>
<plugin id="org.eclipse.core.expressions"/>
<plugin id="org.eclipse.core.filesystem"/>
<plugin id="org.eclipse.core.filesystem.macosx" fragment="true"/>
<plugin id="org.eclipse.core.jobs"/>
<plugin id="org.eclipse.core.runtime"/>
<plugin id="org.eclipse.e4.core.commands"/>
<plugin id="org.eclipse.e4.core.contexts"/>
<plugin id="org.eclipse.e4.core.di"/>
<plugin id="org.eclipse.e4.core.di.annotations"/>
<plugin id="org.eclipse.e4.core.di.extensions"/>
<plugin id="org.eclipse.e4.core.services"/>
<plugin id="org.eclipse.e4.emf.xpath"/>
<plugin id="org.eclipse.e4.ui.bindings"/>
<plugin id="org.eclipse.e4.ui.css.core"/>
<plugin id="org.eclipse.e4.ui.css.swt"/>
<plugin id="org.eclipse.e4.ui.css.swt.theme"/>
<plugin id="org.eclipse.e4.ui.di"/>
<plugin id="org.eclipse.e4.ui.model.workbench"/>
<plugin id="org.eclipse.e4.ui.services"/>
<plugin id="org.eclipse.e4.ui.widgets"/>
<plugin id="org.eclipse.e4.ui.workbench"/>
<plugin id="org.eclipse.e4.ui.workbench.addons.swt"/>
<plugin id="org.eclipse.e4.ui.workbench.renderers.swt"/>
<plugin id="org.eclipse.e4.ui.workbench.renderers.swt.cocoa" fragment="true"/>
<plugin id="org.eclipse.e4.ui.workbench.swt"/>
<plugin id="org.eclipse.e4.ui.workbench3"/>
<plugin id="org.eclipse.emf.common"/>
<plugin id="org.eclipse.emf.ecore"/>
<plugin id="org.eclipse.emf.ecore.change"/>
<plugin id="org.eclipse.emf.ecore.xmi"/>
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.bidi"/>
<plugin id="org.eclipse.equinox.common"/>
<plugin id="org.eclipse.equinox.p2.core"/>
<plugin id="org.eclipse.equinox.p2.engine"/>
<plugin id="org.eclipse.equinox.p2.metadata"/>
<plugin id="org.eclipse.equinox.p2.metadata.repository"/>
<plugin id="org.eclipse.equinox.p2.repository"/>
<plugin id="org.eclipse.equinox.preferences"/>
<plugin id="org.eclipse.equinox.registry"/>
<plugin id="org.eclipse.equinox.security"/>
<plugin id="org.eclipse.equinox.security.macosx" fragment="true"/>
<plugin id="org.eclipse.help"/>
<plugin id="org.eclipse.jface"/>
<plugin id="org.eclipse.jface.databinding"/>
<plugin id="org.eclipse.jface.text"/>
<plugin id="org.eclipse.osgi"/>
<plugin id="org.eclipse.osgi.compatibility.state" fragment="true"/>
<plugin id="org.eclipse.osgi.services"/>
<plugin id="org.eclipse.swt"/>
<plugin id="org.eclipse.swt.cocoa.macosx.x86_64" fragment="true"/>
<plugin id="org.eclipse.text"/>
<plugin id="org.eclipse.ui"/>
<plugin id="org.eclipse.ui.cocoa" fragment="true"/>
<plugin id="org.eclipse.ui.ide"/>
<plugin id="org.eclipse.ui.workbench"/>
<plugin id="org.tukaani.xz"/>
<plugin id="org.w3c.css.sac"/>
<plugin id="org.w3c.dom.events"/>
<plugin id="org.w3c.dom.smil"/>
<plugin id="org.w3c.dom.svg"/>
</plugins>
<features>
<feature id="com.minres.rdl.platform.feature" version="1.0.0.qualifier"/>
<feature id="com.minres.rdl.product.feature" version="1.0.0.qualifier"/>
<feature id="com.minres.rdl.feature" version="1.0.0.qualifier"/>
</features>
<configurations>
<plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
</configurations>
</product>

17
com.minres.rdl.parent/com.minres.rdl.product/plugin.xml Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
<extension
id="product"
point="org.eclipse.core.runtime.products">
<product
application="org.eclipse.ui.ide.workbench"
name="RDL">
<property
name="appName"
value="RDL">
</property>
</product>
</extension>
</plugin>

21
com.minres.rdl.parent/com.minres.rdl.product/pom.xml Normal file
View File

@ -0,0 +1,21 @@
<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>
<groupId>com.minres.rdl</groupId>
<artifactId>com.minres.rdl.parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>com.minres.rdl.product</artifactId>
<packaging>eclipse-application</packaging>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>

12
com.minres.rdl.parent/com.minres.rdl.repository/category.xml
View File

@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<site> <site>
<feature id="com.minres.rdl.feature" version="0.0.0"> <feature id="com.minres.rdl.feature" version="0.0.0">
<category name="main"/> <category name="main"/>
</feature> </feature>
<feature id="com.minres.rdl.feature.source" version="0.0.0"> <category-def name="main" label="RDL"/>
<category name="main.source"/>
</feature>
<category-def name="main" label="RDL"/>
<category-def name="main.source" label="RDL (Sources)"/>
</site> </site>

20
com.minres.rdl.parent/com.minres.rdl.target/com.minres.rdl.target.target
View File

@ -1,8 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?> <?pde version="3.8"?><target name="com.minres.rdl.target" sequenceNumber="3">
<target name="com.minres.rdl.target" sequenceNumber="1">
<locations> <locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.12.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/> <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/> <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.pde.feature.group" version="0.0.0"/> <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
@ -13,13 +21,5 @@
<unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/> <unit id="org.eclipse.xtend.typesystem.emf" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/neon/201606221000/"/> <repository location="http://download.eclipse.org/releases/neon/201606221000/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/modeling/emft/mwe/updates/releases/2.9.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.12.0/"/>
</location>
</locations> </locations>
</target> </target>

6
com.minres.rdl.parent/com.minres.rdl.ui/src-gen/com/minres/rdl/ui/contentassist/AbstractRDLProposalProvider.java
View File

@ -346,6 +346,12 @@ public abstract class AbstractRDLProposalProvider extends AbstractJavaBasedConte
public void complete_SL_COMMENT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { public void complete_SL_COMMENT(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override // subclasses may override
} }
public void complete_ESCAPE_JSP(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
}
public void complete_ESCAPE_ORDL(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override
}
public void complete_NUM(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) { public void complete_NUM(EObject model, RuleCall ruleCall, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {
// subclasses may override // subclasses may override
} }

4
com.minres.rdl.parent/com.minres.rdl.ui/xtend-gen/com/minres/rdl/ui/RDLUiModule.java
View File

@ -25,7 +25,7 @@ public class RDLUiModule extends AbstractRDLUiModule {
return RDLEObjectDocumentationProvider.class; return RDLEObjectDocumentationProvider.class;
} }
public RDLUiModule(final AbstractUIPlugin plugin) { public RDLUiModule(final AbstractUIPlugin arg0) {
super(plugin); super(arg0);
} }
} }

2
com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/RDLParser.java
View File

@ -16,7 +16,7 @@ public class RDLParser extends AbstractAntlrParser {
@Override @Override
protected void setInitialHiddenTokens(XtextTokenStream tokenStream) { protected void setInitialHiddenTokens(XtextTokenStream tokenStream) {
tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT"); tokenStream.setInitialHiddenTokens("RULE_WS", "RULE_ML_COMMENT", "RULE_SL_COMMENT", "RULE_ESCAPE_JSP", "RULE_ESCAPE_ORDL");
} }

6
com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDL.g
View File

@ -3576,10 +3576,14 @@ RULE_ID : '\\'? ('a'..'z'|'A'..'Z'|'_') ('a'..'z'|'A'..'Z'|'_'|'0'..'9')*;
RULE_WS : (' '|'\t'|'\r'|'\n')+; RULE_WS : (' '|'\t'|'\r'|'\n')+;
RULE_ML_COMMENT : ('/*' ( options {greedy=false;} : . )*'*/'|'<%' ( options {greedy=false;} : . )*'%>'|'(' ( options {greedy=false;} : . )*')'); RULE_ML_COMMENT : '/*' ( options {greedy=false;} : . )*'*/';
RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?; RULE_SL_COMMENT : '//' ~(('\n'|'\r'))* ('\r'? '\n')?;
RULE_ESCAPE_JSP : '<%' ( options {greedy=false;} : . )*'%>';
RULE_ESCAPE_ORDL : '(' ( options {greedy=false;} : . )*')';
RULE_NUM : (('0'..'9')+ '\'b' ('0'|'1'|'_')+|('0'..'9')+ '\'o' ('0'..'7'|'_')+|('0'..'9')+ '\'h' ('0'..'9'|'a'..'f'|'A'..'F'|'_')+|('0'..'9')+ '\'d' ('0'..'9'|'_')+|'0x' ('0'..'9'|'a'..'f'|'A'..'F')+|('0'..'9')+); RULE_NUM : (('0'..'9')+ '\'b' ('0'|'1'|'_')+|('0'..'9')+ '\'o' ('0'..'7'|'_')+|('0'..'9')+ '\'h' ('0'..'9'|'a'..'f'|'A'..'F'|'_')+|('0'..'9')+ '\'d' ('0'..'9'|'_')+|'0x' ('0'..'9'|'a'..'f'|'A'..'F')+|('0'..'9')+);
RULE_STR : '"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"'; RULE_STR : '"' ('\\' ('b'|'t'|'n'|'f'|'r'|'u'|'"'|'\''|'\\')|~(('\\'|'"')))* '"';

252
com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDL.tokens
View File

@ -1,126 +1,128 @@
'%='=28 '%='=30
'+='=27 '+='=29
','=25 ','=27
'->'=32 '->'=34
'.'=33 '.'=35
':'=30 ':'=32
';'=15 ';'=17
'='=14 '='=16
'@'=26 '@'=28
'UNDEFINED'=119 'UNDEFINED'=121
'['=29 '['=31
']'=31 ']'=33
'`include'=10 '`include'=12
'accesswidth'=103 'accesswidth'=105
'activehigh'=83 'activehigh'=85
'activelow'=84 'activelow'=86
'addressing'=106 'addressing'=108
'addrmap'=40 'addrmap'=42
'alias'=24 'alias'=26
'alignment'=99 'alignment'=101
'all'=46 'all'=48
'anded'=63 'anded'=65
'arbiter'=47 'arbiter'=49
'async'=80 'async'=82
'bigendian'=72 'bigendian'=74
'boolean'=39 'boolean'=41
'bothedge'=130 'bothedge'=132
'bridge'=75 'bridge'=77
'clock'=110 'clock'=112
'compact'=125 'compact'=127
'component'=20 'component'=22
'counter'=66 'counter'=68
'cpuif_reset'=81 'cpuif_reset'=83
'decr'=88 'decr'=90
'decrsaturate'=94 'decrsaturate'=96
'decrthreshold'=96 'decrthreshold'=98
'decrvalue'=92 'decrvalue'=94
'decrwidth'=90 'decrwidth'=92
'default'=17 'default'=19
'desc'=36 'desc'=38
'dontcompare'=97 'dontcompare'=99
'donttest'=98 'donttest'=100
'enable'=112 'enable'=114
'encode'=108 'encode'=110
'enum'=34 'enum'=36
'errextbus'=69 'errextbus'=71
'external'=22 'external'=24
'false'=19 'false'=21
'field'=43 'field'=45
'field_reset'=82 'field_reset'=84
'fieldwidth'=101 'fieldwidth'=103
'fullalign'=127 'fullalign'=129
'halt'=117 'halt'=119
'haltenable'=116 'haltenable'=118
'haltmask'=115 'haltmask'=117
'hw'=105 'hw'=107
'hwclr'=57 'hwclr'=59
'hwenable'=113 'hwenable'=115
'hwmask'=114 'hwmask'=116
'hwset'=56 'hwset'=58
'incr'=87 'incr'=89
'incrvalue'=91 'incrvalue'=93
'incrwidth'=89 'incrwidth'=91
'internal'=23 'internal'=25
'intr'=62 'intr'=64
'level'=131 'level'=133
'littleendian'=71 'littleendian'=73
'lsb0'=78 'lsb0'=80
'mask'=111 'mask'=113
'msb0'=77 'msb0'=79
'na'=124 'na'=126
'name'=35 'name'=37
'negedge'=129 'negedge'=131
'next'=118 'next'=120
'nonsticky'=132 'nonsticky'=134
'number'=38 'number'=40
'ored'=64 'ored'=66
'overflow'=67 'overflow'=69
'posedge'=128 'posedge'=130
'precedence'=107 'precedence'=109
'property'=11 'property'=13
'r'=122 'r'=124
'rclr'=49 'rclr'=51
'ref'=44 'ref'=46
'reg'=41 'reg'=43
'regalign'=126 'regalign'=128
'regfile'=42 'regfile'=44
'regwidth'=100 'regwidth'=102
'reset'=70 'reset'=72
'resetsignal'=109 'resetsignal'=111
'rset'=48 'rset'=50
'rsvdset'=73 'rsvdset'=75
'rsvdsetX'=74 'rsvdsetX'=76
'rw'=120 'rw'=122
'saturate'=93 'saturate'=95
'shared'=76 'shared'=78
'sharedextbus'=68 'sharedextbus'=70
'signal'=45 'signal'=47
'signalwidth'=102 'signalwidth'=104
'singlepulse'=85 'singlepulse'=87
'sticky'=60 'sticky'=62
'stickybit'=61 'stickybit'=63
'string'=37 'string'=39
'sw'=104 'sw'=106
'swacc'=59 'swacc'=61
'swmod'=58 'swmod'=60
'swwe'=54 'swwe'=56
'swwel'=55 'swwel'=57
'sync'=79 'sync'=81
'threshold'=95 'threshold'=97
'true'=18 'true'=20
'type'=13 'type'=15
'underflow'=86 'underflow'=88
'w'=123 'w'=125
'we'=52 'we'=54
'wel'=53 'wel'=55
'woclr'=50 'woclr'=52
'woset'=51 'woset'=53
'wr'=121 'wr'=123
'xored'=65 'xored'=67
'{'=12 '{'=14
'|'=21 '|'=23
'}'=16 '}'=18
RULE_ESCAPE_JSP=10
RULE_ESCAPE_ORDL=11
RULE_ID=5 RULE_ID=5
RULE_ML_COMMENT=8 RULE_ML_COMMENT=8
RULE_NUM=6 RULE_NUM=6
@ -137,7 +139,6 @@ T__106=106
T__107=107 T__107=107
T__108=108 T__108=108
T__109=109 T__109=109
T__10=10
T__110=110 T__110=110
T__111=111 T__111=111
T__112=112 T__112=112
@ -148,7 +149,6 @@ T__116=116
T__117=117 T__117=117
T__118=118 T__118=118
T__119=119 T__119=119
T__11=11
T__120=120 T__120=120
T__121=121 T__121=121
T__122=122 T__122=122
@ -163,6 +163,8 @@ T__12=12
T__130=130 T__130=130
T__131=131 T__131=131
T__132=132 T__132=132
T__133=133
T__134=134
T__13=13 T__13=13
T__14=14 T__14=14
T__15=15 T__15=15

2681
com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDLLexer.java
View File

File diff suppressed because it is too large Load Diff

860
com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/parser/antlr/internal/InternalRDLParser.java
View File

File diff suppressed because it is too large Load Diff

18
com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/services/RDLGrammarAccess.java
View File

@ -3381,6 +3381,8 @@ public class RDLGrammarAccess extends AbstractGrammarElementFinder {
private final TerminalRule tWS; private final TerminalRule tWS;
private final TerminalRule tML_COMMENT; private final TerminalRule tML_COMMENT;
private final TerminalRule tSL_COMMENT; private final TerminalRule tSL_COMMENT;
private final TerminalRule tESCAPE_JSP;
private final TerminalRule tESCAPE_ORDL;
private final TerminalRule tNUM; private final TerminalRule tNUM;
private final TerminalRule tSTR; private final TerminalRule tSTR;
@ -3426,6 +3428,8 @@ public class RDLGrammarAccess extends AbstractGrammarElementFinder {
this.tWS = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.WS"); this.tWS = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.WS");
this.tML_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.ML_COMMENT"); this.tML_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.ML_COMMENT");
this.tSL_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.SL_COMMENT"); this.tSL_COMMENT = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.SL_COMMENT");
this.tESCAPE_JSP = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.ESCAPE_JSP");
this.tESCAPE_ORDL = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.ESCAPE_ORDL");
this.tNUM = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.NUM"); this.tNUM = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.NUM");
this.tSTR = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.STR"); this.tSTR = (TerminalRule) GrammarUtil.findRuleForName(getGrammar(), "com.minres.rdl.RDL.STR");
} }
@ -3962,7 +3966,7 @@ public class RDLGrammarAccess extends AbstractGrammarElementFinder {
} }
//terminal ML_COMMENT: //terminal ML_COMMENT:
// '/*'->'*/' | '<%'->'%>' | '('->')'; // '/*'->'*/';
public TerminalRule getML_COMMENTRule() { public TerminalRule getML_COMMENTRule() {
return tML_COMMENT; return tML_COMMENT;
} }
@ -3973,6 +3977,18 @@ public class RDLGrammarAccess extends AbstractGrammarElementFinder {
return tSL_COMMENT; return tSL_COMMENT;
} }
//terminal ESCAPE_JSP:
// '<%'->'%>';
public TerminalRule getESCAPE_JSPRule() {
return tESCAPE_JSP;
}
//terminal ESCAPE_ORDL:
// '('->')';
public TerminalRule getESCAPE_ORDLRule() {
return tESCAPE_ORDL;
}
//terminal NUM returns ecore::EJavaObject: // <= verilog like numbers with size and base (16'123 'h1fff, ...====================================================================================> <= hexa decimal numbers =============> <numbers> //terminal NUM returns ecore::EJavaObject: // <= verilog like numbers with size and base (16'123 'h1fff, ...====================================================================================> <= hexa decimal numbers =============> <numbers>
////'0'..'9'* '\'' ( 'b' ('0' | '1' | '_')+ | 'd'? ('0'..'9' | '_')+ | 'o' ('0'..'7' | '_')+ | 'h' ('0'..'9' | 'a'..'f' | 'A'..'F' | '_')+) | "0x" ('0'..'9' | 'a'..'f' | 'A'..'F')+ | '0'..'9'+; ////'0'..'9'* '\'' ( 'b' ('0' | '1' | '_')+ | 'd'? ('0'..'9' | '_')+ | 'o' ('0'..'7' | '_')+ | 'h' ('0'..'9' | 'a'..'f' | 'A'..'F' | '_')+) | "0x" ('0'..'9' | 'a'..'f' | 'A'..'F')+ | '0'..'9'+;
// '0'..'9'+ '\'b' ('0' | '1' | '_')+ | '0'..'9'+ '\'o' ('0'..'7' | '_')+ | '0'..'9'+ '\'h' ('0'..'9' | 'a'..'f' | // '0'..'9'+ '\'b' ('0' | '1' | '_')+ | '0'..'9'+ '\'o' ('0'..'7' | '_')+ | '0'..'9'+ '\'h' ('0'..'9' | 'a'..'f' |

21
com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/RdlImportUriResolver.java
View File

@ -1,21 +0,0 @@
package com.minres.rdl;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.scoping.impl.ImportUriResolver;
public class RdlImportUriResolver extends ImportUriResolver {
private static final Logger LOGGER = Logger.getLogger(RdlImportUriResolver.class);
public RdlImportUriResolver() {
super();
LOGGER.setLevel(Level.INFO);
}
@Override
public String resolve(EObject object) {
return super.resolve(object);
}
}

17
com.minres.rdl.parent/pom.xml
View File

@ -22,6 +22,9 @@
<module>com.minres.rdl.repository</module> <module>com.minres.rdl.repository</module>
<module>com.minres.rdl.tests</module> <module>com.minres.rdl.tests</module>
<module>com.minres.rdl.ui.tests</module> <module>com.minres.rdl.ui.tests</module>
<module>com.minres.rdl.product</module>
<module>com.minres.rdl.product.feature</module>
<module>com.minres.rdl.platform.feature</module>
</modules> </modules>
<build> <build>
<plugins> <plugins>
@ -31,7 +34,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<extensions>true</extensions> <extensions>true</extensions>
</plugin> </plugin>
<plugin> <!-- <plugin>
<groupId>org.eclipse.tycho</groupId> <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId> <artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version> <version>${tycho-version}</version>
@ -58,7 +61,7 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> --> <plugin>
<groupId>org.eclipse.tycho</groupId> <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId> <artifactId>tycho-p2-plugin</artifactId>
<version>${tycho-version}</version> <version>${tycho-version}</version>
@ -90,11 +93,21 @@
<ws>cocoa</ws> <ws>cocoa</ws>
<arch>x86_64</arch> <arch>x86_64</arch>
</environment> </environment>
<environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
</environment>
<environment> <environment>
<os>win32</os> <os>win32</os>
<ws>win32</ws> <ws>win32</ws>
<arch>x86_64</arch> <arch>x86_64</arch>
</environment> </environment>
<environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
</environment>
<environment> <environment>
<os>linux</os> <os>linux</os>
<ws>gtk</ws> <ws>gtk</ws>