Skip to content

Commit

Permalink
Fixed problem with wrong output directory in build script.
Browse files Browse the repository at this point in the history
  • Loading branch information
gWestenberger committed Feb 14, 2018
1 parent b3125ca commit fff8c2c
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 7 deletions.
14 changes: 7 additions & 7 deletions .classpath
Original file line number Diff line number Diff line change
@@ -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">
Expand All @@ -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">
Expand Down
20 changes: 20 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down

0 comments on commit fff8c2c

Please sign in to comment.