diff --git a/de.prob.core/.classpath b/de.prob.core/.classpath index c319dca4761fa663a8cd1b73208bd68d56a6844c..9b292107a7a905968274c717bb253ca02e3913f2 100644 --- a/de.prob.core/.classpath +++ b/de.prob.core/.classpath @@ -1,11 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry exported="true" kind="lib" path="lib/commons-lang-2.4.jar"/> + <classpathentry exported="true" kind="lib" path="lib/dependencies/answerparser-2.4.8-SNAPSHOT.jar"/> + <classpathentry exported="true" kind="lib" path="lib/dependencies/bparser-2.4.8-SNAPSHOT.jar"/> + <classpathentry exported="true" kind="lib" path="lib/dependencies/cliparser-2.4.8-SNAPSHOT.jar"/> + <classpathentry exported="true" kind="lib" path="lib/dependencies/commons-lang-2.6.jar"/> + <classpathentry exported="true" kind="lib" path="lib/dependencies/jgrapht-0.8.3.jar"/> + <classpathentry exported="true" kind="lib" path="lib/dependencies/jsr305-1.3.9.jar"/> + <classpathentry exported="true" kind="lib" path="lib/dependencies/ltlparser-2.4.8-SNAPSHOT.jar"/> + <classpathentry exported="true" kind="lib" path="lib/dependencies/parserbase-2.4.8-SNAPSHOT.jar"/> + <classpathentry exported="true" kind="lib" path="lib/dependencies/prologlib-2.4.8-SNAPSHOT.jar"/> + <classpathentry exported="true" kind="lib" path="lib/dependencies/unicode-2.4.8-SNAPSHOT.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="test"/> - <classpathentry exported="true" kind="lib" path="lib/probcliparser.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/de.prob.core/META-INF/MANIFEST.MF b/de.prob.core/META-INF/MANIFEST.MF index 1e474117982e929dc3778e9624e9e6fa3ba450e5..a3a1169a80237207acc64dbbee300b2f31578696 100644 --- a/de.prob.core/META-INF/MANIFEST.MF +++ b/de.prob.core/META-INF/MANIFEST.MF @@ -5,62 +5,101 @@ Bundle-SymbolicName: de.prob.core;singleton:=true Bundle-Version: 9.2.1.qualifier Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.rodinp.core;bundle-version="[1.3.1,1.6.0)", - org.eventb.core;bundle-version="[2.1.0,2.6.0)" + org.eventb.core;bundle-version="[2.1.0,2.6.0)", + org.eventb.emf.core;bundle-version="2.2.4", + org.eventb.emf.persistence;bundle-version="2.4.0" Bundle-ActivationPolicy: lazy Eclipse-BundleShape: dir Bundle-Vendor: HHU Düsseldorf STUPS Group Export-Package: de.be4.classicalb.core.parser, - de.be4.classicalb.core.parser.analysis;x-friends:="de.prob.eventb.disprover.core", - de.be4.classicalb.core.parser.analysis.prolog;x-friends:="de.prob.eventb.disprover.core", + de.be4.classicalb.core.parser.analysis, + de.be4.classicalb.core.parser.analysis.checking, + de.be4.classicalb.core.parser.analysis.pragma, + de.be4.classicalb.core.parser.analysis.pragma.internal, + de.be4.classicalb.core.parser.analysis.prolog, + de.be4.classicalb.core.parser.analysis.transforming, de.be4.classicalb.core.parser.exceptions, - de.be4.classicalb.core.parser.node;x-friends:="de.prob.eventb.disprover.core", + de.be4.classicalb.core.parser.lexer, + de.be4.classicalb.core.parser.node, + de.be4.classicalb.core.parser.parser, + de.be4.classicalb.core.pragma.analysis, + de.be4.classicalb.core.pragma.lexer, + de.be4.classicalb.core.pragma.node, + de.be4.classicalb.core.preparser.analysis, + de.be4.classicalb.core.preparser.lexer, + de.be4.classicalb.core.preparser.node, + de.be4.classicalb.core.preparser.parser, + de.be4.ltl.core.ctlparser.analysis, + de.be4.ltl.core.ctlparser.lexer, + de.be4.ltl.core.ctlparser.node, + de.be4.ltl.core.ctlparser.parser, de.be4.ltl.core.parser, - de.prob.core; - uses:="de.prob.core.domainobjects.eval, - de.prob.parserbase, - org.osgi.service.prefs, - de.prob.core.domainobjects, - de.prob.core.command, - de.prob.exceptions", - de.prob.core.command; - uses:="de.prob.core.domainobjects.eval, - de.prob.core, - org.osgi.service.prefs, - de.prob.core.domainobjects, - de.prob.exceptions, - de.prob.prolog.term, - de.prob.prolog.output", - de.prob.core.domainobjects;uses:="de.prob.core,de.prob.core.command,de.prob.prolog.term", - de.prob.core.domainobjects.eval;uses:="de.prob.core,de.be4.classicalb.core.parser.node,org.eventb.core.ast", + de.be4.ltl.core.parser.analysis, + de.be4.ltl.core.parser.internal, + de.be4.ltl.core.parser.lexer, + de.be4.ltl.core.parser.node, + de.be4.ltl.core.parser.parser, + de.hhu.stups.sablecc.patch, + de.prob.cli, + de.prob.cli.clipatterns, + de.prob.cliparser, + de.prob.core, + de.prob.core.command, + de.prob.core.command.internal, + de.prob.core.domainobjects, + de.prob.core.domainobjects.eval, de.prob.core.domainobjects.ltl, - de.prob.core.prolog;uses:="de.prob.core.types,de.prob.prolog.term", - de.prob.core.translator;uses:="de.prob.exceptions", + de.prob.core.domainobjects.ltl.unittests, + de.prob.core.internal, + de.prob.core.langdep, + de.prob.core.prolog, + de.prob.core.sablecc.analysis, + de.prob.core.sablecc.lexer, + de.prob.core.sablecc.node, + de.prob.core.sablecc.parser, + de.prob.core.translator, de.prob.core.types, - de.prob.eventb.translator; - uses:="de.be4.classicalb.core.parser.node, - de.prob.eventb.translator.internal, - org.eventb.core.ast, - org.eventb.core, - de.prob.prolog.output", + de.prob.eventb.translator, + de.prob.eventb.translator.flow, + de.prob.eventb.translator.internal, + de.prob.eventb.translator2, de.prob.exceptions, - de.prob.logging;uses:="org.eclipse.core.runtime", + de.prob.logging, de.prob.parser, - de.prob.parserbase;x-friends:="de.prob.ui", - de.prob.prolog.output;x-friends:="de.prob.eventb.disprover.core,de.prob.ui,de.prob.dmc.modelcheck", - de.prob.prolog.term;x-friends:="de.prob.ui,de.prob.dmc.modelcheck", + de.prob.parserbase, + de.prob.prolog.match, + de.prob.prolog.output, + de.prob.prolog.term, de.prob.sap.commands, de.prob.sap.exceptions, + de.prob.sap.util, + de.prob.unicode, + de.prob.unicode.analysis, + de.prob.unicode.lexer, + de.prob.unicode.node, + javax.annotation, + javax.annotation.concurrent, + javax.annotation.meta, org.apache.commons.lang, org.apache.commons.lang.builder, org.apache.commons.lang.enums, org.apache.commons.lang.exception, org.apache.commons.lang.math, org.apache.commons.lang.mutable, + org.apache.commons.lang.reflect, org.apache.commons.lang.text, org.apache.commons.lang.time Bundle-Activator: de.prob.core.internal.Activator Eclipse-BuddyPolicy: registered Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: ., - lib/probcliparser.jar, - lib/dependencies/commons-lang-2.4.jar + lib/dependencies/answerparser-2.4.8-SNAPSHOT.jar, + lib/dependencies/bparser-2.4.8-SNAPSHOT.jar, + lib/dependencies/cliparser-2.4.8-SNAPSHOT.jar, + lib/dependencies/commons-lang-2.6.jar, + lib/dependencies/jgrapht-0.8.3.jar, + lib/dependencies/jsr305-1.3.9.jar, + lib/dependencies/ltlparser-2.4.8-SNAPSHOT.jar, + lib/dependencies/parserbase-2.4.8-SNAPSHOT.jar, + lib/dependencies/prologlib-2.4.8-SNAPSHOT.jar, + lib/dependencies/unicode-2.4.8-SNAPSHOT.jar diff --git a/de.prob.core/build.gradle b/de.prob.core/build.gradle index a1138ade9f85e2045749254ae0a2c96f51986689..0060cb63a4b4e9bbe1f29423d733d0a2427b4672 100644 --- a/de.prob.core/build.gradle +++ b/de.prob.core/build.gradle @@ -20,4 +20,5 @@ dependencies { compile group: "de.prob", name: "unicode", version: parser_version , changing: true compile 'jgrapht:jgrapht:0.8.3' compile 'commons-lang:commons-lang:2.6' + compile 'commons-codec:commons-codec:1.6' } \ No newline at end of file diff --git a/de.prob.core/build.properties b/de.prob.core/build.properties index 6e7126dbc60ac1ab2d2ecb330257bceda799b2d2..e6c247370fcec6bdd5a804d721b2a3627d8c4f25 100644 --- a/de.prob.core/build.properties +++ b/de.prob.core/build.properties @@ -3,7 +3,16 @@ output.. = bin/ bin.includes = META-INF/,\ plugin.xml,\ .,\ - lib/probcliparser.jar,\ - lib/dependencies/commons-lang-2.4.jar,\ - prob/ + prob/,\ + lib/dependencies,\ + lib/dependencies/answerparser-2.4.8-SNAPSHOT.jar,\ + lib/dependencies/bparser-2.4.8-SNAPSHOT.jar,\ + lib/dependencies/cliparser-2.4.8-SNAPSHOT.jar,\ + lib/dependencies/commons-lang-2.6.jar,\ + lib/dependencies/jgrapht-0.8.3.jar,\ + lib/dependencies/jsr305-1.3.9.jar,\ + lib/dependencies/ltlparser-2.4.8-SNAPSHOT.jar,\ + lib/dependencies/parserbase-2.4.8-SNAPSHOT.jar,\ + lib/dependencies/prologlib-2.4.8-SNAPSHOT.jar,\ + lib/dependencies/unicode-2.4.8-SNAPSHOT.jar diff --git a/de.prob.core/lib/probcliparser.jar b/de.prob.core/lib/probcliparser.jar deleted file mode 100644 index 1aec87c3ce6b21597b3cd57b2c753ceb8665a5e2..0000000000000000000000000000000000000000 Binary files a/de.prob.core/lib/probcliparser.jar and /dev/null differ diff --git a/de.prob.core/prob_target.target b/de.prob.core/prob_target.target index 8ff926ff5f4107bbf6fa23f467bdad95433bce9d..ca09102f4cfa71d2e0890c1c81d8c16e77d027d3 100644 --- a/de.prob.core/prob_target.target +++ b/de.prob.core/prob_target.target @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <?pde version="3.6"?> -<target name="prob_target" sequenceNumber="15"> +<target name="prob_target" sequenceNumber="18"> <locations> <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit"> <unit id="org.eclipse.equinox.p2.extras.feature.feature.group" version="1.0.1.v20110906-1605-7A4FD4DiVOMap8cHSc6vPuny4gqO"/> @@ -13,12 +13,12 @@ <unit id="org.eclipse.equinox.p2.core.feature.feature.group" version="1.0.1.v20110906-1605-8290FZ9FVKHVRKtmx3fpNuo02129"/> <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.1.2.R37x_v20110815-1155-6-Bk8pYWZz0qUTX5I15GZWwbXkrl"/> <unit id="org.eclipse.equinox.p2.rcp.feature.feature.group" version="1.0.1.v20110906-1605-782EqBqNKGVkiV-PUsgz-uny4gqO"/> -<unit id="org.eventb.ide.feature.group" version="2.5.0.r14568"/> -<unit id="fr.systerel.editor.feature.group" version="0.6.2.r14568"/> -<unit id="org.rodinp.feature.group" version="1.6.0.r14568"/> -<unit id="org.rodinp.platform.product" version="2.5.0.r14568"/> -<unit id="org.rodinp.platform.feature.group" version="2.5.0.r14568"/> -<unit id="org.rodinp.platform.product.root.feature.feature.group" version="2.5.0.r14568"/> +<unit id="org.eventb.ide.feature.group" version="2.5.0.r14636"/> +<unit id="fr.systerel.editor.feature.group" version="0.6.2.r14636"/> +<unit id="org.rodinp.feature.group" version="1.6.0.r14636"/> +<unit id="org.rodinp.platform.product" version="2.5.0.r14636"/> +<unit id="org.rodinp.platform.feature.group" version="2.5.0.r14636"/> +<unit id="org.rodinp.platform.product.root.feature.feature.group" version="2.5.0.r14636"/> <repository location="http://rodin-b-sharp.sourceforge.net/core-updates"/> </location> <location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit"> @@ -26,5 +26,10 @@ <unit id="org.eclipse.gef.sdk.feature.group" version="3.7.2.v20110927-2020-7G7W77A5WNgIRPdWXDIbNTSQPdQL"/> <repository location="http://download.eclipse.org/releases/indigo/"/> </location> +<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit"> +<unit id="ac.soton.eventb.emf.core.extension.feature.feature.group" version="1.3.0.201206030057"/> +<unit id="org.eventb.emf.feature.feature.group" version="3.7.0.201204300914"/> +<repository location="http://rodin-b-sharp.sourceforge.net/updates"/> +</location> </locations> </target> diff --git a/de.prob.releng/build.gradle b/de.prob.releng/build.gradle index 19d3cb85d13dc7a7d2c46d71dd8260786588ff99..4306a7cac3ea036a440ab575113f650dc69e6dac 100644 --- a/de.prob.releng/build.gradle +++ b/de.prob.releng/build.gradle @@ -5,17 +5,45 @@ apply from: 'tycho_build.gradle' // Local tasks + project(':de.prob.core') { repositories { - mavenCentral() + maven { + name "cobra" + url "http://cobra.cs.uni-duesseldorf.de/artifactory/repo" + } } + + + def parser_version = '2.4.8-SNAPSHOT' + dependencies { - compile group: 'commons-lang', name: 'commons-lang', version: '2.4' - } + compile group: "de.prob", name: "answerparser", version: parser_version , changing: true + compile group: "de.prob", name: "bparser", version: parser_version , changing: true + compile group: "de.prob", name: "cliparser", version: parser_version , changing: true + compile group: "de.prob", name: "ltlparser", version: parser_version , changing: true + compile group: "de.prob", name: "parserbase", version: parser_version , changing: true + compile group: "de.prob", name: "prologlib", version: parser_version , changing: true + compile group: "de.prob", name: "unicode", version: parser_version , changing: true + compile 'jgrapht:jgrapht:0.8.3' + compile 'commons-lang:commons-lang:2.6' + } } +project(':de.prob.ui') { + repositories { + maven { + name "cobra" + url "http://cobra.cs.uni-duesseldorf.de/artifactory/repo" + } + } + dependencies { + compile 'commons-codec:commons-codec:1.6' + } +} + def download(address,target) { def file = new FileOutputStream(target) diff --git a/de.prob.ui/.classpath b/de.prob.ui/.classpath index 88ce79dcd66db4de0f421cd37cdc52dd427558ac..f67843181ee95a7771d0edd1009be1faaed415b0 100644 --- a/de.prob.ui/.classpath +++ b/de.prob.ui/.classpath @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> + <classpathentry exported="true" kind="lib" path="lib/dependencies/commons-codec-1.6.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> diff --git a/de.prob.ui/META-INF/MANIFEST.MF b/de.prob.ui/META-INF/MANIFEST.MF index 1118ed6d0fa832ec59dd9891220081deb071a964..8db09df333bc9c3df8e5ba9de724c62745a5ed65 100644 --- a/de.prob.ui/META-INF/MANIFEST.MF +++ b/de.prob.ui/META-INF/MANIFEST.MF @@ -10,7 +10,9 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", de.prob.core;bundle-version="[9.2.0,9.3.0)", org.eventb.core;bundle-version="[2.1.0,2.6.0)", org.eclipse.core.expressions;bundle-version="[3.4.101,4.0.0)", - org.eclipse.gef;bundle-version="[3.5.0,4.0.0)" + org.eclipse.gef;bundle-version="[3.5.0,4.0.0)", + org.eventb.emf.core;bundle-version="2.2.4", + org.eventb.emf.persistence;bundle-version="2.4.0" Bundle-ActivationPolicy: lazy Bundle-Vendor: HHU Düsseldorf STUPS Group Bundle-Activator: de.prob.ui.ProbUiPlugin @@ -18,4 +20,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: de.prob.ui Bundle-ClassPath: lib/apache_xmlrpc.jar, lib/ws_commons.jar, + lib/dependencies/commons-codec-1.6.jar, . diff --git a/de.prob.ui/build.properties b/de.prob.ui/build.properties index 7bb2e5aa6d67c9fa9f937b447952842643f8bb36..ebde6b8f79bbb0cfd7a64cb582dcfc2a31e04089 100644 --- a/de.prob.ui/build.properties +++ b/de.prob.ui/build.properties @@ -5,4 +5,5 @@ bin.includes = META-INF/,\ plugin.xml,\ icons/,\ lib/apache_xmlrpc.jar,\ - lib/ws_commons.jar + lib/ws_commons.jar,\ + lib/dependencies/commons-codec-1.6.jar diff --git a/de.prob.ui/plugin.xml b/de.prob.ui/plugin.xml index 91ee271179f5e8dba583c19f9751e11939ae8abf..0db4935de8ad57a3d85d66922f89da27846effdd 100644 --- a/de.prob.ui/plugin.xml +++ b/de.prob.ui/plugin.xml @@ -341,6 +341,10 @@ id="de.prob.ui.ltl.counterexampleprinthandler" name="CounterExample Print"> </command> + <command + id="de.prob.ui.newcore.export" + name="Export for new Core"> + </command> </extension> <extension point="org.eclipse.ui.handlers"> @@ -717,6 +721,23 @@ </with> </enabledWhen> </handler> + <handler + commandId="de.prob.ui.newcore.export"> + <class + class="de.prob.ui.eventb.ExportNewCoreHandler"> + </class> + <enabledWhen> + <with + variable="selection"> + <iterate + operator="or"> + <instanceof + value="org.eventb.core.IEventBRoot"> + </instanceof> + </iterate> + </with> + </enabledWhen> + </handler> <!-- <handler commandId="de.prob.ui.startdmc"> <class @@ -985,6 +1006,12 @@ label="Open in ProB classic" style="push"> </command> + <command + commandId="de.prob.ui.newcore.export" + icon="icons/prob_mini_logo.gif" + label="Export for new core (experimental)" + style="push"> + </command> </menu> <separator name="de.prob.ui.separator1"