Skip to content
This repository has been archived by the owner on Jul 15, 2024. It is now read-only.

fix(gulpfile) reference to configured framework #3

Merged
merged 4 commits into from
Feb 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .dev-tasks.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"packagePrefix": "cmf",
"framework": "cmf.core",
"webAppPrefix" : "cmf.core",
"isWebAppCompilable" : true,
"dependencies" : ["cmf.core.multicast.client", "cmf.style", "cmf.style.dark.blue", "cmf.style.light.blue", "cmf.style.blue", "cmf.style.blue.grey"],
"packages": ["cmf.core.controls","cmf.core.business.controls","cmf.core.dashboards","cmf.core.admin.host","cmf.core.shell","cmf.core.checklist","cmf.core.documents","cmf.core.fablive","cmf.core.examples","cmf.core.admin.i18n"]
"packagePrefix": "",
"framework": "",
"webAppPrefix" : "",
"isWebAppCompilable" : false,
"dependencies" : [],
"packages": []
}
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This repository is meant to be a quick and easy way of getting started with CMF
## Before you start

Make sure:
* node@6.x+ and npm@4.x+ are installed;
* node@8.x+ and npm@5.x+ are installed;
* You have access to the Critical Manufacturing Setup with the version of the HTML5 you want to customize;


Expand All @@ -22,7 +22,7 @@ npm install -g yo

2. Clone this repository into your repository root.

3. Edit the package.json file and replace the name and description of the package for one of your know.
3. Edit the package.json file and replace the name and description of the package.

4. Run:

Expand All @@ -34,4 +34,4 @@ npm install

This package was developed during the [UX-FAB: Universal Experience for Advanced Fabs](http://www.criticalmanufacturing.com/en/r-d/ux-fab) project.

![Portugal2020](http://www.criticalmanufacturing.com/uploads/richtext/images/2017030610420258bd3cfa033c0.png)
![Portugal2020](http://www.criticalmanufacturing.com/uploads/richtext/images/2017030610420258bd3cfa033c0.png)
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var gulp = require('gulp'),
applyOps = null;

if (typeof _framework === "string" && _framework !== "") {
tasks = require("./src/cmf.core/gulpfile.js")(gulp, "cmf.core");
tasks = require("./src/" + _framework + "/gulpfile.js")(gulp, _framework);
}
_dependencies.forEach(function (dep) {
require(_dependenciesPath + dep + "/gulpfile.js")(gulp, dep);
Expand Down