From 9f1b58b67c21353cae7c530cee61c6d7df962bef Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 2 Mar 2016 21:26:37 -0500 Subject: [PATCH] fix up files --- gulpfile.js | 12 ++++++------ installers/Product.wxs | 39 ++++++++++++++++----------------------- installers/candle.rsp | 6 ++++++ installers/heat-web.rsp | 7 +++++++ installers/light.rsp | 9 +++++++++ package.json | 6 ++++-- 6 files changed, 48 insertions(+), 31 deletions(-) create mode 100644 installers/candle.rsp create mode 100644 installers/heat-web.rsp create mode 100644 installers/light.rsp diff --git a/gulpfile.js b/gulpfile.js index c4715ee..ca39a4d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -11,12 +11,12 @@ gulp.task('build', function () { )); }); -gulp.task('carbon', function(){ +gulp.task('carbon',['build'] ,function(cb){ -carbon.exec({ - heatFiles: ["installers/heat-web.rsp"], - candleFiles: ["installers/candle.rsp"], - lightFiles: ["installers/light.rsp"] -}) + carbon.exec({ + heatFiles: ["installers/heat-web.rsp"], + candleFiles: ["installers/candle.rsp"], + lightFiles: ["installers/light.rsp"] + }, cb); }); diff --git a/installers/Product.wxs b/installers/Product.wxs index c0f030e..647e767 100644 --- a/installers/Product.wxs +++ b/installers/Product.wxs @@ -2,10 +2,10 @@ @@ -28,10 +28,7 @@ --> - - - - + @@ -40,23 +37,19 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/installers/candle.rsp b/installers/candle.rsp new file mode 100644 index 0000000..e91e097 --- /dev/null +++ b/installers/candle.rsp @@ -0,0 +1,6 @@ +-dSourceDir=WebApplication9 +-nologo +-out output\installers\web\ +installers\Product.wxs +output\installers\web\web_Files.gen.wxs +-ext WixIisExtension diff --git a/installers/heat-web.rsp b/installers/heat-web.rsp new file mode 100644 index 0000000..edd8e4f --- /dev/null +++ b/installers/heat-web.rsp @@ -0,0 +1,7 @@ +dir WebApplication9 +-nologo +-cg web_files +-gg -scom -sreg -sfrag -srd +-dr Install_Web +-out output\installers\web\web_files.gen.wxs +-var var.SourceDir diff --git a/installers/light.rsp b/installers/light.rsp new file mode 100644 index 0000000..6b28224 --- /dev/null +++ b/installers/light.rsp @@ -0,0 +1,9 @@ +-dSourceDir=WebApplication9 +output\installers\web\web_files.gen.wixobj +output\installers\web\Product.wixobj +-out output\installers\web\Web.msi +-nologo +-sw1076 +-sice:ICE80 +-sice:ICE18 +-ext WixIisExtension diff --git a/package.json b/package.json index bf3df9b..c15e110 100644 --- a/package.json +++ b/package.json @@ -9,9 +9,11 @@ "author": "", "license": "ISC", "dependencies": { - "gulp-nuget-restore": "^0.2.0" + "gulp": "^3.9.1", + "gulp-msbuild": "^0.2.21", + "gulp-nuget-restore": "^0.2.0", + "hydrocarbon": "^0.1.2" }, "devDependencies": { - "gulp-msbuild": "^0.2.21" } }