Skip to content
Snippets Groups Projects
Commit 90d26251 authored by Sebastian Krings's avatar Sebastian Krings
Browse files

integration commit between camille 2 and 3, merging the multiple lines of... 

integration commit between camille 2 and 3, merging the multiple lines of development (git + svn), includes rodin 3 port

Sadly, it was not possible to generate separate commits out of this as these did not exist in the former repositories
parent 60237533
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 243 additions and 124 deletions
build.gradle
+ 2
− 2
View file @ 90d26251
targetRepositories = ["http://www.stups.uni-duesseldorf.de/ProB/buildlibs/rodin/","http://download.eclipse.org/releases/juno/","http://rodin-b-sharp.sourceforge.net/updates"] // ps Repository with Target Definition File targetRepositories = ["http://www.stups.uni-duesseldorf.de/ProB/buildlibs/rodin/","http://download.eclipse.org/releases/juno/","http://rodin-b-sharp.sourceforge.net/updates"] // ps Repository with Target Definition File
groupID = "org.eventb.texteditor" groupID = "org.eventb.texteditor"
categoryDescriptions = [["org.eventb.texteditor.feature": "Camille Text Editor"],["org.eventb.texteditor.feature": "Camille Text Editor"]] // label and descriptions of the features
categoryDescriptions = [["org.eventb.texteditor.feature": "Camille Text Editor"],["org.eventb.texteditor.feature": "Camille Text Editor"]] // label and descriptions of the features
apply from: 'tycho_build.gradle' apply from: 'tycho_build.gradle'
......
de.be4.eventb.structparser/.classpath
+ 1
− 8
View file @ 90d26251
...@@ -2,14 +2,7 @@ ...@@ -2,14 +2,7 @@
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="src_generated"/> <classpathentry kind="src" path="src_generated"/>
<classpathentry kind="src" path="test"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="lib" path="lib/ParserAspects.jar">
<attributes>
<attribute name="org.eclipse.ajdt.aspectpath" value="org.eclipse.ajdt.aspectpath"/>
</attributes>
</classpathentry>
<classpathentry exported="true" kind="lib" path="lib/aspectjrt.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>
de.be4.eventb.structparser/.project
+ 1
− 2
View file @ 90d26251
...@@ -6,13 +6,12 @@ ...@@ -6,13 +6,12 @@
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand> <buildCommand>
<name>org.eclipse.ajdt.core.ajbuilder</name> <name>org.eclipse.jdt.core.javabuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>org.eclipse.ajdt.ui.ajnature</nature>
<nature>org.eclipse.jdt.core.javanature</nature> <nature>org.eclipse.jdt.core.javanature</nature>
</natures> </natures>
</projectDescription> </projectDescription>
de.be4.eventb.structparser/EventBParser.sablecc
+ 19
− 9
View file @ 90d26251
...@@ -251,7 +251,10 @@ parameter {-> parameter} =[name]:identifier_literal [comment]:comment* {-> New ...@@ -251,7 +251,10 @@ parameter {-> parameter} =[name]:identifier_literal [comment]:comment* {-> New
event_where {-> guard*} = where [first]:guard [rest]:event_where_tail* {-> [first.guard, rest.guard]}; event_where {-> guard*} = where [first]:guard [rest]:event_where_tail* {-> [first.guard, rest.guard]};
event_where_tail {-> guard} = [guard]:guard {-> guard.guard}; event_where_tail {-> guard} = [guard]:guard {-> guard.guard};
guard {-> guard} = [label]:P.label [predicate]:formula [comment]:comment* {-> New guard([comment], label.label, predicate)}; guard {-> guard} =
[label]:P.label [predicate]:formula [comment]:comment* {-> New guard([comment], label.label, predicate)} |
{derived} theorem [label]:P.label [predicate]:formula [comment]:comment* {-> New guard.derived([comment], label.label, predicate)};
event_with {-> witness*} = with [first]:witness [rest]:event_with_tail* {-> [first.witness, rest.witness]}; event_with {-> witness*} = with [first]:witness [rest]:event_with_tail* {-> [first.witness, rest.witness]};
event_with_tail {-> witness} = [witness]:witness {-> witness.witness}; event_with_tail {-> witness} = [witness]:witness {-> witness.witness};
...@@ -265,15 +268,18 @@ action {-> action} = [label]:P.label [action]:formula [comment]:comment* {-> New ...@@ -265,15 +268,18 @@ action {-> action} = [label]:P.label [action]:formula [comment]:comment* {-> New
/* /*
Structure of a context file Structure of a context file
*/ */
context {-> parse_unit} = context {-> parse_unit} =
T.context [name]:identifier_literal T.context [name]:identifier_literal
[comment]:comment* [comment]:comment*
[extends]:extends_clause? [extends]:extends_clause?
[constants]:constants_clause?
[sets]:sets_clause? [sets]:sets_clause?
[constants]:constants_clause?
[axioms]:axioms_clause? [axioms]:axioms_clause?
end {-> New parse_unit.context([comment], name, [extends.identifier_literal], [sets.carrier_set], [constants.constant], [axioms.axiom])} ; end {-> New parse_unit.context([comment], name, [extends.identifier_literal], [sets.carrier_set], [constants.constant], [axioms.axiom])} ;
extends_clause {-> identifier_literal*} = T.extends [first]:identifier_literal [rest]:extends_clause_tail* {-> [first, rest.identifier_literal]} ; extends_clause {-> identifier_literal*} = T.extends [first]:identifier_literal [rest]:extends_clause_tail* {-> [first, rest.identifier_literal]} ;
extends_clause_tail {-> identifier_literal} = [name]:identifier_literal {-> name}; extends_clause_tail {-> identifier_literal} = [name]:identifier_literal {-> name};
...@@ -348,6 +354,10 @@ event_refinement = ...@@ -348,6 +354,10 @@ event_refinement =
{extended} [name]:identifier_literal ; {extended} [name]:identifier_literal ;
parameter = [comments]:comment* [name]:identifier_literal; parameter = [comments]:comment* [name]:identifier_literal;
guard = [comments]:comment* [name]:label [predicate]:formula ;
guard =
[comments]:comment* [name]:label [predicate]:formula |
{derived} [comments]:comment* [name]:label [predicate]:formula;
witness = [comments]:comment* [name]:label [predicate]:formula ; witness = [comments]:comment* [name]:label [predicate]:formula ;
action = [comments]:comment* [name]:label [action]:formula ; action = [comments]:comment* [name]:label [action]:formula ;
de.be4.eventb.structparser/customBuild.xml
+ 17
− 27
View file @ 90d26251
...@@ -13,13 +13,9 @@ ...@@ -13,13 +13,9 @@
<property name="dir.release" location="release"/> <property name="dir.release" location="release"/>
<property name="file.release.jar" location="${dir.release}\EventBParser.jar" /> <property name="file.release.jar" location="${dir.release}\EventBParser.jar" />
<property name="file.parseraspects.jar" location="lib/ParserAspects.jar" />
<property name="file.aspectjrt.jar" location="lib/aspectjrt.jar" />
<taskdef name="sablecc" classname="org.sablecc.ant.taskdef.Sablecc" classpath="lib/ext/sablecc-anttask.jar" /> <taskdef name="sablecc" classname="org.sablecc.ant.taskdef.Sablecc" classpath="lib/ext/sablecc-anttask.jar" />
<taskdef resource="org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties" classpath="lib/ext/aspectjtools.jar" />
<target name="init"> <target name="init">
<mkdir dir="${dir.temp.classes}" /> <mkdir dir="${dir.temp.classes}" />
<mkdir dir="${dir.temp.src}" /> <mkdir dir="${dir.temp.src}" />
...@@ -45,26 +41,22 @@ ...@@ -45,26 +41,22 @@
</target> </target>
<target name="compile" depends="init,sablecc-parser" description=""> <target name="compile" depends="init,sablecc-parser" description="">
<iajc <copy todir="${dir.temp.src}">
fork="true" <fileset dir="src"/>
destdir="${dir.temp.classes}" <fileset dir="src_generated"/>
source="1.5" </copy>
sourceRootCopyFilter="**/*.java,**/.svn/*"
inpathDirCopyFilter="**/*.java,**/.svn/*" > <javac srcdir="${dir.temp.src}" destdir="${dir.temp.classes}" includeAntRuntime="false" target="1.5" source="1.5"/>
<sourceroots>
<pathelement location="src_generated"/> <copy file="src_generated/de/be4/eventb/core/parser/lexer/lexer.dat" todir="${dir.temp.classes}/de/be4/eventb/core/parser/lexer" />
<pathelement location="src"/> <copy file="src_generated/de/be4/eventb/core/parser/parser/parser.dat" todir="${dir.temp.classes}/de/be4/eventb/core/parser/parser" />
</sourceroots>
<inpath>
<pathelement location="${file.parseraspects.jar}" />
</inpath>
<classpath>
<pathelement location="${file.aspectjrt.jar}" />
</classpath>
</iajc>
</target> </target>
<target name="jar" depends="init,compile" description=""> <target name="jar" depends="init,compile" description="">
<tstamp>
<format property="TODAY" pattern="yyyy-MM-dd HH:mm:ss" />
</tstamp>
<jar basedir="${dir.temp.classes}" destfile="${file.release.jar}" > <jar basedir="${dir.temp.classes}" destfile="${file.release.jar}" >
<manifest> <manifest>
<attribute name="Built-By" value="${user.name}"/> <attribute name="Built-By" value="${user.name}"/>
...@@ -72,12 +64,10 @@ ...@@ -72,12 +64,10 @@
<attribute name="Main-Class" value="de.be4.eventb.core.parser.EventBParser"/> <attribute name="Main-Class" value="de.be4.eventb.core.parser.EventBParser"/>
</manifest> </manifest>
</jar> </jar>
<delete dir="${dir.temp.classes}" /> <delete dir="${dir.temp.classes}" />
</target> </target>
<target name="dist" depends="jar" > <target name="dist" depends="jar" >
<copy file="${file.aspectjrt.jar}" todir="${dir.release}" />
<delete dir="${dir.temp}" /> <delete dir="${dir.temp}" />
</target> </target>
......
de.be4.eventb.structparser/src/de/be4/eventb/core/parser/EventBLexer.java
+ 3
− 3
View file @ 90d26251
...@@ -36,8 +36,8 @@ public class EventBLexer extends Lexer { ...@@ -36,8 +36,8 @@ public class EventBLexer extends Lexer {
"The variant is only allowed after invariants and before events", "The variant is only allowed after invariants and before events",
"The events clause is only allowed at the end", "The events clause is only allowed at the end",
"'context' is only allowed at the beginning of a file", "'context' is only allowed at the beginning of a file",
"Constant declarations are only allowed before the set declarations", "Set declarations are only allowed before the constants declarations",
"Set declarations are only allowed allowed after constants and before axioms", "Constants declarations are only allowed after sets and before axioms",
"The axioms clause is only allowed at the end" }; "The axioms clause is only allowed at the end" };
private static List<String> clausesOrder = new LinkedList<String>(); private static List<String> clausesOrder = new LinkedList<String>();
private int lastClauseIndex; private int lastClauseIndex;
...@@ -58,8 +58,8 @@ public class EventBLexer extends Lexer { ...@@ -58,8 +58,8 @@ public class EventBLexer extends Lexer {
clausesOrder.add("TVariant"); clausesOrder.add("TVariant");
clausesOrder.add("TEvents"); clausesOrder.add("TEvents");
clausesOrder.add("TContext"); clausesOrder.add("TContext");
clausesOrder.add("TConstants");
clausesOrder.add("TSets"); clausesOrder.add("TSets");
clausesOrder.add("TConstants");
clausesOrder.add("TAxioms"); clausesOrder.add("TAxioms");
eventClausesOrder.add("TAny"); eventClausesOrder.add("TAny");
eventClausesOrder.add("TWhere"); eventClausesOrder.add("TWhere");
......
de.be4.eventb.structparser/src/de/be4/eventb/core/parser/EventBParser.java
+ 0
− 3
View file @ 90d26251
...@@ -10,8 +10,6 @@ import java.io.StringReader; ...@@ -10,8 +10,6 @@ import java.io.StringReader;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.sun.org.apache.xerces.internal.impl.xpath.regex.ParseException;
import de.be4.eventb.core.parser.analysis.ASTDisplay; import de.be4.eventb.core.parser.analysis.ASTDisplay;
import de.be4.eventb.core.parser.analysis.ASTPrinter; import de.be4.eventb.core.parser.analysis.ASTPrinter;
import de.be4.eventb.core.parser.lexer.LexerException; import de.be4.eventb.core.parser.lexer.LexerException;
...@@ -166,7 +164,6 @@ public class EventBParser { ...@@ -166,7 +164,6 @@ public class EventBParser {
* </ul> * </ul>
* </p> * </p>
*/ */
@SuppressWarnings("unchecked")
public Start parse(final String input, final boolean debugOutput) public Start parse(final String input, final boolean debugOutput)
throws BException { throws BException {
final Reader reader = new StringReader(input); final Reader reader = new StringReader(input);
......
de.be4.eventb.structparser/src/de/be4/eventb/core/parser/lexer/LexerAspect.aj deleted 100644 → 0
+ 0
− 24
View file @ 60237533
package de.be4.eventb.core.parser.lexer;
import de.be4.eventb.core.parser.EventBLexerException;
import de.be4.eventb.core.parser.node.Token;
import de.be4.eventb.core.parser.node.TComment;
public privileged aspect LexerAspect pertarget(peek(Lexer)) {
pointcut peek(Lexer lexer) : execution(Token peek()) && target(lexer);
after(Lexer lexer) throwing(LexerException e) throws LexerException : peek(lexer) {
// if exception is already converted just throw it
if (e instanceof EventBLexerException){
throw e;
}
// otherwise convert exception to contain last position and text
final int line = lexer.line;
final int pos = lexer.pos;
final StringBuffer text = lexer.text;
throw new EventBLexerException(lexer.token, e.getMessage(), text.toString(), line, pos);
}
}
org.eventb.texttools.test/.classpath → org.eventb.texteditor.feature/.classpath
+ 5
− 0
View file @ 90d26251
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" exported="true"/>
</classpath> </classpath>
org.eventb.texteditor.feature/.project
+ 12
− 8
View file @ 90d26251
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>org.eventb.texteditor.feature</name> <name>org.eventb.texteditor.feature</name>
<comment></comment> <comment/>
<projects> <projects/>
</projects> <natures>
<nature>org.eclipse.pde.FeatureNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<buildSpec> <buildSpec>
<buildCommand> <buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name> <name>org.eclipse.pde.FeatureBuilder</name>
<arguments> <arguments/>
</arguments> </buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments/>
</buildCommand> </buildCommand>
</buildSpec> </buildSpec>
<natures> <linkedResources/>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription> </projectDescription>
org.eventb.texttools.test/.settings/org.eclipse.jdt.core.prefs → org.eventb.texteditor.feature/.settings/org.eclipse.jdt.core.prefs
+ 10
− 9
View file @ 90d26251
#Mon May 11 11:59:07 CEST 2009 #
eclipse.preferences.version=1 #Wed Jun 25 10:22:53 CEST 2014
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eventb.texteditor.feature/camille.target
+ 5
− 5
View file @ 90d26251
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="prob_target" sequenceNumber="34"> <?pde version="3.8"?><target name="prob_target" sequenceNumber="36">
<locations> <locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.rodinp.platform.sources.feature.group" version="3.0.0.201403141545-e3d282b"/> <unit id="org.rodinp.platform.sources.feature.group" version="3.0.0.201403141545-e3d282b"/>
<unit id="org.eventb.ide.feature.group" version="3.0.0.201403141545-e3d282b"/> <unit id="org.eventb.ide.feature.group" version="3.0.0.201403141545-e3d282b"/>
<unit id="org.rodinp.platform.tests.feature.group" version="3.0.0.201403141545-e3d282b"/> <unit id="org.rodinp.platform.tests.feature.group" version="3.0.0.201403141545-e3d282b"/>
...@@ -11,15 +11,15 @@ ...@@ -11,15 +11,15 @@
<unit id="org.eclipse.ui.workbench" version="0.0.0"/> <unit id="org.eclipse.ui.workbench" version="0.0.0"/>
<repository location="http://www.stups.uni-duesseldorf.de/ProB/buildlibs/rodin/"/> <repository location="http://www.stups.uni-duesseldorf.de/ProB/buildlibs/rodin/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.gef.feature.group" version="3.9.1.201308190730"/> <unit id="org.eclipse.gef.feature.group" version="3.9.1.201308190730"/>
<repository location="http://download.eclipse.org/tools/gef/updates/releases"/> <repository location="http://download.eclipse.org/tools/gef/updates/releases"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eventb.emf.feature.feature.group" version="4.1.0"/> <unit id="org.eventb.emf.feature.feature.group" version="4.1.0"/>
<repository location="http://rodin-b-sharp.sourceforge.net/updates/"/> <repository location="http://rodin-b-sharp.sourceforge.net/updates/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="2.8.3.v20130125-0826"/> <unit id="org.eclipse.emf.sdk.feature.group" version="2.8.3.v20130125-0826"/>
<unit id="org.eclipse.emf.compare.sdk.feature.group" version="1.3.3.v20130213-0806"/> <unit id="org.eclipse.emf.compare.sdk.feature.group" version="1.3.3.v20130213-0806"/>
<repository location="http://download.eclipse.org/releases/juno"/> <repository location="http://download.eclipse.org/releases/juno"/>
......
org.eventb.texteditor.feature/category.xml 0 → 100644
+ 7
− 0
View file @ 90d26251
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/org.eventb.texteditor.feature_2.2.0.jar" id="org.eventb.texteditor.feature" version="2.2.0">
<category name="camille"/>
</feature>
<category-def name="camille" label="camille"/>
</site>
org.eventb.texteditor.feature/feature.xml
+ 9
− 7
View file @ 90d26251
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<feature <feature
id="org.eventb.texteditor.feature" id="org.eventb.texteditor.feature"
label="Camille TextEditor" label="Camille TextEditor"
version="3.0.0.qualifier" version="3.0.1.qualifier"
provider-name="Heinrich-Heine University Dusseldorf" provider-name="Heinrich-Heine University Dusseldorf"
plugin="org.eventb.texteditor.ui"> plugin="org.eventb.texteditor.ui">
...@@ -10,9 +10,11 @@ ...@@ -10,9 +10,11 @@
A text editor for the Rodin platform to edit Event-B models A text editor for the Rodin platform to edit Event-B models
----------------------------------------------------------- -----------------------------------------------------------
Release History: Release History:
3.0.0 - Adapted Camille to Rodin 3.x 3.0.1 - Added patches from 2.2.0 to the Rodin Release
3.0.0 - Rodin 3.0 Release
2.2.0 - Theorem in guards. Order of sets and constants changed to be consistent with the Rodin editor.
2.1.4 - Be more generous regarding Rodin compatibility 2.1.4 - Be more generous regarding Rodin compatibility
2.1.3 - Bigfix release for Bug #3305107 (NPE after renaming a 2.1.3 - Bugfix release for Bug #3305107 (NPE after renaming a
machine) machine)
2.1.0.beta - Rodin 2.1.1 release compatible with EventB-EMF Framework 2.1.0.beta - Rodin 2.1.1 release compatible with EventB-EMF Framework
3.3.0 3.3.0
...@@ -32,7 +34,7 @@ EventB-EMF-plugin v3.1.0 ...@@ -32,7 +34,7 @@ EventB-EMF-plugin v3.1.0
</description> </description>
<copyright> <copyright>
Copyright (c) 2009 Heinrich-Heine University Dusseldorf. Copyright (c) 2009-2012 Heinrich-Heine University Dusseldorf.
All rights reserved. All rights reserved.
</copyright> </copyright>
...@@ -182,14 +184,14 @@ Inc. in the United States, other countries, or both. ...@@ -182,14 +184,14 @@ Inc. in the United States, other countries, or both.
id="org.eventb.texteditor.ui" id="org.eventb.texteditor.ui"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="3.0.1.qualifier"
unpack="false"/> unpack="false"/>
<plugin <plugin
id="org.eventb.texttools" id="org.eventb.texttools"
download-size="0" download-size="0"
install-size="0" install-size="0"
version="0.0.0" version="3.0.1.qualifier"
unpack="false"/> unpack="false"/>
</feature> </feature>
org.eventb.texteditor.feature/pom.xml 0 → 100644
+ 16
− 0
View file @ 90d26251
<?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>
<groupId>org.eventb.texteditor</groupId>
<artifactId>org.eventb.texteditor.parent</artifactId>
<version>1.0.0.qualifier</version>
<relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
</parent>
<groupId>org.eventb.texteditor</groupId>
<artifactId>org.eventb.texteditor.feature</artifactId>
<version>3.0.1.qualifier</version>
<packaging>eclipse-feature</packaging>
</project>
org.eventb.texteditor.parent/pom.xml 0 → 100644
+ 90
− 0
View file @ 90d26251
<?xml version="1.0" encoding="UTF-8"?>
<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>
<groupId>org.eventb.texteditor</groupId>
<artifactId>org.eventb.texteditor.parent</artifactId>
<version>1.0.0.qualifier</version>
<packaging>pom</packaging>
<!-- this is the parent POM from which all modules inherit common settings -->
<properties>
<tycho-version>0.14.1</tycho-version>
</properties>
<repositories>
<repository>
<id>stups.cobra</id>
<url>http://cobra.cs.uni-duesseldorf.de/artifactory/repo/</url>
</repository>
<!-- configure p2 repository to resolve against -->
<repository>
<id>targetRepository0</id>
<layout>p2</layout>
<url>http://www.stups.uni-duesseldorf.de/ProB/buildlibs/rodin/</url>
</repository>
<repository>
<id>targetRepository1</id>
<layout>p2</layout>
<url>http://download.eclipse.org/releases/juno/</url>
</repository>
<repository>
<id>targetRepository2</id>
<layout>p2</layout>
<url>http://rodin-b-sharp.sourceforge.net/updates</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>
<!-- enable tycho build extension -->
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-maven-plugin</artifactId>
<version>0.14.1</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-compiler-plugin</artifactId>
<version>0.14.1</version>
<configuration>
<encoding>UTF-8</encoding>
<source>1.6</source>
<target>1.6</target>
<extraClasspathElements>
<extraClasspathElement>
<groupId>javafx</groupId>
<artifactId>javafx.mvn</artifactId>
<version>2.2.0-SNAPSHOT</version>
</extraClasspathElement>
</extraClasspathElements>
</configuration>
</plugin>
</plugins>
</build>
<!-- the modules that should be built together -->
<modules>
<module>../org.eventb.texteditor.feature</module>
<module>../org.eventb.texteditor.ui</module>
<module>../org.eventb.texttools</module>
<module>../org.eventb.texteditor.repository</module>
</modules>
</project>
\ No newline at end of file
org.eventb.texteditor.repository/category.xml 0 → 100644
+ 15
− 0
View file @ 90d26251
<?xml version="1.0" encoding="UTF-8"?>
<site>
<feature url="features/org.eventb.texteditor.feature_3.0.1.qualifier.jar" id="org.eventb.texteditor.feature" version="3.0.1.qualifier">
<category name="org.eventb.texteditor.feature.category"/>
</feature>
<category-def name="org.eventb.texteditor.feature.category" label="Camille Text Editor">
<description>
Camille Text Editor
</description>
</category-def>
</site>
org.eventb.texteditor.repository/pom.xml 0 → 100644
+ 18
− 0
View file @ 90d26251
<?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>
<groupId>org.eventb.texteditor</groupId>
<artifactId>org.eventb.texteditor.parent</artifactId>
<version>1.0.0.qualifier</version>
<relativePath>../org.eventb.texteditor.parent/pom.xml</relativePath>
</parent>
<groupId>org.eventb.texteditor</groupId>
<artifactId>org.eventb.texteditor.repository</artifactId>
<version>1.0.0.qualifier</version>
<packaging>eclipse-repository</packaging>
</project>
org.eventb.texteditor.ui/.classpath
+ 1
− 1
View file @ 90d26251
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/commons-lang-2.4.jar"/> <classpathentry kind="lib" path="lib/commons-lang-2.4.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>
org.eventb.texteditor.ui/.project
+ 12
− 16
View file @ 90d26251
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>org.eventb.texteditor.ui</name> <name>org.eventb.texteditor.ui</name>
<comment></comment> <comment/>
<projects> <projects/>
</projects> <natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
<buildSpec> <buildSpec>
<buildCommand> <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name> <name>org.eclipse.jdt.core.javabuilder</name>
<arguments> <arguments/>
</arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name> <name>org.eclipse.pde.ManifestBuilder</name>
<arguments> <arguments/>
</arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name> <name>org.eclipse.pde.SchemaBuilder</name>
<arguments> <arguments/>
</arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name> <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
<arguments> <arguments/>
</arguments>
</buildCommand> </buildCommand>
</buildSpec> </buildSpec>
<natures> <linkedResources/>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription> </projectDescription>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment