From 15e97e8a96ad8f2c7eaabfd39c6b888a2b34975c Mon Sep 17 00:00:00 2001 From: Mario Romano Date: Mon, 25 Jul 2016 18:25:09 +0100 Subject: [PATCH] #463 fix scripts and build --- .travis.yml | 7 ++++--- appveyor.yml | 7 +++++++ .../ng2-activiti-processlist/package.json | 2 +- .../ng2-activiti-tasklist/package.json | 2 +- .../ng2-alfresco-webscript/package.json | 2 +- ng2-components/update.sh | 12 ++++++++++++ scripts/npm-clean.sh | 1 + scripts/npm-link-demo-shell.sh | 16 +++++++++++++++- scripts/npm-publish.sh | 1 + scripts/update-version.sh | 2 ++ 10 files changed, 45 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index a65574b973..90d9e5ed1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,22 +26,23 @@ env: - MODULE=ng2-alfresco-search - MODULE=ng2-alfresco-upload - MODULE=ng2-alfresco-viewer - - MODULE=ng2-activiti-form - MODULE=ng2-alfresco-webscript + - MODULE=ng2-activiti-form - MODULE=ng2-activiti-processlist + - MODULE=ng2-activiti-tasklist before_script: - if ([ "$MODULE" != "ng2-alfresco-core" ] && [ "$MODULE" != "ng2-alfresco-viewer" ]); then (cd ng2-components/ng2-alfresco-core; npm install; npm link); fi - - if ([ "$MODULE" == "ng2-alfresco-documentlist" ] || [ "$MODULE" == "ng2-alfresco-webscript" ] || [ "$MODULE" == "ng2-activiti-processlist" ]); then + - if ([ "$MODULE" == "ng2-alfresco-documentlist" ] || [ "$MODULE" == "ng2-alfresco-webscript" ] || [ "$MODULE" == "ng2-activiti-processlist" ] || [ "$MODULE" == "ng2-activiti-tasklist" ]); then (cd ng2-components/ng2-alfresco-datatable; npm link ng2-alfresco-core; npm install; npm link); fi - cd ng2-components/$MODULE; - if ([ "$MODULE" != "ng2-alfresco-core" ] && [ "$MODULE" != "ng2-alfresco-viewer" ]); then npm link ng2-alfresco-core; fi - - if ([ "$MODULE" == "ng2-alfresco-documentlist" ] || [ "$MODULE" == "ng2-alfresco-webscript" ] || [ "$MODULE" == "ng2-activiti-processlist" ]); then + - if ([ "$MODULE" == "ng2-alfresco-documentlist" ] || [ "$MODULE" == "ng2-alfresco-webscript" ] || [ "$MODULE" == "ng2-activiti-processlist" ] || [ "$MODULE" == "ng2-activiti-tasklist" ]); then npm link ng2-alfresco-datatable; fi - npm install; diff --git a/appveyor.yml b/appveyor.yml index d952249c71..4ccb4f1dfe 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,6 +15,9 @@ environment: - COMPONENT_NAME: ng2-alfresco-upload - COMPONENT_NAME: ng2-alfresco-viewer - COMPONENT_NAME: ng2-alfresco-webscript + - COMPONENT_NAME: ng2-activiti-form + - COMPONENT_NAME: ng2-activiti-tasklist + - COMPONENT_NAME: ng2-activiti-processlist # Install scripts. (runs after repo cloning) install: @@ -23,10 +26,14 @@ install: # install module - IF %COMPONENT_NAME% NEQ ng2-alfresco-core (cd ng2-components/ng2-alfresco-core && npm install && npm link && cd ../../) - IF %COMPONENT_NAME% EQU ng2-alfresco-documentlist (cd ng2-components/ng2-alfresco-datatable && npm link ng2-alfresco-core && npm install && npm link && cd ../../) + - IF %COMPONENT_NAME% EQU ng2-activiti-processlist (cd ng2-components/ng2-alfresco-datatable && npm link ng2-alfresco-core && npm install && npm link && cd ../../) + - IF %COMPONENT_NAME% EQU ng2-activiti-tasklist (cd ng2-components/ng2-alfresco-datatable && npm link ng2-alfresco-core && npm install && npm link && cd ../../) - IF %COMPONENT_NAME% EQU ng2-alfresco-webscript (cd ng2-components/ng2-alfresco-datatable && npm link ng2-alfresco-core && npm install && npm link && cd ../../) - cd ng2-components/%COMPONENT_NAME% - IF %COMPONENT_NAME% NEQ ng2-alfresco-core (npm link ng2-alfresco-core) - IF %COMPONENT_NAME% EQU ng2-alfresco-documentlist (npm link ng2-alfresco-datatable) + - IF %COMPONENT_NAME% EQU ng2-activiti-processlist (npm link ng2-alfresco-datatable) + - IF %COMPONENT_NAME% EQU ng2-activiti-tasklist (npm link ng2-alfresco-datatable) - IF %COMPONENT_NAME% EQU ng2-alfresco-webscript (npm link ng2-alfresco-datatable) - npm install diff --git a/ng2-components/ng2-activiti-processlist/package.json b/ng2-components/ng2-activiti-processlist/package.json index ca982b4f49..56d9f49c9f 100644 --- a/ng2-components/ng2-activiti-processlist/package.json +++ b/ng2-components/ng2-activiti-processlist/package.json @@ -8,7 +8,7 @@ ], "name": "ng2-activiti-processlist", "description": "Show active processes from the Activiti BPM suite", - "version": "0.1.0", + "version": "0.2.0", "author": "Alfresco Software, Ltd.", "scripts": { "clean": "rimraf dist node_modules typings", diff --git a/ng2-components/ng2-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json index dbc160e03f..2aacdc9a83 100644 --- a/ng2-components/ng2-activiti-tasklist/package.json +++ b/ng2-components/ng2-activiti-tasklist/package.json @@ -71,7 +71,7 @@ "rimraf": "2.5.2", "ng2-translate": "2.2.2", "ng2-alfresco-core": "0.2.0", - "ng2-alfresco-datatable": "0.2.0", + "ng2-alfresco-datatable": "0.2.0", "alfresco-js-api": "^0.1.0" }, "peerDependencies": { diff --git a/ng2-components/ng2-alfresco-webscript/package.json b/ng2-components/ng2-alfresco-webscript/package.json index 4c744ec0dd..c16493d5f9 100644 --- a/ng2-components/ng2-alfresco-webscript/package.json +++ b/ng2-components/ng2-alfresco-webscript/package.json @@ -1,7 +1,7 @@ { "name": "ng2-alfresco-webscript", "description": "Alfresco webscript executor", - "version": "0.1.0", + "version": "0.2.0", "author": "Alfresco Software, Ltd.", "main": "./dist/index.js", "typings": "./dist/index.d.ts", diff --git a/ng2-components/update.sh b/ng2-components/update.sh index bff97d08e7..ee0a6c36ba 100755 --- a/ng2-components/update.sh +++ b/ng2-components/update.sh @@ -2,6 +2,15 @@ (cd ng2-alfresco-core; npm update;) +(cd ng2-activiti-form; npm update;) +(cd ng2-activiti-form/demo; npm update;) + +(cd ng2-activiti-processlist; npm update;) +(cd ng2-activiti-processlist/demo; npm update;) + +(cd ng2-activiti-tasklist; npm update;) +(cd ng2-activiti-tasklist/demo; npm update;) + (cd ng2-alfresco-datatable; npm update;) (cd ng2-alfresco-datatable/demo; npm update;) @@ -19,3 +28,6 @@ (cd ng2-alfresco-viewer; npm update;) (cd ng2-alfresco-viewer/demo; npm update;) + +(cd ng2-alfresco-webscript; npm update;) +(cd ng2-alfresco-webscript/demo; npm update;) diff --git a/scripts/npm-clean.sh b/scripts/npm-clean.sh index 3651ff7ea8..c1d492be4c 100755 --- a/scripts/npm-clean.sh +++ b/scripts/npm-clean.sh @@ -5,6 +5,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" for PACKAGE in \ ng2-activiti-form \ ng2-activiti-processlist \ + ng2-activiti-tasklist \ ng2-alfresco-core \ ng2-alfresco-datatable \ ng2-alfresco-documentlist \ diff --git a/scripts/npm-link-demo-shell.sh b/scripts/npm-link-demo-shell.sh index dcb7d2b2d9..9eb10b0132 100755 --- a/scripts/npm-link-demo-shell.sh +++ b/scripts/npm-link-demo-shell.sh @@ -27,10 +27,23 @@ npm link ng2-alfresco-core npm link ng2-alfresco-datatable npm link +#LINK TASKLIST +echo "====== linking component: ng2-activiti-tasklist =====" +cd "$DIR/../ng2-components/ng2-activiti-tasklist" +npm link ng2-alfresco-core +npm link ng2-alfresco-datatable +npm link + +#LINK PROCESSLIST +echo "====== linking component: ng2-activiti-processlist =====" +cd "$DIR/../ng2-components/ng2-activiti-processlist" +npm link ng2-alfresco-core +npm link ng2-alfresco-datatable +npm link + #LINK ALL THE OTHERS COMPONENTS for PACKAGE in \ ng2-activiti-form \ - ng2-activiti-processlist \ ng2-alfresco-login \ ng2-alfresco-search \ ng2-alfresco-upload \ @@ -50,6 +63,7 @@ cd "$DIR/../demo-shell-ng2" for PACKAGE in \ ng2-activiti-form \ ng2-activiti-processlist \ + ng2-activiti-tasklist \ ng2-alfresco-core \ ng2-alfresco-datatable \ ng2-alfresco-documentlist \ diff --git a/scripts/npm-publish.sh b/scripts/npm-publish.sh index 3951bd777e..98f4954326 100755 --- a/scripts/npm-publish.sh +++ b/scripts/npm-publish.sh @@ -7,6 +7,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" for PACKAGE in \ ng2-activiti-form \ ng2-activiti-processlist \ + ng2-activiti-tasklist \ ng2-alfresco-core \ ng2-alfresco-datatable \ ng2-alfresco-documentlist \ diff --git a/scripts/update-version.sh b/scripts/update-version.sh index 94e66e9239..11e116989e 100755 --- a/scripts/update-version.sh +++ b/scripts/update-version.sh @@ -17,6 +17,7 @@ fi for PACKAGE in \ ng2-activiti-form \ ng2-activiti-processlist \ + ng2-activiti-tasklist \ ng2-alfresco-core \ ng2-alfresco-datatable \ ng2-alfresco-documentlist \ @@ -34,6 +35,7 @@ done for PACKAGE in \ ng2-activiti-form \ ng2-activiti-processlist \ + ng2-activiti-tasklist \ ng2-alfresco-core \ ng2-alfresco-datatable \ ng2-alfresco-documentlist \