Skip to content

Commit

Permalink
Merge branch 'vrockai-HAWKULAR-40'
Browse files Browse the repository at this point in the history
  • Loading branch information
mtho11 committed Mar 3, 2015
2 parents 9caadd7 + 05be833 commit 2cdec16
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
8 changes: 6 additions & 2 deletions build/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ module.exports = function(gulp, config, pluginName){
gulp.task('tsc-' + pluginName, function() {
var cwd = process.cwd();
var tsResult = gulp.src(config.ts(pluginName))
.pipe(plugins.sourcemaps.init())
.pipe(plugins.typescript(plugins.typescript.createProject({
target: 'ES5',
module: 'commonjs',
Expand All @@ -71,6 +72,7 @@ module.exports = function(gulp, config, pluginName){
}
}))
.pipe(plugins.concat('compiled.js'))
.pipe(plugins.sourcemaps.write())
.pipe(gulp.dest('.tmp/' + pluginName + '/')),

tsResult.dts.pipe(gulp.dest('.tmp/' + pluginName + '/d.ts')))
Expand Down Expand Up @@ -118,12 +120,14 @@ module.exports = function(gulp, config, pluginName){
});

gulp.task('concat-' + pluginName, ['template-' + pluginName], function() {
var license = tslintRules.rules['license-header'][1];
var licenceFile = '.tmp/licence.txt';
fs.writeFileSync(licenceFile, tslintRules.rules['license-header'][1]);

return gulp.src([
licenceFile,
'.tmp/' + pluginName + '/compiled.js',
'.tmp/' + pluginName + '/templates.js'])
.pipe(plugins.concat(config.js(pluginName)))
.pipe(plugins.header(license))
.pipe(gulp.dest(config.dist));
});

Expand Down
1 change: 1 addition & 0 deletions dist/hawkular-ui-components-alerts.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/hawkular-ui-components-inventory.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 1 addition & 7 deletions dist/hawkular-ui-components-metrics.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
"gulp-angular-templatecache": "1.5.0",
"gulp-concat": "2.4.3",
"gulp-connect": "2.2.0",
"gulp-header": "1.2.2",
"gulp-less": "3.0.1",
"gulp-load-plugins": "0.8.0",
"gulp-ng-annotate": "0.5.2",
"gulp-notify": "2.1.0",
"gulp-plumber": "0.6.6",
"gulp-size": "1.2.0",
"gulp-sourcemaps": "1.5.0",
"gulp-tslint": "1.4.3",
"gulp-typescript": "2.4.2",
"gulp-watch": "3.0.0",
Expand Down
2 changes: 1 addition & 1 deletion tslint.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"_check-type"
],
"license-header": [ true,
"/// Copyright 2014-2015 Red Hat, Inc. and/or its affiliates\n/// and other contributors as indicated by the @author tags.\n///\n/// Licensed under the Apache License, Version 2.0 (the \"License\");\n/// you may not use this file except in compliance with the License.\n/// You may obtain a copy of the License at\n///\n/// http://www.apache.org/licenses/LICENSE-2.0\n///\n/// Unless required by applicable law or agreed to in writing, software\n/// distributed under the License is distributed on an \"AS IS\" BASIS,\n/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n/// See the License for the specific language governing permissions and\n/// limitations under the License.\n"
"/// Copyright 2014-2015 Red Hat, Inc. and/or its affiliates\n/// and other contributors as indicated by the @author tags.\n///\n/// Licensed under the Apache License, Version 2.0 (the \"License\");\n/// you may not use this file except in compliance with the License.\n/// You may obtain a copy of the License at\n///\n/// http://www.apache.org/licenses/LICENSE-2.0\n///\n/// Unless required by applicable law or agreed to in writing, software\n/// distributed under the License is distributed on an \"AS IS\" BASIS,\n/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n/// See the License for the specific language governing permissions and\n/// limitations under the License."
]
}
}

0 comments on commit 2cdec16

Please sign in to comment.