diff --git a/build/BuildBelle.bat b/build/BuildBelle.bat index 7fb1725cb2..fe06f81587 100644 --- a/build/BuildBelle.bat +++ b/build/BuildBelle.bat @@ -26,7 +26,7 @@ ECHO Do npm install and the grunt build of Belle call npm cache clean --quiet call npm install --quiet call npm install -g gulp-cli --quiet -call gulp --buildversion=%release% +call gulp ECHO Move back to the build folder CD %buildFolder% \ No newline at end of file diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js index 0be14c1b08..644adfc718 100644 --- a/src/Umbraco.Web.UI.Client/gulpfile.js +++ b/src/Umbraco.Web.UI.Client/gulpfile.js @@ -75,28 +75,29 @@ var sources = { //selectors for copying all views into the build //processed in the views task views:{ - umbraco: {files: ["src/views/**/*html"], folder: "/"}, + umbraco: {files: ["src/views/**/*html"], folder: ""}, preview: { files: ["src/canvasdesigner/**/*.html"], folder: "../preview"}, - installer: {files: ["src/installer/steps/*.html"], folder: "/install"} + installer: {files: ["src/installer/steps/*.html"], folder: "install"} }, //globs for file-watching globs:{ - views: "src/views/**/*html", - less: "src/less*.less", - js: "src/*.js", - lib: "lib/**/*.*, lib-bower/**/*.*", - assets: "src/assets/**" + views: "./src/views/**/*.html", + less: "./src/less/**/*.less", + js: "./src/*.js", + lib: "./lib/**/*", + bower: "./lib-bower/**/*", + assets: "./src/assets/**" } }; -var root = "../Umbraco.Web.UI/umbraco/"; +var root = "../Umbraco.Web.UI/Umbraco/"; var targets = { - js: "js", - lib: "lib", - views: "views", - css: "assets/css", - assets: "assets" + js: "js/", + lib: "lib/", + views: "views/", + css: "assets/css/", + assets: "assets/" }; @@ -120,13 +121,13 @@ gulp.task('dependencies', function () { //Tinymce stream.add( - gulp.src("bower_components/tinymce/plugins/**") + gulp.src("./bower_components/tinymce/plugins/**") .pipe(gulp.dest(root + targets.lib + "/tinymce/plugins/")) ); //font-awesome stream.add( - gulp.src("bower_components/font-awesome/{fonts,css}/*") + gulp.src("./bower_components/font-awesome/{fonts,css}/*") .pipe(gulp.dest(root + targets.lib + "/font-awesome")) ); @@ -137,6 +138,11 @@ gulp.task('dependencies', function () { .pipe(gulp.dest(root + targets.lib)) ); + stream.add( + gulp.src(sources.globs.bower) + .pipe(gulp.dest(root + targets.lib)) + ); + //Copies all static assets into /root / assets folder //css, fonts and image files stream.add( @@ -193,9 +199,11 @@ gulp.task('views', function () { _.forEach(sources.views, function (group) { + console.log("copying " + group.files + " to " + root + targets.views + group.folder) + stream.add ( gulp.src(group.files) - .pipe(gulp.dest(root + targets.views + group.folder)) + .pipe( gulp.dest(root + targets.views + group.folder) ) ); }); @@ -233,10 +241,8 @@ gulp.task('watch', defaultTasks, function () { watch(sources.globs.less, { ignoreInitial: true }, function () { gulp.run(['less']); }) - ); - //watch all views - copy single file changes stream.add( watch(sources.globs.views)