Updated and fixed dependencies:

- All java library dependency: fixed to java 1.8 - Added Automatic-Module-Name to be compatible with java 1.9 - Added all sources explicitly to build.properties - removed .util packages generated by previous versions of Viatra
author: OszkarSemerath <oszkar.semerath@gmail.com> 2018-05-07 21:27:58 +0200
committer: OszkarSemerath <oszkar.semerath@gmail.com> 2018-05-07 21:27:58 +0200
commit: fd2efee477e4c32a5014fb9daa5c987ad21adb47 (patch)
tree: fb74ca2087e652be7c683dd179bfc228a7046ba8 /Framework
parent: Debug for SMT scopes (diff)
download: VIATRA-Generator-fd2efee477e4c32a5014fb9daa5c987ad21adb47.tar.gz
VIATRA-Generator-fd2efee477e4c32a5014fb9daa5c987ad21adb47.tar.zst
VIATRA-Generator-fd2efee477e4c32a5014fb9daa5c987ad21adb47.zip
6 files changed, 32 insertions, 26 deletions
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/META-INF/MANIFEST.MF b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/META-INF/MANIFEST.MF
index f38f6fee..5d26ded7 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/META-INF/MANIFEST.MF
+++ b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/META-INF/MANIFEST.MF
@@ -20,4 +20,5 @@ Export-Package: hu.bme.mit.inf.dslreasoner.ecore2logic,
 hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations,
 hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.impl,
 hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.util
+Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.ecore2logic
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/build.properties b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/build.properties
index 72399047..b283764d 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/build.properties
+++ b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/build.properties
@@ -6,5 +6,7 @@ bin.includes = .,\
               plugin.xml,\
               plugin.properties
 jars.compile.order = .
-source.. = ecore-gen/
+source.. = ecore-gen/,\
+           src/,\
+           xtend-gen/
 output.. = bin/
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF
index ede7da3f..b4f60202 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF
@@ -6,30 +6,30 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: hu.bme.mit.inf.dslreasoner.logic.model.builder,
+Export-Package: hu.bme.mit.inf.dslreasoner.logic.model.builder,
- hu.bme.mit.inf.dslreasoner.logic.model.builder.consistencychecker,
+  hu.bme.mit.inf.dslreasoner.logic.model.builder.consistencychecker,
- hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage,
+  hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage,
- hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl,
+  hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl,
- hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.util,
+  hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.util,
- hu.bme.mit.inf.dslreasoner.logic.model.logicproblem,
+  hu.bme.mit.inf.dslreasoner.logic.model.logicproblem,
- hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.impl,
+  hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.impl,
- hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.util,
+  hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.util,
- hu.bme.mit.inf.dslreasoner.logic.model.logicresult,
+  hu.bme.mit.inf.dslreasoner.logic.model.logicresult,
- hu.bme.mit.inf.dslreasoner.logic.model.logicresult.impl,
+  hu.bme.mit.inf.dslreasoner.logic.model.logicresult.impl,
- hu.bme.mit.inf.dslreasoner.logic.model.logicresult.util,
+  hu.bme.mit.inf.dslreasoner.logic.model.logicresult.util,
- hu.bme.mit.inf.dslreasoner.logic.model.patterns,
+  hu.bme.mit.inf.dslreasoner.logic.model.patterns,
- hu.bme.mit.inf.dslreasoner.logic.model.patterns.util,
+  hu.bme.mit.inf.dslreasoner.logic.model.statistics,
- hu.bme.mit.inf.dslreasoner.logic.model.statistics,
+  hu.bme.mit.inf.dslreasoner.util,
- hu.bme.mit.inf.dslreasoner.util,
+  hu.bme.mit.inf.dslreasoner.workspace
- hu.bme.mit.inf.dslreasoner.workspace
+Require-Bundle: org.eclipse.core.runtime,
-Require-Bundle: org.eclipse.core.runtime,
+  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
+  com.google.guava,
- com.google.guava,
+  org.eclipse.xtend.lib,
- org.eclipse.xtend.lib,
+  org.eclipse.xtext.xbase.lib,
- org.eclipse.xtext.xbase.lib,
+  org.eclipse.core.resources;bundle-version="3.8.101",
- org.eclipse.core.resources;bundle-version="3.8.101",
+  org.eclipse.viatra.query.runtime;bundle-version="1.3.0",
- org.eclipse.viatra.query.runtime;bundle-version="1.3.0",
+  org.apache.commons.lang;bundle-version="2.6.0"
- org.apache.commons.lang;bundle-version="2.6.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Import-Package: org.apache.log4j
+Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.logic.model
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/META-INF/MANIFEST.MF b/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/META-INF/MANIFEST.MF
index 5f89c3d0..28a8906d 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/META-INF/MANIFEST.MF
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/META-INF/MANIFEST.MF
@@ -11,4 +11,5 @@ Require-Bundle: com.google.guava,
 hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
 org.eclipse.ocl.ecore;bundle-version="3.6.0"
 Export-Package: hu.bme.mit.inf.dslreasoner.logic2ecore
+Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.logic2ecore
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/build.properties b/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/build.properties
index 41eb6ade..d6c49e5c 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/build.properties
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/build.properties
@@ -1,4 +1,5 @@
-source.. = src/
+source.. = src/,\
+           xtend-gen/
 output.. = bin/
 bin.includes = META-INF/,\
               .
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/META-INF/MANIFEST.MF b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/META-INF/MANIFEST.MF
index 1872207f..9f2acd2e 100644
--- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/META-INF/MANIFEST.MF
+++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/META-INF/MANIFEST.MF
@@ -22,4 +22,5 @@ Export-Package: hu.bme.mit.inf.dslreasoner.viatra2logic,
 hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations,
 hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.impl,
 hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.util
+Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.viatra2logic
author	OszkarSemerath <oszkar.semerath@gmail.com>	2018-05-07 21:27:58 +0200
committer	OszkarSemerath <oszkar.semerath@gmail.com>	2018-05-07 21:27:58 +0200
commit	fd2efee477e4c32a5014fb9daa5c987ad21adb47 (patch)
tree	fb74ca2087e652be7c683dd179bfc228a7046ba8 /Framework
parent	Debug for SMT scopes (diff)
download	VIATRA-Generator-fd2efee477e4c32a5014fb9daa5c987ad21adb47.tar.gz VIATRA-Generator-fd2efee477e4c32a5014fb9daa5c987ad21adb47.tar.zst VIATRA-Generator-fd2efee477e4c32a5014fb9daa5c987ad21adb47.zip

diff --git a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/META-INF/MANIFEST.MF b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/META-INF/MANIFEST.MF index f38f6fee..5d26ded7 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/META-INF/MANIFEST.MF +++ b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/META-INF/MANIFEST.MF
@@ -20,4 +20,5 @@ Export-Package: hu.bme.mit.inf.dslreasoner.ecore2logic,
20	hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations,	20	hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations,
21	hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.impl,	21	hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.impl,
22	hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.util	22	hu.bme.mit.inf.dslreasoner.ecore2logic.ecore2logicannotations.util
		23	Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.ecore2logic
23		24


diff --git a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/build.properties b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/build.properties index 72399047..b283764d 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/build.properties +++ b/Framework/hu.bme.mit.inf.dslreasoner.ecore2logic/build.properties
@@ -6,5 +6,7 @@ bin.includes = .,\
6	plugin.xml,\	6	plugin.xml,\
7	plugin.properties	7	plugin.properties
8	jars.compile.order = .	8	jars.compile.order = .
9	source.. = ecore-gen/	9	source.. = ecore-gen/,\
		10	src/,\
		11	xtend-gen/
10	output.. = bin/	12	output.. = bin/


diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF index ede7da3f..b4f60202 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF
@@ -6,30 +6,30 @@ Bundle-Version: 1.0.0.qualifier
6	Bundle-ClassPath: .	6	Bundle-ClassPath: .
7	Bundle-Vendor: %providerName	7	Bundle-Vendor: %providerName
8	Bundle-Localization: plugin	8	Bundle-Localization: plugin
9	Export-Package: hu.bme.mit.inf.dslreasoner.logic.model.builder,	9	Export-Package: hu.bme.mit.inf.dslreasoner.logic.model.builder,
10	hu.bme.mit.inf.dslreasoner.logic.model.builder.consistencychecker,	10	hu.bme.mit.inf.dslreasoner.logic.model.builder.consistencychecker,
11	hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage,	11	hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage,
12	hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl,	12	hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl,
13	hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.util,	13	hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.util,
14	hu.bme.mit.inf.dslreasoner.logic.model.logicproblem,	14	hu.bme.mit.inf.dslreasoner.logic.model.logicproblem,
15	hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.impl,	15	hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.impl,
16	hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.util,	16	hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.util,
17	hu.bme.mit.inf.dslreasoner.logic.model.logicresult,	17	hu.bme.mit.inf.dslreasoner.logic.model.logicresult,
18	hu.bme.mit.inf.dslreasoner.logic.model.logicresult.impl,	18	hu.bme.mit.inf.dslreasoner.logic.model.logicresult.impl,
19	hu.bme.mit.inf.dslreasoner.logic.model.logicresult.util,	19	hu.bme.mit.inf.dslreasoner.logic.model.logicresult.util,
20	hu.bme.mit.inf.dslreasoner.logic.model.patterns,	20	hu.bme.mit.inf.dslreasoner.logic.model.patterns,
21	hu.bme.mit.inf.dslreasoner.logic.model.patterns.util,	21	hu.bme.mit.inf.dslreasoner.logic.model.statistics,
22	hu.bme.mit.inf.dslreasoner.logic.model.statistics,	22	hu.bme.mit.inf.dslreasoner.util,
23	hu.bme.mit.inf.dslreasoner.util,	23	hu.bme.mit.inf.dslreasoner.workspace
24	hu.bme.mit.inf.dslreasoner.workspace	24	Require-Bundle: org.eclipse.core.runtime,
25	Require-Bundle: org.eclipse.core.runtime,	25	org.eclipse.emf.ecore;visibility:=reexport,
26	org.eclipse.emf.ecore;visibility:=reexport,	26	com.google.guava,
27	com.google.guava,	27	org.eclipse.xtend.lib,
28	org.eclipse.xtend.lib,	28	org.eclipse.xtext.xbase.lib,
29	org.eclipse.xtext.xbase.lib,	29	org.eclipse.core.resources;bundle-version="3.8.101",
30	org.eclipse.core.resources;bundle-version="3.8.101",	30	org.eclipse.viatra.query.runtime;bundle-version="1.3.0",
31	org.eclipse.viatra.query.runtime;bundle-version="1.3.0",	31	org.apache.commons.lang;bundle-version="2.6.0"
32	org.apache.commons.lang;bundle-version="2.6.0"
33	Bundle-RequiredExecutionEnvironment: JavaSE-1.8	32	Bundle-RequiredExecutionEnvironment: JavaSE-1.8
34	Bundle-ActivationPolicy: lazy	33	Bundle-ActivationPolicy: lazy
35	Import-Package: org.apache.log4j	34	Import-Package: org.apache.log4j
		35	Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.logic.model


diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/META-INF/MANIFEST.MF b/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/META-INF/MANIFEST.MF index 5f89c3d0..28a8906d 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/META-INF/MANIFEST.MF +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/META-INF/MANIFEST.MF
@@ -11,4 +11,5 @@ Require-Bundle: com.google.guava,
11	hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",	11	hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
12	org.eclipse.ocl.ecore;bundle-version="3.6.0"	12	org.eclipse.ocl.ecore;bundle-version="3.6.0"
13	Export-Package: hu.bme.mit.inf.dslreasoner.logic2ecore	13	Export-Package: hu.bme.mit.inf.dslreasoner.logic2ecore
		14	Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.logic2ecore
14		15


diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/build.properties b/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/build.properties index 41eb6ade..d6c49e5c 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/build.properties +++ b/Framework/hu.bme.mit.inf.dslreasoner.logic2ecore/build.properties
@@ -1,4 +1,5 @@
1	source.. = src/	1	source.. = src/,\
		2	xtend-gen/
2	output.. = bin/	3	output.. = bin/
3	bin.includes = META-INF/,\	4	bin.includes = META-INF/,\
4	.	5	.


diff --git a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/META-INF/MANIFEST.MF b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/META-INF/MANIFEST.MF index 1872207f..9f2acd2e 100644 --- a/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/META-INF/MANIFEST.MF +++ b/Framework/hu.bme.mit.inf.dslreasoner.viatra2logic/META-INF/MANIFEST.MF
@@ -22,4 +22,5 @@ Export-Package: hu.bme.mit.inf.dslreasoner.viatra2logic,
22	hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations,	22	hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations,
23	hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.impl,	23	hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.impl,
24	hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.util	24	hu.bme.mit.inf.dslreasoner.viatra2logic.viatra2logicannotations.util
		25	Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.viatra2logic
25		26