From 0e242d4ed94d223263431c6cbf46eba36f051351 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Tue, 24 Feb 2026 09:24:52 +0100 Subject: [PATCH 1/2] Create draft PR for #1035 From 7b1c2cc4e330f00d0388ffe0f020ffe1b1941d69 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Tue, 24 Feb 2026 13:23:10 +0100 Subject: [PATCH 2/2] apax all update --- src/abstractions/app/apax.yml | 24 ++- src/components.abb.robotics/app/apax.yml | 24 ++- src/components.abstractions/app/apax.yml | 24 ++- .../app/apax.yml | 24 ++- src/components.cognex.vision/app/apax.yml | 24 ++- .../app/apax.yml | 24 ++- src/components.drives/app/apax.yml | 24 ++- src/components.dukane.welders/app/apax.yml | 24 ++- src/components.elements/app/apax.yml | 24 ++- src/components.festo.drives/app/apax.yml | 24 ++- src/components.keyence.vision/app/apax.yml | 24 ++- src/components.kuka.robotics/app/apax.yml | 24 ++- .../app/apax.yml | 24 ++- src/components.pneumatics/app/apax.yml | 24 ++- src/components.rexroth.drives/app/apax.yml | 24 ++- src/components.rexroth.press/app/apax.yml | 24 ++- .../app/apax.yml | 24 ++- src/components.robotics/app/apax.yml | 24 ++- .../app/apax.yml | 24 ++- .../app/apax.yml | 24 ++- src/components.ur.robotics/app/apax.yml | 24 ++- src/components.zebra.vision/app/apax.yml | 24 ++- src/core/app/apax.yml | 24 ++- src/core/ctrl/src/abstractions/NULLs.st | 4 + src/data/app/apax.yml | 24 ++- .../tests/AXOpen.Data.Tests_L1/ax/apax.yml | 24 ++- .../ax/apax.yml | 24 ++- src/inspectors/app/apax.yml | 24 ++- src/integrations/app/apax.yml | 24 ++- src/io/app/apax.yml | 24 ++- src/probers/app/apax.yml | 24 ++- src/scripts/all.sh | 180 +++++++++++++----- src/scripts/compare_all.sh | 68 +++++++ src/scripts/compile_all.sh | 180 ++++++++++++++++++ src/scripts/compile_all_compare_all.sh | 59 ++++++ src/simatic1500/app/apax.yml | 24 ++- src/template.axolibrary/app/apax.yml | 24 ++- src/timers/app/apax.yml | 24 ++- src/utils/app/apax.yml | 24 ++- 39 files changed, 1195 insertions(+), 112 deletions(-) create mode 100644 src/scripts/compare_all.sh create mode 100644 src/scripts/compile_all.sh create mode 100644 src/scripts/compile_all_compare_all.sh diff --git a/src/abstractions/app/apax.yml b/src/abstractions/app/apax.yml index 517011354..79ecb57ea 100644 --- a/src/abstractions/app/apax.yml +++ b/src/abstractions/app/apax.yml @@ -1,4 +1,4 @@ -name: "abstractions-app" +name: "abstractions-app" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.abb.robotics/app/apax.yml b/src/components.abb.robotics/app/apax.yml index ff35edf0e..5d904b68a 100644 --- a/src/components.abb.robotics/app/apax.yml +++ b/src/components.abb.robotics/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.abb.robotics" +name: "app_axopen.components.abb.robotics" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.abstractions/app/apax.yml b/src/components.abstractions/app/apax.yml index 6bddc5cdc..635e669e8 100644 --- a/src/components.abstractions/app/apax.yml +++ b/src/components.abstractions/app/apax.yml @@ -1,4 +1,4 @@ -name: "components.abstractions-app" +name: "components.abstractions-app" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.balluff.identification/app/apax.yml b/src/components.balluff.identification/app/apax.yml index 7978bae7d..204ee7787 100644 --- a/src/components.balluff.identification/app/apax.yml +++ b/src/components.balluff.identification/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.balluff.identification" +name: "app_axopen.components.balluff.identification" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.cognex.vision/app/apax.yml b/src/components.cognex.vision/app/apax.yml index 118067642..78873d8c2 100644 --- a/src/components.cognex.vision/app/apax.yml +++ b/src/components.cognex.vision/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.cognex.vision" +name: "app_axopen.components.cognex.vision" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.desoutter.tightening/app/apax.yml b/src/components.desoutter.tightening/app/apax.yml index e037ea932..1f72b246b 100644 --- a/src/components.desoutter.tightening/app/apax.yml +++ b/src/components.desoutter.tightening/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.desoutter.tightening" +name: "app_axopen.components.desoutter.tightening" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.drives/app/apax.yml b/src/components.drives/app/apax.yml index 530d0e793..0fda3e96f 100644 --- a/src/components.drives/app/apax.yml +++ b/src/components.drives/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.drives" +name: "app_axopen.components.drives" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.dukane.welders/app/apax.yml b/src/components.dukane.welders/app/apax.yml index 535e89100..6e3fd9a3c 100644 --- a/src/components.dukane.welders/app/apax.yml +++ b/src/components.dukane.welders/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.dukane.welders" +name: "app_axopen.components.dukane.welders" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.elements/app/apax.yml b/src/components.elements/app/apax.yml index 27c03e844..2be314e4d 100644 --- a/src/components.elements/app/apax.yml +++ b/src/components.elements/app/apax.yml @@ -1,4 +1,4 @@ -name: "elementscomponents" +name: "elementscomponents" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.festo.drives/app/apax.yml b/src/components.festo.drives/app/apax.yml index 54907c024..6bf1e6725 100644 --- a/src/components.festo.drives/app/apax.yml +++ b/src/components.festo.drives/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.festo.drives" +name: "app_axopen.components.festo.drives" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.keyence.vision/app/apax.yml b/src/components.keyence.vision/app/apax.yml index 4fe4042c4..1c212eda8 100644 --- a/src/components.keyence.vision/app/apax.yml +++ b/src/components.keyence.vision/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.keyence.vision" +name: "app_axopen.components.keyence.vision" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.kuka.robotics/app/apax.yml b/src/components.kuka.robotics/app/apax.yml index 6a84bc454..5c93a59c6 100644 --- a/src/components.kuka.robotics/app/apax.yml +++ b/src/components.kuka.robotics/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.kuka.robotics" +name: "app_axopen.components.kuka.robotics" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.mitsubishi.robotics/app/apax.yml b/src/components.mitsubishi.robotics/app/apax.yml index 2ff590628..395654fba 100644 --- a/src/components.mitsubishi.robotics/app/apax.yml +++ b/src/components.mitsubishi.robotics/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.mitsubishi.robotics" +name: "app_axopen.components.mitsubishi.robotics" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.pneumatics/app/apax.yml b/src/components.pneumatics/app/apax.yml index 1f321f11f..4718028ef 100644 --- a/src/components.pneumatics/app/apax.yml +++ b/src/components.pneumatics/app/apax.yml @@ -1,4 +1,4 @@ -name: "pneumaticcomponents" +name: "pneumaticcomponents" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.rexroth.drives/app/apax.yml b/src/components.rexroth.drives/app/apax.yml index 6e39ce80d..67477f5bb 100644 --- a/src/components.rexroth.drives/app/apax.yml +++ b/src/components.rexroth.drives/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.rexroth.drives" +name: "app_axopen.components.rexroth.drives" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.rexroth.press/app/apax.yml b/src/components.rexroth.press/app/apax.yml index be0bac678..3f4a94726 100644 --- a/src/components.rexroth.press/app/apax.yml +++ b/src/components.rexroth.press/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.rexroth.press" +name: "app_axopen.components.rexroth.press" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.rexroth.tightening/app/apax.yml b/src/components.rexroth.tightening/app/apax.yml index 4af8f23cd..ed745f843 100644 --- a/src/components.rexroth.tightening/app/apax.yml +++ b/src/components.rexroth.tightening/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.rexroth.tightening" +name: "app_axopen.components.rexroth.tightening" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.robotics/app/apax.yml b/src/components.robotics/app/apax.yml index 86fe6984d..c7dfb2d45 100644 --- a/src/components.robotics/app/apax.yml +++ b/src/components.robotics/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.robotics" +name: "app_axopen.components.robotics" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.siem.communication/app/apax.yml b/src/components.siem.communication/app/apax.yml index 74a8c5937..34b62df26 100644 --- a/src/components.siem.communication/app/apax.yml +++ b/src/components.siem.communication/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.siem.communication" +name: "app_axopen.components.siem.communication" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.siem.identification/app/apax.yml b/src/components.siem.identification/app/apax.yml index 9e1e8d982..091f8eb87 100644 --- a/src/components.siem.identification/app/apax.yml +++ b/src/components.siem.identification/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.siem.identification" +name: "app_axopen.components.siem.identification" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.ur.robotics/app/apax.yml b/src/components.ur.robotics/app/apax.yml index 9474d0707..7cb81c446 100644 --- a/src/components.ur.robotics/app/apax.yml +++ b/src/components.ur.robotics/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.ur.robotics" +name: "app_axopen.components.ur.robotics" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/components.zebra.vision/app/apax.yml b/src/components.zebra.vision/app/apax.yml index 2592106dc..b96e6907b 100644 --- a/src/components.zebra.vision/app/apax.yml +++ b/src/components.zebra.vision/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.components.zebra.vision" +name: "app_axopen.components.zebra.vision" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/core/app/apax.yml b/src/core/app/apax.yml index a281027c7..a3ffe99b7 100644 --- a/src/core/app/apax.yml +++ b/src/core/app/apax.yml @@ -1,4 +1,4 @@ -name: "ix_axopencore" +name: "ix_axopencore" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/core/ctrl/src/abstractions/NULLs.st b/src/core/ctrl/src/abstractions/NULLs.st index a335d74b3..77e380b97 100644 --- a/src/core/ctrl/src/abstractions/NULLs.st +++ b/src/core/ctrl/src/abstractions/NULLs.st @@ -47,6 +47,8 @@ NAMESPACE AXOpen.Core END_METHOD END_CLASS + // Derived interface used, due to compiler issues with interface inheritance. + // https://docs.industrial-operations-x.siemens.cloud/r/en-us/ax/faq/2510/known-issues/casting-error-in-specific-inheritance-relations-when-compiling-to-1500 INTERFACE IAxoNullObject EXTENDS IAxoObject END_INTERFACE /// @@ -156,6 +158,8 @@ NAMESPACE AXOpen.Core END_METHOD END_CLASS + // Derived interface used, due to compiler issues with interface inheritance. + // https://docs.industrial-operations-x.siemens.cloud/r/en-us/ax/faq/2510/known-issues/casting-error-in-specific-inheritance-relations-when-compiling-to-1500 INTERFACE PUBLIC IAxoNullMessagingServices EXTENDS IAxoMessagingServices END_INTERFACE /// diff --git a/src/data/app/apax.yml b/src/data/app/apax.yml index 850a9ca45..62873b75d 100644 --- a/src/data/app/apax.yml +++ b/src/data/app/apax.yml @@ -1,4 +1,4 @@ -name: "axopen.data-app" +name: "axopen.data-app" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/data/tests/AXOpen.Data.Tests_L1/ax/apax.yml b/src/data/tests/AXOpen.Data.Tests_L1/ax/apax.yml index 2e0ffba7e..b15752c46 100644 --- a/src/data/tests/AXOpen.Data.Tests_L1/ax/apax.yml +++ b/src/data/tests/AXOpen.Data.Tests_L1/ax/apax.yml @@ -1,4 +1,4 @@ -name: "axopen.data.tests_l1" +name: "axopen.data.tests_l1" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/data/tests/AXOpen.Repository.Integration.Tests_L4/ax/apax.yml b/src/data/tests/AXOpen.Repository.Integration.Tests_L4/ax/apax.yml index 6bd83093e..2ab1c85a0 100644 --- a/src/data/tests/AXOpen.Repository.Integration.Tests_L4/ax/apax.yml +++ b/src/data/tests/AXOpen.Repository.Integration.Tests_L4/ax/apax.yml @@ -1,4 +1,4 @@ -name: "axopen.integration.tests_l4" +name: "axopen.integration.tests_l4" version: '0.0.0-dev.0' type: app targets: @@ -139,8 +139,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -171,6 +187,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/inspectors/app/apax.yml b/src/inspectors/app/apax.yml index 20302486a..9d73eb004 100644 --- a/src/inspectors/app/apax.yml +++ b/src/inspectors/app/apax.yml @@ -1,4 +1,4 @@ -name: "axopen.inspectors" +name: "axopen.inspectors" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/integrations/app/apax.yml b/src/integrations/app/apax.yml index f46c2146f..a030180a6 100644 --- a/src/integrations/app/apax.yml +++ b/src/integrations/app/apax.yml @@ -1,4 +1,4 @@ -name: "axopen.integrations" +name: "axopen.integrations" version: '0.0.0-dev.0' type: app targets: @@ -142,8 +142,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -174,6 +190,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/io/app/apax.yml b/src/io/app/apax.yml index 849183e80..1ac973640 100644 --- a/src/io/app/apax.yml +++ b/src/io/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_axopen.io" +name: "app_axopen.io" version: '0.0.0-dev.0' type: app targets: @@ -141,8 +141,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -173,6 +189,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/probers/app/apax.yml b/src/probers/app/apax.yml index 476f22f25..31710696d 100644 --- a/src/probers/app/apax.yml +++ b/src/probers/app/apax.yml @@ -1,4 +1,4 @@ -name: "probers-app" +name: "probers-app" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/scripts/all.sh b/src/scripts/all.sh index 1d72d846a..e76227beb 100644 --- a/src/scripts/all.sh +++ b/src/scripts/all.sh @@ -1,9 +1,9 @@ -export GREEN='\033[0;32m' +export GREEN='\033[0;32m' export RED='\033[0;31m' export YELLOW='\033[0;33m' export NC='\033[0m\r\n' # No Color+CRLF -if [ "$#" -ne 7 ]; then - printf "${RED}Usage: $0 \r\n${NC}" +if [ "$#" -ne 8 ]; then + printf "${RED}Usage: $0 \r\n${NC}" exit 1 fi @@ -50,6 +50,15 @@ if [ -z $USE_PLC_SIM_ADVANCED ]; then exit 1 fi + +if [ "$8" = "true" ]; then + echo "Project cerificate is going to overwrite the online one." + FORCE=true +else + echo "Project cerificate is going to be compared with online one." + FORCE=false +fi + PLCSIM=0 case "$(echo "$USE_PLC_SIM_ADVANCED" | tr '[:upper:]' '[:lower:]')" in "true") @@ -65,74 +74,157 @@ case "$(echo "$USE_PLC_SIM_ADVANCED" | tr '[:upper:]' '[:lower:]')" in ;; esac -certfile="./certs/$PLC_NAME/$PLC_NAME.cer" -if ! [[ -e "$certfile" ]]; then - printf "${RED}Certification file $certfile does not exist.\r\n${NC}" - #alf #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw - alf=$( dirname ${BASH_SOURCE[0]})"\\all_first.sh" - $alf $NAMESPACE $PLC_NAME $PLC_IP_ADDRESS $PLATFORM $USERNAME $PASSWORD $USE_PLC_SIM_ADVANCED -else +if [ "$FORCE" = "true" ]; then + certfile="./certs/$PLC_NAME/$PLC_NAME.cer" + if [[ ! -e "$certfile" ]]; then + printf "${RED}Certification file $certfile does not exist.\r\n${NC}" + exit 1 + fi + p12container="./certs/$PLC_NAME/containerWithPublicAndPrivateKeys_x509.p12" + if [[ ! -e "$p12container" ]]; then + printf "${RED}Public private key container file $p12container does not exist.\r\n${NC}" + exit 1 + fi + refFile="./certs/$PLC_NAME/reference_x509.crt" + if [[ ! -e "$refFile" ]]; then + printf "${RED}Reference file $refFile does not exist.\r\n${NC}" + exit 1 + fi + check_requisites_apax_script=$( dirname ${BASH_SOURCE[0]})"\\check_requisites_apax.sh" if ! $check_requisites_apax_script ; then exit 1 fi - + check_requisites_nuget_script=$( dirname ${BASH_SOURCE[0]})"\\check_requisites_nuget.sh" if ! $check_requisites_nuget_script ; then exit 1 fi - + check_requisites_custom_registry_script=$( dirname ${BASH_SOURCE[0]})"\\check_requisites_custom_registry.sh" if ! $check_requisites_custom_registry_script ; then exit 1 fi - + if [ "$PLCSIM" -eq 1 ]; then plcsim_script=$( dirname ${BASH_SOURCE[0]})"\\plcsimadvanced.sh" $plcsim_script $NAMESPACE $PLC_NAME $PLC_IP_ADDRESS fi - #apax run ci # clean and install dependencies - apax clean - apax install --catalog - apax install + #copy_and_install_gsd # copy and install all gsdml files from library + copy_and_install_gsd=$( dirname ${BASH_SOURCE[0]})"\\copy_and_install_gsd.sh" + $copy_and_install_gsd + if [[ $? -eq 0 ]]; then + printf "${GREEN}Gsdml files installed succesfully.${NC}" + else + printf "${RED}Installation of the gsdml files finished with an error!${NC}\n" + printf "${RED}Please check the details above.${NC}\n" + exit 1 + fi - is_cert_hash_sha1_equal_script=$( dirname ${BASH_SOURCE[0]})"\\is_cert_hash_sha1_equal.sh" + #copy_hwl_templates # copy all templates from library + copy_hwl_templates=$( dirname ${BASH_SOURCE[0]})"\\copy_hwl_templates.sh" + $copy_hwl_templates + if [[ $? -eq 0 ]]; then + printf "${GREEN}Copying hardware templates from the libraries finished succesfully.${NC}" + else + printf "${RED}Copying hardware templates from the libraries finished with an error!${NC}\n" + printf "${RED}Please check the details above.${NC}\n" + exit 1 + fi - if ! $is_cert_hash_sha1_equal_script "$PLC_NAME" "$PLC_IP_ADDRESS"; then - printf "${RED}Certification file $certfile exists, but its sha1 hash is different to the PLC's one.\r\n" - printf "${RED}It has to be regenerated again.\r\n${NC}" - #alf #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw -# alf=$( dirname ${BASH_SOURCE[0]})"\\all_first.sh" -# $alf $NAMESPACE $PLC_NAME $PLC_IP_ADDRESS $PLATFORM $USERNAME $PASSWORD $USE_PLC_SIM_ADVANCED + #hw_first_compile_and_first_download # compile, copy the HwIds, first download HW using password and upload certificate + hw_first_compile_and_first_download=$( dirname ${BASH_SOURCE[0]})"\\hw_first_compile_and_first_download.sh" + $hw_first_compile_and_first_download $NAMESPACE $PLC_NAME $PLC_IP_ADDRESS $USERNAME $PASSWORD + if [[ $? -eq 0 ]]; then + printf "${GREEN}Hardware configuration has been succesfully compiled and downloaded.${NC}" else - - printf "${GREEN}Certification file $certfile exists and its sha1 hash is equal to the PLC's one.\r\n" - printf "${GREEN}No prompt will popup during execution, so you could leave your PC and enjoy your coffee now.\r\n${NC}" + printf "${RED}Compilation of the hardware configuration or its downloaded finished with an error!${NC}\n" + printf "${RED}Please check the details above.${NC}\n" + exit 1 + fi + #sw_build_and_download_full # software build and full download + sw_build_and_download_full=$( dirname ${BASH_SOURCE[0]})"\\sw_build_and_download_full.sh" + $sw_build_and_download_full $PLC_NAME $PLC_IP_ADDRESS $PLATFORM $USERNAME $PASSWORD + if [[ $? -eq 0 ]]; then + printf "${GREEN}Software has been succesfully compiled and downloaded.${NC}" + else + printf "${RED}Compilation of the software or its downloaded finished with an error!${NC}\n" + printf "${RED}Please check the details above.${NC}\n" + exit 1 + fi - #hw_update # copy and install gsd, copy templates, compile, copy the HwIds, download HW using certificate - hw_update=$( dirname ${BASH_SOURCE[0]})"\\hw_update.sh" - $hw_update $NAMESPACE $PLC_NAME $PLC_IP_ADDRESS $USERNAME $PASSWORD - if [[ $? -eq 0 ]]; then - printf "${GREEN}Hardware configuration has been succesfully compiled and downloaded.${NC}" - else - printf "${RED}Compilation of the hardware configuration or its downloaded finished with an error!${NC}\n" - printf "${RED}Please check the details above.${NC}\n" +else + certfile="./certs/$PLC_NAME/$PLC_NAME.cer" + if [[ ! -e "$certfile" ]]; then + printf "${RED}Certification file $certfile does not exist.\r\n${NC}" + #alf #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw + alf=$( dirname ${BASH_SOURCE[0]})"\\all_first.sh" + $alf $NAMESPACE $PLC_NAME $PLC_IP_ADDRESS $PLATFORM $USERNAME $PASSWORD $USE_PLC_SIM_ADVANCED + else + + check_requisites_apax_script=$( dirname ${BASH_SOURCE[0]})"\\check_requisites_apax.sh" + if ! $check_requisites_apax_script ; then exit 1 fi - #sw_build_and_download_full # software build and full download - sw_build_and_download_full=$( dirname ${BASH_SOURCE[0]})"\\sw_build_and_download_full.sh" - $sw_build_and_download_full $PLC_NAME $PLC_IP_ADDRESS $PLATFORM $USERNAME $PASSWORD - if [[ $? -eq 0 ]]; then - printf "${GREEN}Software has been succesfully compiled and downloaded.${NC}" - else - printf "${RED}Compilation of the software or its downloaded finished with an error!${NC}\n" - printf "${RED}Please check the details above.${NC}\n" + check_requisites_nuget_script=$( dirname ${BASH_SOURCE[0]})"\\check_requisites_nuget.sh" + if ! $check_requisites_nuget_script ; then exit 1 fi - fi + + check_requisites_custom_registry_script=$( dirname ${BASH_SOURCE[0]})"\\check_requisites_custom_registry.sh" + if ! $check_requisites_custom_registry_script ; then + exit 1 + fi + + if [ "$PLCSIM" -eq 1 ]; then + plcsim_script=$( dirname ${BASH_SOURCE[0]})"\\plcsimadvanced.sh" + $plcsim_script $NAMESPACE $PLC_NAME $PLC_IP_ADDRESS + fi + + #apax run ci # clean and install dependencies + apax clean + apax install --catalog + apax install + + is_cert_hash_sha1_equal_script=$( dirname ${BASH_SOURCE[0]})"\\is_cert_hash_sha1_equal.sh" + + if ! $is_cert_hash_sha1_equal_script "$PLC_NAME" "$PLC_IP_ADDRESS"; then + printf "${RED}Certification file $certfile exists, but its sha1 hash is different to the PLC's one.\r\n" + printf "${RED}It has to be regenerated again.\r\n${NC}" + #alf #clear plc except ip and name and provide all actions for install all, build and initial download hw so as sw + alf=$( dirname ${BASH_SOURCE[0]})"\\all_first.sh" + $alf $NAMESPACE $PLC_NAME $PLC_IP_ADDRESS $PLATFORM $USERNAME $PASSWORD $USE_PLC_SIM_ADVANCED + else + + printf "${GREEN}Certification file $certfile exists and its sha1 hash is equal to the PLC's one.\r\n" + printf "${GREEN}No prompt will popup during execution, so you could leave your PC and enjoy your coffee now.\r\n${NC}" + + #hw_update # copy and install gsd, copy templates, compile, copy the HwIds, download HW using certificate + hw_update=$( dirname ${BASH_SOURCE[0]})"\\hw_update.sh" + $hw_update $NAMESPACE $PLC_NAME $PLC_IP_ADDRESS $USERNAME $PASSWORD + if [[ $? -eq 0 ]]; then + printf "${GREEN}Hardware configuration has been succesfully compiled and downloaded.${NC}" + else + printf "${RED}Compilation of the hardware configuration or its downloaded finished with an error!${NC}\n" + printf "${RED}Please check the details above.${NC}\n" + exit 1 + fi + + #sw_build_and_download_full # software build and full download + sw_build_and_download_full=$( dirname ${BASH_SOURCE[0]})"\\sw_build_and_download_full.sh" + $sw_build_and_download_full $PLC_NAME $PLC_IP_ADDRESS $PLATFORM $USERNAME $PASSWORD + if [[ $? -eq 0 ]]; then + printf "${GREEN}Software has been succesfully compiled and downloaded.${NC}" + else + printf "${RED}Compilation of the software or its downloaded finished with an error!${NC}\n" + printf "${RED}Please check the details above.${NC}\n" + exit 1 + fi + fi + fi fi diff --git a/src/scripts/compare_all.sh b/src/scripts/compare_all.sh new file mode 100644 index 000000000..cda05b952 --- /dev/null +++ b/src/scripts/compare_all.sh @@ -0,0 +1,68 @@ +export GREEN='\033[0;32m' +export RED='\033[0;31m' +export YELLOW='\033[0;33m' +export NC='\033[0m\r\n' # No Color+CRLF + +if [ "$#" -ne 5 ]; then + printf "${RED}Usage: $0 .${NC}" + exit 1 +fi + +PLC_NAME=$1 +if [ -z $PLC_NAME ]; then + printf "${RED}The PLC_NAME could not be an empty string.${NC}" + exit 1 +fi + +PLC_IP_ADDRESS=$2 +validate_script=$( dirname ${BASH_SOURCE[0]})"\\validate_ip.sh" +if ! $validate_script "$PLC_IP_ADDRESS"; then + printf "${RED}The PLC_IP_ADDRESS '$PLC_IP_ADDRESS' is not a valid IP address.${NC}" + exit 1 +fi + +PLATFORM=$3 +if [ -z $PLATFORM ]; then + printf "${RED}The PLATFORM could not be an empty string.${NC}" + exit 1 +fi + +USERNAME=$4 +if [ -z $USERNAME ]; then + printf "${RED}The USERNAME could not be an empty string.\r\n${NC}" + exit 1 +fi + +PASSWORD=$5 +if [ -z $PASSWORD ]; then + printf "${RED}The PASSWORD could not be an empty string.\r\n${NC}" + exit 1 +fi + +certfile="./certs/$PLC_NAME/$PLC_NAME.cer" +if ! [[ -e "$certfile" ]]; then + printf "${RED}Certification file $certfile does not exist!!!${NC}" + exit 1 +fi +result_file=".\online_offline_compare_result.txt" +if [ -f "$result_file" ] ; then + rm "$result_file" +fi + +apax sld compare --mode all --target $PLC_IP_ADDRESS --input $PLATFORM --username $USERNAME --password $PASSWORD --certificate $certfile --log Information | tee $result_file +exit_code=${PIPESTATUS[0]} +echo "exit_code: $exit_code" + +if [[ $exit_code -eq 0 ]]; then + printf "${GREEN}The compiled software and loaded one are identical.${NC}" +elif [[ $exit_code -eq 9 ]]; then + printf "${YELLOW}At least one code block is different between the compiled software and loaded one.${NC}" +elif [[ $exit_code -eq 10 ]]; then + printf "${YELLOW}At least one data block is different between the compiled software and loaded one.${NC}" +elif [[ $exit_code -eq 11 ]]; then + printf "${YELLOW}At least one code block and one data block are different the compiled software and loaded one.${NC}" +else + printf "${RED}Unspecified return code during comparing!${NC}\n" + printf "${RED}Please check the details above.${NC}\n" + exit 1 +fi \ No newline at end of file diff --git a/src/scripts/compile_all.sh b/src/scripts/compile_all.sh new file mode 100644 index 000000000..15ee8a87d --- /dev/null +++ b/src/scripts/compile_all.sh @@ -0,0 +1,180 @@ +export GREEN='\033[0;32m' +export RED='\033[0;31m' +export YELLOW='\033[0;33m' +export NC='\033[0m\r\n' # No Color+CRLF +if [ "$#" -ne 7 ]; then + printf "${RED}Usage: $0 \r\n${NC}" + exit 1 +fi + +NAMESPACE=$1 +if [ -z $NAMESPACE ]; then + printf "${RED}The NAMESPACE could not be an empty string.\r\n${NC}" + exit 1 +fi + +PLC_NAME=$2 +if [ -z $PLC_NAME ]; then + printf "${RED}The PLC_NAME could not be an empty string.\r\n${NC}" + exit 1 +fi + +PLC_IP_ADDRESS=$3 +validate_script=$( dirname ${BASH_SOURCE[0]})"\\validate_ip.sh" +if ! $validate_script "$PLC_IP_ADDRESS"; then + printf "${RED}The PLC_IP_ADDRESS '$PLC_IP_ADDRESS' is not a valid IP address.\r\n${NC}" + exit 1 +fi + +PLATFORM=$4 +if [ -z $PLATFORM ]; then + printf "${RED}The PLATFORM could not be an empty string.\r\n${NC}" + exit 1 +fi + +USERNAME=$5 +if [ -z $USERNAME ]; then + printf "${RED}The USERNAME could not be an empty string.\r\n${NC}" + exit 1 +fi + +PASSWORD=$6 +if [ -z $PASSWORD ]; then + printf "${RED}The PASSWORD could not be an empty string.\r\n${NC}" + exit 1 +fi + +USE_PLC_SIM_ADVANCED=$7 +if [ -z $USE_PLC_SIM_ADVANCED ]; then + printf "${RED}The USE_PLC_SIM_ADVANCED could not be an empty string.\r\n${NC}" + exit 1 +fi + +PLCSIM=0 +case "$(echo "$USE_PLC_SIM_ADVANCED" | tr '[:upper:]' '[:lower:]')" in + "true") + PLCSIM=1 + printf "${YELLOW} USE_PLC_SIM_ADVANCED is true. ${NC}" + ;; + "false") + PLCSIM=0 + printf "${YELLOW} USE_PLC_SIM_ADVANCED is false. ${NC}" + ;; + *) + printf "${RED}USE_PLC_SIM_ADVANCED has an invalid or undefined value: '$USE_PLC_SIM_ADVANCED'.${NC}" + ;; +esac + +apax install + +check_requisites_apax_script=$( dirname ${BASH_SOURCE[0]})"\\check_requisites_apax.sh" +if ! $check_requisites_apax_script ; then + exit 1 +fi + +check_requisites_nuget_script=$( dirname ${BASH_SOURCE[0]})"\\check_requisites_nuget.sh" +if ! $check_requisites_nuget_script ; then + exit 1 +fi + +check_requisites_custom_registry_script=$( dirname ${BASH_SOURCE[0]})"\\check_requisites_custom_registry.sh" +if ! $check_requisites_custom_registry_script ; then + exit 1 +fi + +if [ "$PLCSIM" -eq 1 ]; then + plcsim_script=$( dirname ${BASH_SOURCE[0]})"\\plcsimadvanced.sh" + $plcsim_script $NAMESPACE $PLC_NAME $PLC_IP_ADDRESS +fi + +apax clean +apax install --catalog +apax install + + +#copy_and_install_gsd # copy and install all gsdml files from library +copy_and_install_gsd=$( dirname ${BASH_SOURCE[0]})"\\copy_and_install_gsd.sh" +$copy_and_install_gsd +if [[ $? -eq 0 ]]; then + printf "${GREEN}Gsdml files installed succesfully.${NC}" +else + printf "${RED}Installation of the gsdml files finished with an error!${NC}\n" + printf "${RED}Please check the details above.${NC}\n" + exit 1 +fi + +#copy_hwl_templates # copy all templates from library +copy_hwl_templates=$( dirname ${BASH_SOURCE[0]})"\\copy_hwl_templates.sh" +$copy_hwl_templates +if [[ $? -eq 0 ]]; then + printf "${GREEN}Copying hardware templates from the libraries finished succesfully.${NC}" +else + printf "${RED}Copying hardware templates from the libraries finished with an error!${NC}\n" + printf "${RED}Please check the details above.${NC}\n" + exit 1 +fi + +#setup_secure_communication # setup secure communication, create and import certificates, setup password for AX_USERNAME +setup_secure_communication=$( dirname ${BASH_SOURCE[0]})"\\setup_secure_communication.sh" +$setup_secure_communication $PLC_NAME $USERNAME $PASSWORD +if [[ $? -eq 0 ]]; then + printf "${GREEN}Configuring secure communication finished succesfully.${NC}" +else + printf "${RED}Configuring secure communication finished with an error!${NC}\n" + printf "${RED}Please check the details above.${NC}\n" + exit 1 +fi + +#hw_compile # hardware compilation +if ! [[ -d "./hwc" ]]; then + printf "${RED}Directory ".\hwc" does not exist!!!${NC}" + exit 1 +fi +hwcfile=".\hwc\\${PLC_NAME}.hwl.yml" +if ! [[ -e "$hwcfile" ]]; then + printf "${RED}Hardware configuration file $hwcfile does not exist!!!${NC}" + exit 1 +fi +hw_compile_script=$( dirname ${BASH_SOURCE[0]})"\\hw_compile.sh" +if ! $hw_compile_script ; then + exit 1 +fi + +#copy_hardware_ids # copy hardware identificators +hwid=$( dirname ${BASH_SOURCE[0]})"\\copy_hardware_ids.sh" +$hwid $NAMESPACE $PLC_NAME +if [[ $? -eq 0 ]]; then + printf "${GREEN}Hardware IDs copied succesfully.${NC}" +else + printf "${RED}Copying the hardware IDs finished with an error!${NC}\n" + printf "${RED}Please check the details above.${NC}\n" + exit 1 +fi + +#copy_io_addresses # copy hardware addresses +hwadr=$( dirname ${BASH_SOURCE[0]})"\\copy_io_addresses.sh" +$hwadr $NAMESPACE $PLC_NAME +if [[ $? -eq 0 ]]; then + printf "${GREEN}IO addresses copied succesfully.${NC}" +else + printf "${RED}Copying the IO addressesfinished with an error!${NC}\n" + printf "${RED}Please check the details above.${NC}\n" + exit 1 +fi + +certfile="./certs/$PLC_NAME/$PLC_NAME.cer" +apax plc-cert --target $PLC_IP_ADDRESS --output $certfile +if [[ $? -eq 0 ]]; then + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi + printf "${GREEN}Security certificate has been succesfully uploaded.${NC}" +else + printf "${RED}Uploading of the security certificate finished with an error!${NC}\n" + printf "${RED}Please check the details above.${NC}\n" + exit 1 +fi + +apax build +dotnet ixc diff --git a/src/scripts/compile_all_compare_all.sh b/src/scripts/compile_all_compare_all.sh new file mode 100644 index 000000000..cff7f51a7 --- /dev/null +++ b/src/scripts/compile_all_compare_all.sh @@ -0,0 +1,59 @@ +export GREEN='\033[0;32m' +export RED='\033[0;31m' +export YELLOW='\033[0;33m' +export NC='\033[0m\r\n' # No Color+CRLF +if [ "$#" -ne 7 ]; then + printf "${RED}Usage: $0 \r\n${NC}" + exit 1 +fi + +NAMESPACE=$1 +if [ -z $NAMESPACE ]; then + printf "${RED}The NAMESPACE could not be an empty string.\r\n${NC}" + exit 1 +fi + +PLC_NAME=$2 +if [ -z $PLC_NAME ]; then + printf "${RED}The PLC_NAME could not be an empty string.\r\n${NC}" + exit 1 +fi + +PLC_IP_ADDRESS=$3 +validate_script=$( dirname ${BASH_SOURCE[0]})"\\validate_ip.sh" +if ! $validate_script "$PLC_IP_ADDRESS"; then + printf "${RED}The PLC_IP_ADDRESS '$PLC_IP_ADDRESS' is not a valid IP address.\r\n${NC}" + exit 1 +fi + +PLATFORM=$4 +if [ -z $PLATFORM ]; then + printf "${RED}The PLATFORM could not be an empty string.\r\n${NC}" + exit 1 +fi + +USERNAME=$5 +if [ -z $USERNAME ]; then + printf "${RED}The USERNAME could not be an empty string.\r\n${NC}" + exit 1 +fi + +PASSWORD=$6 +if [ -z $PASSWORD ]; then + printf "${RED}The PASSWORD could not be an empty string.\r\n${NC}" + exit 1 +fi + +USE_PLC_SIM_ADVANCED=$7 +if [ -z $USE_PLC_SIM_ADVANCED ]; then + printf "${RED}The USE_PLC_SIM_ADVANCED could not be an empty string.\r\n${NC}" + exit 1 +fi + +#compile_all # compile hw and sw +cla=$( dirname ${BASH_SOURCE[0]})"\\compile_all.sh" +$cla $NAMESPACE $PLC_NAME $PLC_IP_ADDRESS $PLATFORM $USERNAME $PASSWORD $USE_PLC_SIM_ADVANCED + +#compare_all # compare offline and online +cpa=$( dirname ${BASH_SOURCE[0]})"\\compare_all.sh" +$cpa $PLC_NAME $PLC_IP_ADDRESS $PLATFORM $USERNAME $PASSWORD diff --git a/src/simatic1500/app/apax.yml b/src/simatic1500/app/apax.yml index 2bcbf44c7..5bd200807 100644 --- a/src/simatic1500/app/apax.yml +++ b/src/simatic1500/app/apax.yml @@ -1,4 +1,4 @@ -name: "simatic1500-app" +name: "simatic1500-app" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/template.axolibrary/app/apax.yml b/src/template.axolibrary/app/apax.yml index e5b5628a3..1a3907b73 100644 --- a/src/template.axolibrary/app/apax.yml +++ b/src/template.axolibrary/app/apax.yml @@ -1,4 +1,4 @@ -name: "app_apaxappname" +name: "app_apaxappname" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/timers/app/apax.yml b/src/timers/app/apax.yml index 47a90fbbc..b5ca0cb22 100644 --- a/src/timers/app/apax.yml +++ b/src/timers/app/apax.yml @@ -1,4 +1,4 @@ -name: "timers-app" +name: "timers-app" version: '0.0.0-dev.0' type: app targets: @@ -140,8 +140,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -172,6 +188,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: | diff --git a/src/utils/app/apax.yml b/src/utils/app/apax.yml index 181b538ad..4968abe47 100644 --- a/src/utils/app/apax.yml +++ b/src/utils/app/apax.yml @@ -1,4 +1,4 @@ -name: "utils-app" +name: "utils-app" version: '0.0.0-dev.0' type: app targets: @@ -141,8 +141,24 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax alf' Finished in :" $(expr $(date +%s) - $START) "s" all: | #build and download hardware and software using cert file. If cert file does not exists or its hash is different calls apax alf (apax plcsim & apax clean & apax install & apax hwu & apax swfd) START=$(date +%s) - ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED true + else + ..\\..\\scripts\\all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED false + fi echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax all' Finished in :" $(expr $(date +%s) - $START) "s" + cla: | #compile all + START=$(date +%s) + ..\\..\\scripts\\compile_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cla' Finished in :" $(expr $(date +%s) - $START) "s" + cpa: | #compare all + START=$(date +%s) + ..\\..\\scripts\\compare_all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cpa' Finished in :" $(expr $(date +%s) - $START) "s" + cca: | #compile all compare all + START=$(date +%s) + ..\\..\\scripts\\compile_all_compare_all.sh $DEFAULT_NAMESPACE $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $AX_TARGET_PWD $USE_PLC_SIM_ADVANCED + echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax cca' Finished in :" $(expr $(date +%s) - $START) "s" ib: | START=$(date +%s) apax install @@ -173,6 +189,10 @@ scripts: echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax ibt' Finished in :" $(expr $(date +%s) - $START) "s" gc: | START=$(date +%s) + if [[ ! -d ".\\certs\\$PLC_NAME" ]]; then + mkdir -p ".\\certs\\$PLC_NAME" + echo "Created directory: .\\certs\\$PLC_NAME" + fi apax plc-cert --target $AXTARGET --output .\\certs\\$PLC_NAME\\$PLC_NAME.cer echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - 'apax gc' Finished in :" $(expr $(date +%s) - $START) "s" mm: |