diff --git a/client/GruntFile.js b/client/GruntFile.js index 831d90d9fe5..195a2df0f8e 100644 --- a/client/GruntFile.js +++ b/client/GruntFile.js @@ -2,15 +2,15 @@ module.exports = function(grunt) { "use strict"; var GALAXY_PATHS = { - dist : '../static/scripts', - maps : '../static/maps', + dist : '../lib/galaxy/web/framework/static/scripts', + maps : '../lib/galaxy/web/framework/static/maps', // this symlink allows us to serve uncompressed scripts in DEV_PATH for use with sourcemaps - srcSymlink : '../static/src', + srcSymlink : '../lib/galaxy/web/framework/static/src', }, TOOLSHED_PATHS = { - dist : '../static/toolshed/scripts', - maps : '../static/toolshed/maps', - srcSymlink : '../static/toolshed/src', + dist : '../lib/galaxy/web/framework/static/toolshed/scripts', + maps : '../lib/galaxy/web/framework/static/toolshed/maps', + srcSymlink : '../lib/galaxy/web/framework/static/toolshed/src', }; grunt.config.set( 'app', 'galaxy' ); diff --git a/client/grunt-tasks/style.js b/client/grunt-tasks/style.js index 1ae7b3a27ee..3e1173dcec0 100644 --- a/client/grunt-tasks/style.js +++ b/client/grunt-tasks/style.js @@ -9,8 +9,8 @@ module.exports = function( grunt ){ var _ = grunt.util._, fmt = _.sprintf, theme = grunt.option( 'theme', 'blue' ), - styleDistPath = '../static/style/blue', - imagesPath = '../static/images', + styleDistPath = '../lib/galaxy/web/framework/static/style/blue', + imagesPath = '../lib/galaxy/web/framework/static/images', lessPath = './galaxy/style/less', lessFiles = [ 'base', diff --git a/client/webpack.config.js b/client/webpack.config.js index 3cc66c385d6..0307e25ff67 100644 --- a/client/webpack.config.js +++ b/client/webpack.config.js @@ -39,7 +39,7 @@ module.exports = { analysis: './galaxy/scripts/apps/analysis.js', }, output : { - path : '../static/scripts/bundled', + path : '../lib/galaxy/web/framework/static/scripts/bundled', filename : '[name].bundled.js' }, resolve : {