From fff8c2c99812cb286d475b0e5b514bec7737616e Mon Sep 17 00:00:00 2001
From: gWestenberger <g.westenberger@alkacon.com>
Date: Wed, 7 Feb 2018 12:37:36 +0100
Subject: [PATCH] Fixed problem with wrong output directory in build script.

---
 .classpath   | 14 +++++++-------
 build.gradle | 20 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/.classpath b/.classpath
index 720dcd770ef..924d72087ca 100644
--- a/.classpath
+++ b/.classpath
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="data/**" kind="src" output="bin/test" path="src">
+	<classpathentry excluding="data/**" kind="src" output="bin/main" path="src">
 		<attributes>
 			<attribute name="gradle_scope" value="test"/>
 			<attribute name="gradle_used_by_scope" value="test"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**/super_src/**" kind="src" output="bin/testGwt" path="src-gwt">
+	<classpathentry excluding="data/**" kind="src" output="bin/test" path="test">
 		<attributes>
-			<attribute name="gradle_scope" value="testGwt"/>
-			<attribute name="gradle_used_by_scope" value="testGwt"/>
+			<attribute name="gradle_scope" value="test"/>
+			<attribute name="gradle_used_by_scope" value="test"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" output="bin/modules" path="src-modules">
@@ -24,10 +24,10 @@
 			<attribute name="gradle_used_by_scope" value="test,setup"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="data/**" kind="src" output="bin/test" path="test">
+	<classpathentry excluding="**/super_src/**" kind="src" output="bin/testGwt" path="src-gwt">
 		<attributes>
-			<attribute name="gradle_scope" value="test"/>
-			<attribute name="gradle_used_by_scope" value="test"/>
+			<attribute name="gradle_scope" value="testGwt"/>
+			<attribute name="gradle_used_by_scope" value="testGwt"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry excluding="**/super_src/**" kind="src" output="bin/testGwt" path="test-gwt">
diff --git a/build.gradle b/build.gradle
index a573468cdfb..1dc3bbcf541 100644
--- a/build.gradle
+++ b/build.gradle
@@ -171,9 +171,29 @@ sourceSets{
     }
 }
 
+
+
 // import dependencies
 apply from: 'dependencies.gradle'
 
+
+// The  Eclipse Buildship gradle integration for some reason assigns output folder test/bin to the .classpath entry for 
+// the src folder, so we fix it here manually.
+// 
+// The gradle_scope attribute also looks wrong in the generated file, but since I don't know what the correct value should
+// be, we leave it be for now. 
+eclipse.classpath.file {
+    whenMerged { classpath ->
+        classpath.entries.each {entry -> 
+        	if (entry.kind == 'src') {
+        		if (entry.path == 'src') {
+        			entry.output='bin/main'
+        		}
+        	}
+        } 
+    }
+}
+
 task wrapper(type: Wrapper){
 	gradleVersion = '4.4'
 }