From bbbdf68391906ee2cc0e96a30bf2d9d0667bfa32 Mon Sep 17 00:00:00 2001 From: Sebastian Zarnekow Date: Tue, 5 Nov 2019 15:15:10 +0100 Subject: [PATCH 1/3] Added missing build.properties, fixed a couple of warnings --- org.eclipse.xtext.ide.tests/build.properties | 7 +++++++ org.eclipse.xtext.ide.tests/plugin.properties | 2 ++ org.eclipse.xtext.ide/META-INF/MANIFEST.MF | 1 + org.eclipse.xtext.ide/build.properties | 8 ++++++++ org.eclipse.xtext.ide/plugin.properties | 2 ++ org.eclipse.xtext.testing/build.properties | 7 +++++++ org.eclipse.xtext.testlanguages.ide/build.properties | 5 +++-- org.eclipse.xtext.testlanguages/build.properties | 9 +++++++++ org.eclipse.xtext.tests/build.properties | 10 +++++----- org.eclipse.xtext.util/build.properties | 8 ++++++++ org.eclipse.xtext.xtext.generator/build.properties | 8 ++++++++ org.eclipse.xtext.xtext.ide/build.properties | 7 +++++++ org.eclipse.xtext.xtext.wizard/build.properties | 8 ++++++++ org.eclipse.xtext/META-INF/MANIFEST.MF | 1 + org.eclipse.xtext/build.properties | 12 ++++++++++++ org.eclipse.xtext/plugin.properties | 2 ++ 16 files changed, 90 insertions(+), 7 deletions(-) create mode 100644 org.eclipse.xtext.ide.tests/build.properties create mode 100644 org.eclipse.xtext.ide.tests/plugin.properties create mode 100644 org.eclipse.xtext.ide/build.properties create mode 100644 org.eclipse.xtext.ide/plugin.properties create mode 100644 org.eclipse.xtext.testing/build.properties create mode 100644 org.eclipse.xtext.testlanguages/build.properties create mode 100644 org.eclipse.xtext.util/build.properties create mode 100644 org.eclipse.xtext.xtext.generator/build.properties create mode 100644 org.eclipse.xtext.xtext.ide/build.properties create mode 100644 org.eclipse.xtext.xtext.wizard/build.properties create mode 100644 org.eclipse.xtext/build.properties create mode 100644 org.eclipse.xtext/plugin.properties diff --git a/org.eclipse.xtext.ide.tests/build.properties b/org.eclipse.xtext.ide.tests/build.properties new file mode 100644 index 000000000..45ad1dea0 --- /dev/null +++ b/org.eclipse.xtext.ide.tests/build.properties @@ -0,0 +1,7 @@ +# + +bin.includes = .,\ + META-INF/,\ + plugin.properties +jars.compile.order = . +source.. = src-gen/ diff --git a/org.eclipse.xtext.ide.tests/plugin.properties b/org.eclipse.xtext.ide.tests/plugin.properties new file mode 100644 index 000000000..56e5152fb --- /dev/null +++ b/org.eclipse.xtext.ide.tests/plugin.properties @@ -0,0 +1,2 @@ +pluginName = Xtext IDE Tests +providerName = Eclipse Xtext diff --git a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF index cad68183d..0968461ca 100644 --- a/org.eclipse.xtext.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext.ide/META-INF/MANIFEST.MF @@ -5,6 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext.ide;singleton:=true Bundle-Version: 2.20.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy +Bundle-Localization: plugin Bundle-Vendor: Eclipse Xtext Require-Bundle: org.eclipse.xtext;visibility:=reexport, org.eclipse.xtend.lib, diff --git a/org.eclipse.xtext.ide/build.properties b/org.eclipse.xtext.ide/build.properties new file mode 100644 index 000000000..adab53793 --- /dev/null +++ b/org.eclipse.xtext.ide/build.properties @@ -0,0 +1,8 @@ +# + +bin.includes = .,\ + META-INF/,\ + plugin.properties +jars.compile.order = . +source.. = src/,\ + xtend-gen/ diff --git a/org.eclipse.xtext.ide/plugin.properties b/org.eclipse.xtext.ide/plugin.properties new file mode 100644 index 000000000..b1f23b65c --- /dev/null +++ b/org.eclipse.xtext.ide/plugin.properties @@ -0,0 +1,2 @@ +pluginName = Xtext IDE Core +providerName = Eclipse Xtext diff --git a/org.eclipse.xtext.testing/build.properties b/org.eclipse.xtext.testing/build.properties new file mode 100644 index 000000000..6408fd2b3 --- /dev/null +++ b/org.eclipse.xtext.testing/build.properties @@ -0,0 +1,7 @@ +# + +bin.includes = .,\ + META-INF/ +jars.compile.order = . +source.. = src/,\ + xtend-gen/ diff --git a/org.eclipse.xtext.testlanguages.ide/build.properties b/org.eclipse.xtext.testlanguages.ide/build.properties index 63f97de38..5307b9215 100644 --- a/org.eclipse.xtext.testlanguages.ide/build.properties +++ b/org.eclipse.xtext.testlanguages.ide/build.properties @@ -1,4 +1,5 @@ -source.. = src-gen/ -output.. = bin/ +source.. = src-gen/,\ + src/,\ + xtend-gen/ bin.includes = META-INF/,\ . diff --git a/org.eclipse.xtext.testlanguages/build.properties b/org.eclipse.xtext.testlanguages/build.properties new file mode 100644 index 000000000..0f53b115f --- /dev/null +++ b/org.eclipse.xtext.testlanguages/build.properties @@ -0,0 +1,9 @@ +# + +bin.includes = .,\ + META-INF/,\ + plugin.xml +jars.compile.order = . +source.. = src-gen/,\ + src/,\ + xtend-gen/ diff --git a/org.eclipse.xtext.tests/build.properties b/org.eclipse.xtext.tests/build.properties index 6a74b724a..138a0ae2d 100644 --- a/org.eclipse.xtext.tests/build.properties +++ b/org.eclipse.xtext.tests/build.properties @@ -1,11 +1,11 @@ # -bin.includes = model/generated/,\ - .,\ - model/,\ +bin.includes = .,\ META-INF/,\ plugin.xml,\ plugin.properties jars.compile.order = . -source.. = src-gen/ -output.. = bin/ +source.. = src-gen/,\ + emf-gen/,\ + generator/src/,\ + generator/xtend-gen/ diff --git a/org.eclipse.xtext.util/build.properties b/org.eclipse.xtext.util/build.properties new file mode 100644 index 000000000..adab53793 --- /dev/null +++ b/org.eclipse.xtext.util/build.properties @@ -0,0 +1,8 @@ +# + +bin.includes = .,\ + META-INF/,\ + plugin.properties +jars.compile.order = . +source.. = src/,\ + xtend-gen/ diff --git a/org.eclipse.xtext.xtext.generator/build.properties b/org.eclipse.xtext.xtext.generator/build.properties new file mode 100644 index 000000000..0bede0e3b --- /dev/null +++ b/org.eclipse.xtext.xtext.generator/build.properties @@ -0,0 +1,8 @@ +# + +bin.includes = .,\ + META-INF/ +jars.compile.order = . +source.. = src-gen/,\ + src/,\ + xtend-gen/ diff --git a/org.eclipse.xtext.xtext.ide/build.properties b/org.eclipse.xtext.xtext.ide/build.properties new file mode 100644 index 000000000..a2a25ac3b --- /dev/null +++ b/org.eclipse.xtext.xtext.ide/build.properties @@ -0,0 +1,7 @@ +# + +bin.includes = .,\ + META-INF/ +jars.compile.order = . +source.. = src-gen/,\ + src/ diff --git a/org.eclipse.xtext.xtext.wizard/build.properties b/org.eclipse.xtext.xtext.wizard/build.properties new file mode 100644 index 000000000..d5886d597 --- /dev/null +++ b/org.eclipse.xtext.xtext.wizard/build.properties @@ -0,0 +1,8 @@ +# + +bin.includes = .,\ + META-INF/ +jars.compile.order = . +source.. = resources/,\ + src/,\ + xtend-gen/ diff --git a/org.eclipse.xtext/META-INF/MANIFEST.MF b/org.eclipse.xtext/META-INF/MANIFEST.MF index 65d310565..b8aec3c03 100644 --- a/org.eclipse.xtext/META-INF/MANIFEST.MF +++ b/org.eclipse.xtext/META-INF/MANIFEST.MF @@ -5,6 +5,7 @@ Bundle-SymbolicName: org.eclipse.xtext;singleton:=true Bundle-Version: 2.20.0.qualifier Bundle-ClassPath: . Bundle-Vendor: Eclipse Xtext +Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.xtext, org.eclipse.xtext.build;x-friends:="org.eclipse.xtext.testing, diff --git a/org.eclipse.xtext/build.properties b/org.eclipse.xtext/build.properties new file mode 100644 index 000000000..71b0a5517 --- /dev/null +++ b/org.eclipse.xtext/build.properties @@ -0,0 +1,12 @@ +# + +bin.includes = .,\ + META-INF/,\ + plugin.xml,\ + plugin.properties +jars.compile.order = . +source.. = src-gen/,\ + emf-gen/,\ + packrat/,\ + src/,\ + xtend-gen/ diff --git a/org.eclipse.xtext/plugin.properties b/org.eclipse.xtext/plugin.properties new file mode 100644 index 000000000..3ff5c091b --- /dev/null +++ b/org.eclipse.xtext/plugin.properties @@ -0,0 +1,2 @@ +pluginName = Xtext Core +providerName = Eclipse Xtext From e814a7d8dd580e2ebd67f3cebfb0b3b8677fe7be Mon Sep 17 00:00:00 2001 From: Sebastian Zarnekow Date: Wed, 6 Nov 2019 01:18:41 +0100 Subject: [PATCH 2/3] Fixed build.properties, fixed a few warnings on the go --- org.eclipse.xtext.ide.tests/build.properties | 14 +++++++++----- org.eclipse.xtext.ide/build.properties | 7 +++---- org.eclipse.xtext.testing/build.properties | 10 +++++----- org.eclipse.xtext.testlanguages/build.properties | 8 ++++---- org.eclipse.xtext.tests/build.properties | 12 +++++++++--- org.eclipse.xtext.util/build.properties | 7 +++---- org.eclipse.xtext.xtext.generator/build.properties | 7 +++---- org.eclipse.xtext.xtext.ide/build.properties | 7 +++---- org.eclipse.xtext.xtext.wizard/build.properties | 7 +++---- org.eclipse.xtext/.cvsignore | 4 ---- org.eclipse.xtext/build.properties | 13 +++++++++---- 11 files changed, 51 insertions(+), 45 deletions(-) delete mode 100644 org.eclipse.xtext/.cvsignore diff --git a/org.eclipse.xtext.ide.tests/build.properties b/org.eclipse.xtext.ide.tests/build.properties index 45ad1dea0..87949de49 100644 --- a/org.eclipse.xtext.ide.tests/build.properties +++ b/org.eclipse.xtext.ide.tests/build.properties @@ -1,7 +1,11 @@ -# - bin.includes = .,\ META-INF/,\ - plugin.properties -jars.compile.order = . -source.. = src-gen/ + plugin.properties,\ + about.html +source.. = src-gen/,\ + src/,\ + xtend-gen/,\ + testlang-src/,\ + testlang-src-gen/,\ + suites +src.includes = about.html diff --git a/org.eclipse.xtext.ide/build.properties b/org.eclipse.xtext.ide/build.properties index adab53793..4ea2713a3 100644 --- a/org.eclipse.xtext.ide/build.properties +++ b/org.eclipse.xtext.ide/build.properties @@ -1,8 +1,7 @@ -# - bin.includes = .,\ META-INF/,\ - plugin.properties -jars.compile.order = . + plugin.properties,\ + about.html source.. = src/,\ xtend-gen/ +src.includes = about.html diff --git a/org.eclipse.xtext.testing/build.properties b/org.eclipse.xtext.testing/build.properties index 6408fd2b3..f9587e856 100644 --- a/org.eclipse.xtext.testing/build.properties +++ b/org.eclipse.xtext.testing/build.properties @@ -1,7 +1,7 @@ -# - bin.includes = .,\ - META-INF/ -jars.compile.order = . + META-INF/,\ + about.html source.. = src/,\ - xtend-gen/ + xtend-gen/,\ + tests +src.includes = about.html diff --git a/org.eclipse.xtext.testlanguages/build.properties b/org.eclipse.xtext.testlanguages/build.properties index 0f53b115f..2d9d7b969 100644 --- a/org.eclipse.xtext.testlanguages/build.properties +++ b/org.eclipse.xtext.testlanguages/build.properties @@ -1,9 +1,9 @@ -# - bin.includes = .,\ META-INF/,\ - plugin.xml -jars.compile.order = . + plugin.xml,\ + about.html,\ + model/ source.. = src-gen/,\ src/,\ xtend-gen/ +src.includes = about.html diff --git a/org.eclipse.xtext.tests/build.properties b/org.eclipse.xtext.tests/build.properties index 138a0ae2d..7c6799053 100644 --- a/org.eclipse.xtext.tests/build.properties +++ b/org.eclipse.xtext.tests/build.properties @@ -3,9 +3,15 @@ bin.includes = .,\ META-INF/,\ plugin.xml,\ - plugin.properties -jars.compile.order = . + plugin.properties,\ + about.html,\ + testdata/ source.. = src-gen/,\ emf-gen/,\ + xtend-gen/,\ + src/,\ generator/src/,\ - generator/xtend-gen/ + generator/xtend-gen/,\ + suites/ +src.includes = testdata/,\ + about.html diff --git a/org.eclipse.xtext.util/build.properties b/org.eclipse.xtext.util/build.properties index adab53793..4ea2713a3 100644 --- a/org.eclipse.xtext.util/build.properties +++ b/org.eclipse.xtext.util/build.properties @@ -1,8 +1,7 @@ -# - bin.includes = .,\ META-INF/,\ - plugin.properties -jars.compile.order = . + plugin.properties,\ + about.html source.. = src/,\ xtend-gen/ +src.includes = about.html diff --git a/org.eclipse.xtext.xtext.generator/build.properties b/org.eclipse.xtext.xtext.generator/build.properties index 0bede0e3b..b189f69ff 100644 --- a/org.eclipse.xtext.xtext.generator/build.properties +++ b/org.eclipse.xtext.xtext.generator/build.properties @@ -1,8 +1,7 @@ -# - bin.includes = .,\ - META-INF/ -jars.compile.order = . + META-INF/,\ + about.html source.. = src-gen/,\ src/,\ xtend-gen/ +src.includes = about.html diff --git a/org.eclipse.xtext.xtext.ide/build.properties b/org.eclipse.xtext.xtext.ide/build.properties index a2a25ac3b..f6bfa0a3e 100644 --- a/org.eclipse.xtext.xtext.ide/build.properties +++ b/org.eclipse.xtext.xtext.ide/build.properties @@ -1,7 +1,6 @@ -# - bin.includes = .,\ - META-INF/ -jars.compile.order = . + META-INF/,\ + about.html source.. = src-gen/,\ src/ +src.includes = about.html diff --git a/org.eclipse.xtext.xtext.wizard/build.properties b/org.eclipse.xtext.xtext.wizard/build.properties index d5886d597..04b2c7013 100644 --- a/org.eclipse.xtext.xtext.wizard/build.properties +++ b/org.eclipse.xtext.xtext.wizard/build.properties @@ -1,8 +1,7 @@ -# - bin.includes = .,\ - META-INF/ -jars.compile.order = . + META-INF/,\ + about.html source.. = resources/,\ src/,\ xtend-gen/ +src.includes = about.html diff --git a/org.eclipse.xtext/.cvsignore b/org.eclipse.xtext/.cvsignore deleted file mode 100644 index 04df6fb01..000000000 --- a/org.eclipse.xtext/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -emf-gen -emf-gen/ -emf-gen/* - diff --git a/org.eclipse.xtext/build.properties b/org.eclipse.xtext/build.properties index 71b0a5517..e9236b530 100644 --- a/org.eclipse.xtext/build.properties +++ b/org.eclipse.xtext/build.properties @@ -1,12 +1,17 @@ -# - bin.includes = .,\ META-INF/,\ plugin.xml,\ - plugin.properties -jars.compile.order = . + plugin.properties,\ + about.html,\ + about.ini,\ + about.mappings,\ + about.properties,\ + xtext32.png,\ + schema/,\ + org/ source.. = src-gen/,\ emf-gen/,\ packrat/,\ src/,\ xtend-gen/ +src.includes = about.html From 0db28cc4c2af898e8b8175df7de0de53d5f46727 Mon Sep 17 00:00:00 2001 From: Sebastian Zarnekow Date: Wed, 13 Nov 2019 09:48:20 +0100 Subject: [PATCH 3/3] Add output folders to build.properties --- org.eclipse.xtext.ide.tests/build.properties | 3 ++- org.eclipse.xtext.ide/build.properties | 1 + org.eclipse.xtext.testing/build.properties | 1 + org.eclipse.xtext.testlanguages.ide/build.properties | 1 + org.eclipse.xtext.testlanguages/build.properties | 1 + org.eclipse.xtext.tests/build.properties | 4 ++-- org.eclipse.xtext.util/build.properties | 1 + org.eclipse.xtext.xtext.generator/build.properties | 1 + org.eclipse.xtext.xtext.ide/build.properties | 1 + org.eclipse.xtext.xtext.wizard/build.properties | 1 + org.eclipse.xtext/build.properties | 1 + 11 files changed, 13 insertions(+), 3 deletions(-) diff --git a/org.eclipse.xtext.ide.tests/build.properties b/org.eclipse.xtext.ide.tests/build.properties index 87949de49..643815097 100644 --- a/org.eclipse.xtext.ide.tests/build.properties +++ b/org.eclipse.xtext.ide.tests/build.properties @@ -8,4 +8,5 @@ source.. = src-gen/,\ testlang-src/,\ testlang-src-gen/,\ suites -src.includes = about.html +output.. = bin/test/ +src.includes = about.html \ No newline at end of file diff --git a/org.eclipse.xtext.ide/build.properties b/org.eclipse.xtext.ide/build.properties index 4ea2713a3..1c0fbe056 100644 --- a/org.eclipse.xtext.ide/build.properties +++ b/org.eclipse.xtext.ide/build.properties @@ -4,4 +4,5 @@ bin.includes = .,\ about.html source.. = src/,\ xtend-gen/ +output.. = bin/main/ src.includes = about.html diff --git a/org.eclipse.xtext.testing/build.properties b/org.eclipse.xtext.testing/build.properties index f9587e856..497941aff 100644 --- a/org.eclipse.xtext.testing/build.properties +++ b/org.eclipse.xtext.testing/build.properties @@ -4,4 +4,5 @@ bin.includes = .,\ source.. = src/,\ xtend-gen/,\ tests +output.. = bin/main/ src.includes = about.html diff --git a/org.eclipse.xtext.testlanguages.ide/build.properties b/org.eclipse.xtext.testlanguages.ide/build.properties index 5307b9215..c2f1926b7 100644 --- a/org.eclipse.xtext.testlanguages.ide/build.properties +++ b/org.eclipse.xtext.testlanguages.ide/build.properties @@ -1,5 +1,6 @@ source.. = src-gen/,\ src/,\ xtend-gen/ +output.. = bin/main/ bin.includes = META-INF/,\ . diff --git a/org.eclipse.xtext.testlanguages/build.properties b/org.eclipse.xtext.testlanguages/build.properties index 2d9d7b969..810a0a9ab 100644 --- a/org.eclipse.xtext.testlanguages/build.properties +++ b/org.eclipse.xtext.testlanguages/build.properties @@ -6,4 +6,5 @@ bin.includes = .,\ source.. = src-gen/,\ src/,\ xtend-gen/ +output.. = bin/main/ src.includes = about.html diff --git a/org.eclipse.xtext.tests/build.properties b/org.eclipse.xtext.tests/build.properties index 7c6799053..74df7a437 100644 --- a/org.eclipse.xtext.tests/build.properties +++ b/org.eclipse.xtext.tests/build.properties @@ -1,5 +1,3 @@ -# - bin.includes = .,\ META-INF/,\ plugin.xml,\ @@ -13,5 +11,7 @@ source.. = src-gen/,\ generator/src/,\ generator/xtend-gen/,\ suites/ +output.. = bin/mwe2/,\ + bin/test/ src.includes = testdata/,\ about.html diff --git a/org.eclipse.xtext.util/build.properties b/org.eclipse.xtext.util/build.properties index 4ea2713a3..1c0fbe056 100644 --- a/org.eclipse.xtext.util/build.properties +++ b/org.eclipse.xtext.util/build.properties @@ -4,4 +4,5 @@ bin.includes = .,\ about.html source.. = src/,\ xtend-gen/ +output.. = bin/main/ src.includes = about.html diff --git a/org.eclipse.xtext.xtext.generator/build.properties b/org.eclipse.xtext.xtext.generator/build.properties index b189f69ff..8bef76503 100644 --- a/org.eclipse.xtext.xtext.generator/build.properties +++ b/org.eclipse.xtext.xtext.generator/build.properties @@ -4,4 +4,5 @@ bin.includes = .,\ source.. = src-gen/,\ src/,\ xtend-gen/ +output.. = bin/main/ src.includes = about.html diff --git a/org.eclipse.xtext.xtext.ide/build.properties b/org.eclipse.xtext.xtext.ide/build.properties index f6bfa0a3e..ebf3c04c0 100644 --- a/org.eclipse.xtext.xtext.ide/build.properties +++ b/org.eclipse.xtext.xtext.ide/build.properties @@ -3,4 +3,5 @@ bin.includes = .,\ about.html source.. = src-gen/,\ src/ +output.. = bin/main/ src.includes = about.html diff --git a/org.eclipse.xtext.xtext.wizard/build.properties b/org.eclipse.xtext.xtext.wizard/build.properties index 04b2c7013..a82090e84 100644 --- a/org.eclipse.xtext.xtext.wizard/build.properties +++ b/org.eclipse.xtext.xtext.wizard/build.properties @@ -4,4 +4,5 @@ bin.includes = .,\ source.. = resources/,\ src/,\ xtend-gen/ +output.. = bin/main/ src.includes = about.html diff --git a/org.eclipse.xtext/build.properties b/org.eclipse.xtext/build.properties index e9236b530..e52649d1f 100644 --- a/org.eclipse.xtext/build.properties +++ b/org.eclipse.xtext/build.properties @@ -14,4 +14,5 @@ source.. = src-gen/,\ packrat/,\ src/,\ xtend-gen/ +output.. = bin/main/ src.includes = about.html