Skip to content

Commit 769f93f

Browse files
committed
Generated resources should go into target/ and not src/
Closes #633
1 parent 341f6fd commit 769f93f

File tree

3 files changed

+20
-10
lines changed

3 files changed

+20
-10
lines changed

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,3 @@ src/test/cypress/screenshots/**/*.png
9393
github-report.html
9494
node_modules/*
9595
node/*
96-
src/main/xar-resources/resources/scripts/*.min.*
97-
src/main/xar-resources/resources/styles/*.min.*
98-
src/main/xar-resources/resources/styles/*.map

Gulpfile.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,30 @@ var settings = {
2020

2121
var paths = {
2222
input: 'src/main/frontend/',
23-
output: 'src/main/xar-resources/resources/',
23+
output: 'target/generated-resources/gulp/xar-resources/resources/',
2424
scripts: {
2525
input: 'src/main/frontend/javascript/*',
2626
polyfills: '.polyfill.js',
27-
output: 'src/main/xar-resources/resources/scripts/'
27+
output: 'target/generated-resources/gulp/xar-resources/resources/scripts/'
2828
},
2929
styles: {
3030
input: 'src/main/frontend/sass/*.{scss,sass}',
31-
output: 'src/main/xar-resources/resources/styles/'
31+
output: 'target/generated-resources/gulp/xar-resources/resources/styles/'
3232
},
3333
svgs: {
3434
input: 'src/main/frontend/img/*.svg',
35-
output: 'src/main/xar-resources/resources/images/'
35+
output: 'target/generated-resources/gulp/xar-resources/resources/images/'
3636
},
3737
copy: {
3838
input: 'src/main/frontend/copy/**',
39-
output: 'src/main/xar-resources/resources/'
39+
output: 'target/generated-resources/gulp/xar-resources/resources/'
4040
},
4141
vendor: {
4242
input: 'node_modules/',
43-
output: 'src/main/xar-resources/resources/'
43+
output: 'target/generated-resources/gulp/xar-resources/resources/'
4444
},
4545
fonts: {
46-
output: 'src/main/xar-resources/resources/fonts/'
46+
output: 'target/generated-resources/gulp/xar-resources/resources/fonts/'
4747
},
4848
xml: {
4949
listings: 'src/main/xar-resources/data/*/listings/*.xml',

xar-assembly.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,19 @@
7777
</fileSet>
7878
<fileSet>
7979
<directory>${project.build.outputDirectory}</directory>
80+
<excludes>
81+
<!--
82+
These are not needed from this fileSet,
83+
instead they are taken from the fileSet
84+
of the Gulp transform output in ${project.build.directory}/generated-resources/gulp/xar-resources
85+
see the fileSet below.
86+
-->
87+
<exclude>**.js</exclude>
88+
<exclude>**.css</exclude>
89+
</excludes>
90+
</fileSet>
91+
<fileSet>
92+
<directory>${project.build.directory}/generated-resources/gulp/xar-resources</directory>
8093
</fileSet>
8194
</fileSets>
8295

0 commit comments

Comments
 (0)