From 0da1f355a14a85cdd47af77cab1e50068b7b5f59 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 3 Feb 2020 13:51:45 +0100 Subject: [PATCH 01/13] 126: removed jdt.feature from target-platform-configuration for Mac build introduced for See https://github.com/LorenzoBettini/jbase/issues/3 https://www.eclipse.org/forums/index.php/t/1073366/ Task-Url: http://github.com/LorenzoBettini/edelta/issues/126 --- edelta.parent/edelta.ui.tests/pom.xml | 86 ++++++--------------------- 1 file changed, 18 insertions(+), 68 deletions(-) diff --git a/edelta.parent/edelta.ui.tests/pom.xml b/edelta.parent/edelta.ui.tests/pom.xml index 9abefc41a..26e0f2811 100644 --- a/edelta.parent/edelta.ui.tests/pom.xml +++ b/edelta.parent/edelta.ui.tests/pom.xml @@ -15,76 +15,26 @@ -Dedelta.interpreter.timeout=5000 - - - testing-on-mac - - - mac - - - - - - org.eclipse.tycho - target-platform-configuration - - - - - - eclipse-feature - edelta.feature - 0.0.0 - - - - eclipse-feature - org.eclipse.jdt - 0.0.0 - - - - - - - - - - testing-NOT-on-mac - - - !mac - - - - - - org.eclipse.tycho - target-platform-configuration - - - - - - eclipse-feature - edelta.feature - 0.0.0 - - - - - - - - - - + + org.eclipse.tycho + target-platform-configuration + + + + + + eclipse-feature + edelta.feature + 0.0.0 + + + + + org.eclipse.xtend xtend-maven-plugin From ddfc91c89d02b372e7f491a303ea6db552b5c36b Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 3 Feb 2020 14:17:03 +0100 Subject: [PATCH 02/13] 126: Travis show target/work logs Task-Url: http://github.com/LorenzoBettini/edelta/issues/126 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 42e1a4818..1ecaa7f98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,5 +54,5 @@ after_success: - find ./edelta.parent/edelta.ui.tests/target/ -name "*.log" after_failure: -# - find ./edelta.parent/*/target/work/ -name "*.log" -exec cat {} \; - - find ./edelta.parent/*/target/it/ -name "*.log" -exec cat {} \; + - find ./edelta.parent/*/target/work/ -name "*.log" -exec cat {} \; +# - find ./edelta.parent/*/target/it/ -name "*.log" -exec cat {} \; From bd91b8e0d128c274488d47848b8c189afe942081 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 3 Feb 2020 14:34:12 +0100 Subject: [PATCH 03/13] 126: don't use after_failure Task-Url: http://github.com/LorenzoBettini/edelta/issues/126 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ecaa7f98..f8988c6a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,6 +53,6 @@ before_cache: after_success: - find ./edelta.parent/edelta.ui.tests/target/ -name "*.log" -after_failure: - - find ./edelta.parent/*/target/work/ -name "*.log" -exec cat {} \; +#after_failure: +# - find ./edelta.parent/*/target/work/ -name "*.log" -exec cat {} \; # - find ./edelta.parent/*/target/it/ -name "*.log" -exec cat {} \; From a1876625dd63395992524adb862e35c27bb3c961 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 3 Feb 2020 14:34:39 +0100 Subject: [PATCH 04/13] 126: show the active profiles before the build Task-Url: http://github.com/LorenzoBettini/edelta/issues/126 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f8988c6a2..79460e5f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,6 +45,7 @@ before_script: # Build on MacOSX is triggered only for pull requests and merge of pull requests script: - export + - ./mvnw -f edelta.parent/pom.xml -N -Dtycho.mode=maven help:active-profiles - ./mvnw -f edelta.parent/pom.xml -U clean verify $ADDITIONAL before_cache: From fdfd6fbc5c123871a6405e0969e556695df25c75 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 3 Feb 2020 14:39:32 +0100 Subject: [PATCH 05/13] 126: enabled org.eclipse.jdt in inherited macos profile Task-Url: http://github.com/LorenzoBettini/edelta/issues/126 --- edelta.parent/edelta.ui.tests/pom.xml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/edelta.parent/edelta.ui.tests/pom.xml b/edelta.parent/edelta.ui.tests/pom.xml index 26e0f2811..e1a28cf8a 100644 --- a/edelta.parent/edelta.ui.tests/pom.xml +++ b/edelta.parent/edelta.ui.tests/pom.xml @@ -15,6 +15,33 @@ -Dedelta.interpreter.timeout=5000 + + + macos + + + + org.eclipse.tycho + target-platform-configuration + + + + + + eclipse-feature + org.eclipse.jdt + 0.0.0 + + + + + + + + + + From 50693c6fd970c9818b0bb583ea7614e8719ffcf1 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 3 Feb 2020 14:52:37 +0100 Subject: [PATCH 06/13] 126: show active profile in edelta.ui.tests Task-Url: http://github.com/LorenzoBettini/edelta/issues/126 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 79460e5f1..eddbc135a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,6 +46,7 @@ before_script: script: - export - ./mvnw -f edelta.parent/pom.xml -N -Dtycho.mode=maven help:active-profiles + - ./mvnw -f edelta.parent/edelta.ui.tests/pom.xml -N -Dtycho.mode=maven help:active-profiles - ./mvnw -f edelta.parent/pom.xml -U clean verify $ADDITIONAL before_cache: From 21e2a6cd6e3f2008166905c8aba3821cbf5a488e Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 3 Feb 2020 15:01:06 +0100 Subject: [PATCH 07/13] 126: explicit activation for mac Task-Url: http://github.com/LorenzoBettini/edelta/issues/126 --- edelta.parent/edelta.ui.tests/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/edelta.parent/edelta.ui.tests/pom.xml b/edelta.parent/edelta.ui.tests/pom.xml index e1a28cf8a..196578862 100644 --- a/edelta.parent/edelta.ui.tests/pom.xml +++ b/edelta.parent/edelta.ui.tests/pom.xml @@ -18,6 +18,11 @@ macos + + + mac + + From ca31e69c0650b9f38bafd46d5434ebf60ac11248 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 3 Feb 2020 15:15:55 +0100 Subject: [PATCH 08/13] Revert "126: show active profile in edelta.ui.tests" This reverts commit 50693c6fd970c9818b0bb583ea7614e8719ffcf1. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eddbc135a..79460e5f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,6 @@ before_script: script: - export - ./mvnw -f edelta.parent/pom.xml -N -Dtycho.mode=maven help:active-profiles - - ./mvnw -f edelta.parent/edelta.ui.tests/pom.xml -N -Dtycho.mode=maven help:active-profiles - ./mvnw -f edelta.parent/pom.xml -U clean verify $ADDITIONAL before_cache: From f5ce63740dfefbea21f20cd04b23413d8c7afaeb Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 3 Feb 2020 15:17:57 +0100 Subject: [PATCH 09/13] 126: only add org.eclipse.jdt.launching.macosx Task-Url: http://github.com/LorenzoBettini/edelta/issues/126 --- edelta.parent/edelta.ui.tests/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/edelta.parent/edelta.ui.tests/pom.xml b/edelta.parent/edelta.ui.tests/pom.xml index 196578862..0a2692364 100644 --- a/edelta.parent/edelta.ui.tests/pom.xml +++ b/edelta.parent/edelta.ui.tests/pom.xml @@ -34,8 +34,8 @@ - eclipse-feature - org.eclipse.jdt + eclipse-plugin + org.eclipse.jdt.launching.macosx 0.0.0 From 81fb5c6187968d22e622c33dc4abe6176ddd1543 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 3 Feb 2020 15:27:41 +0100 Subject: [PATCH 10/13] 126: p2-installable-unit Task-Url: http://github.com/LorenzoBettini/edelta/issues/126 --- edelta.parent/edelta.ui.tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edelta.parent/edelta.ui.tests/pom.xml b/edelta.parent/edelta.ui.tests/pom.xml index 0a2692364..d00d13d81 100644 --- a/edelta.parent/edelta.ui.tests/pom.xml +++ b/edelta.parent/edelta.ui.tests/pom.xml @@ -34,7 +34,7 @@ - eclipse-plugin + p2-installable-unit org.eclipse.jdt.launching.macosx 0.0.0 From 94df3acd4b52a6deaeb94272b882d8a3ac23cdfe Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 3 Feb 2020 15:34:02 +0100 Subject: [PATCH 11/13] Revert "126: p2-installable-unit" This reverts commit 81fb5c6187968d22e622c33dc4abe6176ddd1543. --- edelta.parent/edelta.ui.tests/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edelta.parent/edelta.ui.tests/pom.xml b/edelta.parent/edelta.ui.tests/pom.xml index d00d13d81..0a2692364 100644 --- a/edelta.parent/edelta.ui.tests/pom.xml +++ b/edelta.parent/edelta.ui.tests/pom.xml @@ -34,7 +34,7 @@ - p2-installable-unit + eclipse-plugin org.eclipse.jdt.launching.macosx 0.0.0 From ac2501e80ae0667fb8f89305516959aad1d15200 Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 3 Feb 2020 15:34:07 +0100 Subject: [PATCH 12/13] Revert "126: only add org.eclipse.jdt.launching.macosx" This reverts commit f5ce63740dfefbea21f20cd04b23413d8c7afaeb. --- edelta.parent/edelta.ui.tests/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/edelta.parent/edelta.ui.tests/pom.xml b/edelta.parent/edelta.ui.tests/pom.xml index 0a2692364..196578862 100644 --- a/edelta.parent/edelta.ui.tests/pom.xml +++ b/edelta.parent/edelta.ui.tests/pom.xml @@ -34,8 +34,8 @@ - eclipse-plugin - org.eclipse.jdt.launching.macosx + eclipse-feature + org.eclipse.jdt 0.0.0 From 8909a76ce34d2bdab0b340a6ba470003ccc56f4b Mon Sep 17 00:00:00 2001 From: Lorenzo Bettini Date: Mon, 3 Feb 2020 15:35:16 +0100 Subject: [PATCH 13/13] 126: expanded comment Task-Url: http://github.com/LorenzoBettini/edelta/issues/126 --- edelta.parent/edelta.ui.tests/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/edelta.parent/edelta.ui.tests/pom.xml b/edelta.parent/edelta.ui.tests/pom.xml index 196578862..ff237a8be 100644 --- a/edelta.parent/edelta.ui.tests/pom.xml +++ b/edelta.parent/edelta.ui.tests/pom.xml @@ -31,7 +31,8 @@ - eclipse-feature