Skip to content

Commit

Permalink
updated for karma
Browse files Browse the repository at this point in the history
  • Loading branch information
stritti committed Jan 6, 2016
1 parent 74417a3 commit 9e0bf78
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 7 deletions.
9 changes: 5 additions & 4 deletions log4js/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ module.exports = function (grunt) {
compress: {
main: {
options: {
archive: 'target/<%= pkg.name %>.zip',
archive: 'target/<%= pkg.name %>-<%= pkg.version %>.zip',
mode: 'zip'
},
files: [
Expand All @@ -107,7 +107,7 @@ module.exports = function (grunt) {
build: {
src: ["src/main/js/**/*.js"],
options: {
destination: "target/docs/"
destination: "target/files//<%= pkg.name %>/docs/"
}
}
},
Expand All @@ -116,7 +116,7 @@ module.exports = function (grunt) {
*/
clean: {
build: {
src: ['target/files/<%= pkg.name %>/']
src: ['target/']
},
deploy: {
src: ['../xampp/htdocs/<%= pkg.name %>/']
Expand Down Expand Up @@ -161,6 +161,7 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-karma');
grunt.loadNpmTasks('grunt-jsdoc');

grunt.loadTasks('tasks');
Expand All @@ -170,7 +171,7 @@ module.exports = function (grunt) {
* Run `grunt build` on the command line
* This will generate ZIP-Archive with all required artifacts.
*/
grunt.registerTask('build', ['concat:build', 'uglify', 'compress', 'karma']
grunt.registerTask('build', ['concat:build', 'uglify', 'jsdoc', 'compress', 'karma']
);
/**
* Default task
Expand Down
5 changes: 5 additions & 0 deletions log4js/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
auxiliary.org-netbeans-modules-javascript-grunt.action_2e_build=build
auxiliary.org-netbeans-modules-javascript-grunt.action_2e_clean=clean
auxiliary.org-netbeans-modules-javascript-grunt.action_2e_rebuild=clean build
auxiliary.org-netbeans-modules-javascript-grunt.action_2e_run=run
auxiliary.org-netbeans-modules-javascript-grunt.action_2e_test=test
auxiliary.org-netbeans-modules-web-clientproject-api.js_2e_libs_2e_folder=js/libs
files.encoding=UTF-8
site.root.folder=
Expand Down
9 changes: 9 additions & 0 deletions log4js/nbproject/project.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.web.clientproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/clientside-project/1">
<name>log4js</name>
</data>
</configuration>
</project>
3 changes: 2 additions & 1 deletion log4js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,15 @@
"chai": "^2.2.0",
"grunt": "~0.4.1",
"grunt-contrib-clean": "^0.5.0",
"grunt-contrib-compress": "0.13.0",
"grunt-contrib-compress": "0.14.0",
"grunt-contrib-concat": "^0.5.1",
"grunt-contrib-copy": "^0.5.0",
"grunt-contrib-cssmin": "^0.9.0",
"grunt-contrib-jshint": "^0.10.0",
"grunt-contrib-uglify": "^0.4.0",
"grunt-contrib-watch": "~0.5.3",
"grunt-jsdoc": "^0.5.8",
"grunt-karma": "^0.12.1",
"karma": "^0.13.18",
"karma-firefox-launcher": "^0.1.4",
"karma-mocha": "^0.1.10",
Expand Down
1 change: 0 additions & 1 deletion log4js/src/main/js/appenders/file.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
*
* @extends Log4js.Appender
* @constructor
* @param logger log4js instance this appender is attached to
* @param file file log messages will be written to
* @author Seth Chisamore
* @author Nicolas Justin [email protected]
Expand Down
2 changes: 1 addition & 1 deletion log4js/src/main/js/log4js.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
*
* @version 1.0.0
* @author Stephan Strittmatter - https://github.com/stritti
* @author Seth Chisamore - http://www.chisamore.com
* @author Seth Chisamore - https://github.com/schisamo
* @since 2005-05-20
* @static
* Website: http://stritti.github.io/log4js/
Expand Down

0 comments on commit 9e0bf78

Please sign in to comment.