Skip to content

Commit

Permalink
Big mess fixed!
Browse files Browse the repository at this point in the history
  • Loading branch information
daylerees committed Sep 6, 2014
1 parent 6f290eb commit 86a700e
Show file tree
Hide file tree
Showing 60 changed files with 910 additions and 2,525 deletions.
11 changes: 10 additions & 1 deletion build.xml
Expand Up @@ -6,19 +6,28 @@
<delete dir="${basedir}/node_modules"/>
</target>

<!-- Download and install composer. -->
<target name="composer">
<get src="https://getcomposer.org/composer.phar" dest="${basedir}/composer.phar" />
<exec dir="${basedir}" executable="php" failonerror="true">
<arg line="composer.phar update --ansi"></arg>
</exec>
</target>

<!-- Install NPM modules. -->
<target name="npm">
<exec dir="${basedir}" executable="npm" failonerror="true">
<arg line="install --ansi"></arg>
</exec>
</target>

<!-- Run Gulp -->
<target name="gulp">
<exec dir="${basedir}" executable="node" failonerror="true">
<arg line="node_modules/gulp/bin/gulp.js --ansi"></arg>
</exec>
</target>

<!-- Execute the build process. -->
<target name="build" depends="clean,composer,npm"/>
<target name="build" depends="clean,composer,npm,gulp"/>
</project>
29 changes: 21 additions & 8 deletions gulpfile.js
@@ -1,10 +1,11 @@
/**
* Gulp Modules.
*/
var gulp = require('gulp');
var less = require('gulp-less');
var path = require('path');
var del = require('del');
var gulp = require('gulp');
var less = require('gulp-less');
var path = require('path');
var del = require('del');
var cssmin = require('gulp-cssmin')

/**
* Set path to resources directory.
Expand All @@ -15,7 +16,7 @@ var resources = './resources/';
* Remove old generated content.
*/
gulp.task('clean', function(cb) {
del([resources + 'dist', resources + 'css'], cb);
del(['public/*'], cb);
});

/**
Expand All @@ -26,13 +27,25 @@ gulp.task('less', function () {
.pipe(less({
paths: [ path.join(__dirname, 'less', 'includes') ]
}))
.pipe(gulp.dest(resources + 'dist'));
gulp.src(resources + 'fonts/*').pipe(gulp.dest(resources + 'dist/'));
.pipe(cssmin().on('error', function(err) {
console.log(err);
}))
.pipe(gulp.dest('public/'));
gulp.src(resources + 'fonts/*').pipe(gulp.dest('public/fonts/'));
gulp.src(resources + 'img/*').pipe(gulp.dest('public/img/'));
});

/**
* Move static assets.
*/
gulp.task('move', function () {
gulp.src(resources + 'fonts/*').pipe(gulp.dest('public/fonts/'));
gulp.src(resources + 'img/*').pipe(gulp.dest('public/img/'));
});

/**
* Default Gulp Task.
*/
gulp.task('default', ['clean'], function() {
gulp.start('less');
gulp.start('less', 'move');
});
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -28,6 +28,7 @@
"dependencies": {
"del": "^0.1.2",
"gulp": "^3.8.7",
"gulp-cssmin": "^0.1.6",
"gulp-less": "^1.3.5"
}
}
4 changes: 4 additions & 0 deletions public/default.css

Large diffs are not rendered by default.

0 comments on commit 86a700e

Please sign in to comment.