Skip to content

Commit

Permalink
transition from psk to opendsu-sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
@asaccool
asaccool committed Oct 26, 2022
1 parent 4b829bc commit f022b64
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 28 deletions.
2 changes: 1 addition & 1 deletion bin/octopusRun.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const octopus = require("octopus/scripts");
const octopusActionsRegistry = require('octopus/ActionsRegistry');
const defaultActionsRegistry = octopusActionsRegistry.getRegistry();

const DEFAULT_PSK_BUNDLES_PATH = "./privatesky/psknode/bundles";
const DEFAULT_PSK_BUNDLES_PATH = "./opendsu-sdk/psknode/bundles";
const path = require("path");
const fs = require("fs");

Expand Down
38 changes: 19 additions & 19 deletions octopus.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
]
},
{
"name": "privatesky",
"src": "http://github.com/privatesky/privatesky.git",
"name": "opendsu-sdk",
"src": "http://github.com/opendsu/opendsu-sdk.git",
"actions": [
{
"type": "smartClone",
Expand All @@ -46,16 +46,16 @@
},
{
"type": "execute",
"cmd": "cd privatesky && npm install"
"cmd": "cd opendsu-sdk && npm install"
}
]
},
{
"name": "build privatesky",
"name": "build opendsu-sdk",
"actions": [
{
"type": "execute",
"cmd": "cd privatesky && npm run build"
"cmd": "cd opendsu-sdk && npm run build"
}
]
},
Expand Down Expand Up @@ -201,7 +201,7 @@
},
{
"name": "dossier-explorer-wallet-prototype",
"src": "https://github.com/PrivateSky/dossier-explorer-wallet-prototype.git",
"src": "https://github.com/opendsu-sdk/dossier-explorer-wallet-prototype.git",
"actions": [
{
"type": "smartClone",
Expand Down Expand Up @@ -298,7 +298,7 @@
},
{
"name": "dossier-explorer-ssapp",
"src": "https://github.com/PrivateSky/dossier-explorer-ssapp.git",
"src": "https://github.com/opendsu/dossier-explorer-ssapp.git",
"actions": [
{
"type": "smartClone",
Expand Down Expand Up @@ -425,15 +425,15 @@
},
{
"type": "copy",
"src": "./privatesky/psknode/bundles/webshims.js",
"src": "./opendsu-sdk/psknode/bundles/webshims.js",
"target": "./apihub-root/bundles/webshims.js",
"options": {
"overwrite": true
}
},
{
"type": "copy",
"src": "./privatesky/psknode/bundles/loaderBoot.js",
"src": "./opendsu-sdk/psknode/bundles/loaderBoot.js",
"target": "./apihub-root/bundles/loaderBoot.js",
"options": {
"overwrite": true
Expand Down Expand Up @@ -951,12 +951,12 @@
},
{
"type": "copy",
"src": "privatesky/psknode/bundles/pskWebServer.js",
"src": "opendsu-sdk/psknode/bundles/pskWebServer.js",
"target": "mobile/scan-app/android/app/src/main/assets/nodejs-project/pskWebServer.js"
},
{
"type": "copy",
"src": "privatesky/psknode/bundles/nodeBoot.js",
"src": "opendsu-sdk/psknode/bundles/nodeBoot.js",
"target": "mobile/scan-app/android/app/src/main/assets/nodejs-project/nodeBoot.js"
},
{
Expand Down Expand Up @@ -1001,17 +1001,17 @@
},
{
"type": "copy",
"src": "./privatesky/psknode/bundles/pskruntime.js",
"src": "./opendsu-sdk/psknode/bundles/pskruntime.js",
"target": "mobile/scan-app/android/app/src/main/assets/nodejs-project/apihub-root/app/scripts/bundles/pskruntime.js"
},
{
"type": "copy",
"src": "./privatesky/psknode/bundles/webshims.js",
"src": "./opendsu-sdk/psknode/bundles/webshims.js",
"target": "mobile/scan-app/android/app/src/main/assets/nodejs-project/apihub-root/app/scripts/bundles/webshims.js"
},
{
"type": "copy",
"src": "./privatesky/psknode/bundles/iframeBoot.js",
"src": "./opendsu-sdk/psknode/bundles/iframeBoot.js",
"target": "mobile/scan-app/android/app/src/main/assets/nodejs-project/apihub-root/app/scripts/bundles/iframeBoot.js"
},
{
Expand Down Expand Up @@ -1043,12 +1043,12 @@
},
{
"type": "copy",
"src": "privatesky/psknode/bundles/pskWebServer.js",
"src": "opendsu-sdk/psknode/bundles/pskWebServer.js",
"target": "mobile/scan-app/ios/PSKNodeServer/PSKNodeServer/nodejsProject/serverFiles/pskWebServer.js"
},
{
"type": "copy",
"src": "privatesky/psknode/bundles/nodeBoot.js",
"src": "opendsu-sdk/psknode/bundles/nodeBoot.js",
"target": "mobile/scan-app/ios/PSKNodeServer/PSKNodeServer/nodejsProject/serverFiles/nodeBoot.js"
},
{
Expand Down Expand Up @@ -1093,17 +1093,17 @@
},
{
"type": "copy",
"src": "./privatesky/psknode/bundles/pskruntime.js",
"src": "./opendsu-sdk/psknode/bundles/pskruntime.js",
"target": "mobile/scan-app/ios/PSKNodeServer/PSKNodeServer/nodejsProject/app/scripts/bundles/pskruntime.js"
},
{
"type": "copy",
"src": "./privatesky/psknode/bundles/webshims.js",
"src": "./opendsu-sdk/psknode/bundles/webshims.js",
"target": "mobile/scan-app/ios/PSKNodeServer/PSKNodeServer/nodejsProject/app/scripts/bundles/webshims.js"
},
{
"type": "copy",
"src": "./privatesky/psknode/bundles/iframeBoot.js",
"src": "./opendsu-sdk/psknode/bundles/iframeBoot.js",
"target": "mobile/scan-app/ios/PSKNodeServer/PSKNodeServer/nodejsProject/app/scripts/bundles/iframeBoot.js"
},
{
Expand Down
10 changes: 4 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,14 @@
"update": "node ./node_modules/octopus/scripts/update",
"bind-app": "node ./node_modules/octopus/scripts/setEnv --file=../../../env.json \"node ./node_modules/octopus/scripts/bind --type=app\"",
"bind-wallet": "node ./node_modules/octopus/scripts/setEnv --file=../../../env.json \"node ./node_modules/octopus/scripts/bind --type=wallet\"",
"server": "node ./node_modules/octopus/scripts/setEnv --file=../../../env.json \"cd privatesky && npm run start\"",
"apihub": "node ./node_modules/octopus/scripts/setEnv --file=../../../env.json \"cd privatesky && npm run start\"",
"switch-to-release": "npm run remove privatesky && npm run add privatesky http://github.com/privatesky/psk-release.git 0",
"switch-to-dev": "npm run remove privatesky && npm run add privatesky http://github.com/privatesky/privatesky.git 0",
"server": "node ./node_modules/octopus/scripts/setEnv --file=../../../env.json \"cd opendsu-sdk && npm run start\"",
"apihub": "node ./node_modules/octopus/scripts/setEnv --file=../../../env.json \"cd opendsu-sdk && npm run start\"",
"watch": "node ./bin/watcher/watcher.js",
"tests": "npm run test",
"test": "node ./privatesky/bin/scripts/testrunner.js --config=./test-suites.json",
"test": "node ./opendsu-sdk/bin/scripts/testrunner.js --config=./test-suites.json",
"clean": "node ./bin/clean.js ./",
"create-did": "node ./bin/createKeyDID.js ./",
"clean-build": "npm run clean && npm run build privatesky && npm run build-all",
"clean-build": "npm run clean && npm run build opendsu-sdk && npm run build-all",
"freeze": "node ./node_modules/octopus/scripts/freeze dependencies install-mobile",
"tag-freeze": "node ./node_modules/octopus/scripts/tagFreeze dependencies install-mobile",
"start-backoffice-backend": "cd acdc/backoffice-backend && npm run start",
Expand Down
2 changes: 1 addition & 1 deletion reporting-service/octopus.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"actions": [
{
"type": "execute",
"cmd": "node ../privatesky/psknode/bin/scripts/pskbuild.js --source=./../ --projectMap=./build/build.json --prod=true --output=./build/bundles"
"cmd": "node ../opendsu-sdk/psknode/bin/scripts/pskbuild.js --source=./../ --projectMap=./build/build.json --prod=true --output=./build/bundles"
},
{
"type": "remove",
Expand Down
2 changes: 1 addition & 1 deletion webcardinal/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"license": "MIT",
"version": "1.0.0",
"scripts": {
"build": "node ./node_modules/octopus/scripts/buildDSU.js --bundles=./../privatesky/psknode/bundles"
"build": "node ./node_modules/octopus/scripts/buildDSU.js --bundles=./../opendsu-sdk/psknode/bundles"
},
"dependencies": {
"octopus": "git+https://github.com/PrivateSky/octopus.git"
Expand Down

0 comments on commit f022b64

Please sign in to comment.