scripts improvements and cleanup (#415)

Inxton · Jul 1, 2024 · da37bc0 · da37bc0
1 parent 19be79f
commit da37bc0
Show file tree

Hide file tree

Showing 29 changed files with 159 additions and 1,012 deletions.
diff --git a/src/abstractions/app/apax.yml b/src/abstractions/app/apax.yml
@@ -15,71 +15,16 @@ dependencies:
   "@ix-ax/axopen.timers": '0.0.0-dev.0'
   "@ix-ax/axopen.core": '0.0.0-dev.0'
 scripts:
-  # Obsolete scripts, could be  removed at some point ====>
-  delta:
-    - START=$(date +%s)
-    - apax build --ignore-scripts
-    - apax sld load --accept-security-disclaimer -t $AXTARGET -i
-      $AXTARGETPLATFORMINPUT --mode delta
-    - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in
-      :" $(expr $(date +%s) - $START) "s"
-  download:
-    - START=$(date +%s)
-    - apax build --ignore-scripts
-    - dotnet ixc
-    - apax download_only
-    - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in
-      :" $(expr $(date +%s) - $START) "s"
-  download_only: |
-    apax sld load --accept-security-disclaimer -t $AXTARGET -i $AXTARGETPLATFORMINPUT -r -C ./certs/$PLC_NAME/$PLC_NAME.cer
-  check+download: |
-    if [ $AXTARGET ]; then
-      if [ $AXTARGETPLATFORMINPUT ]; then
-        if ping -n 1 $AXTARGET &> /dev/null; then
-          echo "Downloading from:" $AXTARGETPLATFORMINPUT "=>" $AXTARGET
-          apax download_only
-        else
-          echo "Target with IP address:" $AXTARGET "is not accessible. No download is going to be performed!!!"
-        fi
-      else
-        echo "Environment variable AXTARGETPLATFORMINPUT not defined!!!"
-      fi
-    else
-      echo "Environment variable AXTARGET not defined!!!"
-    fi
-  fr:
-    - ..\\..\\integrations\\scripts\\StartPlcSimAdvCli.exe
-    - apax rr
-  frw:
-    - apax fr
-    - apax watch
-  rr:
-    - START=$(date +%s)
-    - apax clean
-    - apax install
-    - apax download
-    - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in
-      :" $(expr $(date +%s) - $START) "s"
-  rrw:
-    - apax rr
-    - apax watch
-  d:
-    - apax download
-  do:
-    - apax download_only
-  dd:
-    - apax delta
-  # <==== Obsolete scripts, could be  removed at some point
-
   # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables.
   # Local variables can override environment variables.
   # It is highly recommended NOT to store secrets such as 'AX_USERNAME' and 'MY_VERY_STRONG_PASSWORD' in local variables.
   # PLC_NAME: Name of the PLC (also equal to the PLC Profinet name)
   # AX_USERNAME: Name of the PLC user used for WebAPI and HMI
   # AXTARGET: IP address of the PLC
-  # AXTARGETPLATFORMINPUT: Folder of the compiled software to be downloaded to the PLC. Use the value ".\bin\plcsim\" in case PLCSIM is used. For an S7-1500 controller, use ".\bin\1500\"
+  # AXTARGETPLATFORMINPUT: Folder of the compiled software to be downloaded to the PLC. Use the value ".\bin\1500\" for the S7-1500 controller, even if running inside PLCSIM
   # AXTARGETPLCSIMINSTANCE: Name of the PLCSIM instance to start. The instance must already exist.
   # MY_VERY_STRONG_PASSWORD: Password for 'AX_USERNAME'
+  # AXUSEPLCSIM with value of "true" will automatically trigger PLCSIM when calling apax alf or apax all
   # PNIO_MAC: MAC address of the network adapter connected to the Profinet network  
   plcsim: ..\\..\\scripts\\StartPlcSimAdvCli.exe #start PLCSIM
 
@@ -144,6 +89,5 @@ scripts:
     START=$(date +%s)
     ..\\..\\scripts\\all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $MY_VERY_STRONG_PASSWORD
     echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"    
-
 installStrategy: strict
 apaxVersion: 3.1.1
diff --git a/src/components.abb.robotics/app/apax.yml b/src/components.abb.robotics/app/apax.yml
@@ -17,69 +17,16 @@ dependencies:
   "@ix-ax/axopen.simatic1500": '0.0.0-dev.0'
   "@ix-ax/ax.axopen.app": '0.0.0-dev.0'
 scripts:
-  # Obsolete scripts, could be  removed at some point ====>
-  delta:
-    - START=$(date +%s)
-    - apax build --ignore-scripts
-    - apax sld load --accept-security-disclaimer -t $AXTARGET -i $AXTARGETPLATFORMINPUT --mode delta
-    - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"
-  download:
-    - START=$(date +%s)
-    - apax build --ignore-scripts
-    - dotnet ixc
-    - apax download_only
-    - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"
-  download_only:
-    - apax sld load --accept-security-disclaimer -t $AXTARGET -i $AXTARGETPLATFORMINPUT -r
-  check+download: |
-    if [ $AXTARGET ]; then
-      if [ $AXTARGETPLATFORMINPUT ]; then
-        if ping -n 1 $AXTARGET &> /dev/null; then
-          echo "Downloading from:" $AXTARGETPLATFORMINPUT "=>" $AXTARGET
-          apax download_only
-        else
-          echo "Target with IP address:" $AXTARGET "is not accessible. No download is going to be performed!!!"
-        fi
-      else
-        echo "Environment variable AXTARGETPLATFORMINPUT not defined!!!"
-      fi
-    else
-      echo "Environment variable AXTARGET not defined!!!"
-    fi
-  watch:
-    - dotnet watch --project ..\\app\\ix-blazor\\AXOpen.Components.Abb.Robotics.blazorapp.csproj
-  fr:
-    - ..\\..\\integrations\\scripts\\StartPlcSimAdvCli.exe
-    - apax rr
-  frw:
-    - apax fr
-    - apax watch
-  rr:
-    - START=$(date +%s)
-    - apax clean
-    - apax install
-    - apax download
-    - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"
-  rrw:
-    - apax rr
-    - apax watch
-  d:
-    - apax download
-  do:
-    - apax download_only
-  dd:
-    - apax delta
-  # <==== Obsolete scripts, could be  removed at some point
-
   # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables.
   # Local variables can override environment variables.
   # It is highly recommended NOT to store secrets such as 'AX_USERNAME' and 'MY_VERY_STRONG_PASSWORD' in local variables.
   # PLC_NAME: Name of the PLC (also equal to the PLC Profinet name)
   # AX_USERNAME: Name of the PLC user used for WebAPI and HMI
   # AXTARGET: IP address of the PLC
-  # AXTARGETPLATFORMINPUT: Folder of the compiled software to be downloaded to the PLC. Use the value ".\bin\plcsim\" in case PLCSIM is used. For an S7-1500 controller, use ".\bin\1500\"
+  # AXTARGETPLATFORMINPUT: Folder of the compiled software to be downloaded to the PLC. Use the value ".\bin\1500\" for the S7-1500 controller, even if running inside PLCSIM
   # AXTARGETPLCSIMINSTANCE: Name of the PLCSIM instance to start. The instance must already exist.
   # MY_VERY_STRONG_PASSWORD: Password for 'AX_USERNAME'
+  # AXUSEPLCSIM with value of "true" will automatically trigger PLCSIM when calling apax alf or apax all
   # PNIO_MAC: MAC address of the network adapter connected to the Profinet network  
   plcsim: ..\\..\\scripts\\StartPlcSimAdvCli.exe #start PLCSIM
 
@@ -144,6 +91,5 @@ scripts:
     START=$(date +%s)
     ..\\..\\scripts\\all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $MY_VERY_STRONG_PASSWORD
     echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"    
-
 installStrategy: strict
 apaxVersion: 3.1.1
diff --git a/src/components.balluff.identification/app/apax.yml b/src/components.balluff.identification/app/apax.yml
@@ -17,68 +17,16 @@ dependencies:
   "@ix-ax/axopen.simatic1500": '0.0.0-dev.0'
   "@ix-ax/ax.axopen.app": '0.0.0-dev.0'
 scripts:
-  # Obsolete scripts, could be  removed at some point ====>
-  delta:
-    - START=$(date +%s)
-    - apax build --ignore-scripts
-    - apax sld load --accept-security-disclaimer -t $AXTARGET -i $AXTARGETPLATFORMINPUT --mode delta
-    - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"
-  download:
-    - START=$(date +%s)
-    - apax build --ignore-scripts
-    - dotnet ixc
-    - apax download_only
-    - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"
-  download_only:
-    - apax sld load --accept-security-disclaimer -t $AXTARGET -i $AXTARGETPLATFORMINPUT -r
-  check+download: |
-    if [ $AXTARGET ]; then
-      if [ $AXTARGETPLATFORMINPUT ]; then
-        if ping -n 1 $AXTARGET &> /dev/null; then
-          echo "Downloading from:" $AXTARGETPLATFORMINPUT "=>" $AXTARGET
-          apax download_only
-        else
-          echo "Target with IP address:" $AXTARGET "is not accessible. No download is going to be performed!!!"
-        fi
-      else
-        echo "Environment variable AXTARGETPLATFORMINPUT not defined!!!"
-      fi
-    else
-      echo "Environment variable AXTARGET not defined!!!"
-    fi
-  watch:
-    - dotnet watch --project ..\\app\\ix-blazor\\AXOpen.Components.Balluff.Identification.blazorapp.csproj
-  fr:
-    - ..\\..\\integrations\\scripts\\StartPlcSimAdvCli.exe
-    - apax rr
-  frw:
-    - apax fr
-    - apax watch
-  rr:
-    - START=$(date +%s)
-    - apax install
-    - apax download
-    - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"
-  rrw:
-    - apax rr
-    - apax watch
-  d:
-    - apax download
-  do:
-    - apax download_only
-  dd:
-    - apax delta
-  # <==== Obsolete scripts, could be  removed at some point
-
   # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables.
   # Local variables can override environment variables.
   # It is highly recommended NOT to store secrets such as 'AX_USERNAME' and 'MY_VERY_STRONG_PASSWORD' in local variables.
   # PLC_NAME: Name of the PLC (also equal to the PLC Profinet name)
   # AX_USERNAME: Name of the PLC user used for WebAPI and HMI
   # AXTARGET: IP address of the PLC
-  # AXTARGETPLATFORMINPUT: Folder of the compiled software to be downloaded to the PLC. Use the value ".\bin\plcsim\" in case PLCSIM is used. For an S7-1500 controller, use ".\bin\1500\"
+  # AXTARGETPLATFORMINPUT: Folder of the compiled software to be downloaded to the PLC. Use the value ".\bin\1500\" for the S7-1500 controller, even if running inside PLCSIM
   # AXTARGETPLCSIMINSTANCE: Name of the PLCSIM instance to start. The instance must already exist.
   # MY_VERY_STRONG_PASSWORD: Password for 'AX_USERNAME'
+  # AXUSEPLCSIM with value of "true" will automatically trigger PLCSIM when calling apax alf or apax all
   # PNIO_MAC: MAC address of the network adapter connected to the Profinet network  
   plcsim: ..\\..\\scripts\\StartPlcSimAdvCli.exe #start PLCSIM
 
@@ -143,6 +91,5 @@ scripts:
     START=$(date +%s)
     ..\\..\\scripts\\all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $MY_VERY_STRONG_PASSWORD
     echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"    
-
 installStrategy: strict
 apaxVersion: 3.1.1
diff --git a/src/components.cognex.vision/app/apax.yml b/src/components.cognex.vision/app/apax.yml
@@ -14,69 +14,16 @@ dependencies:
   "@ix-ax/axopen.simatic1500": '0.0.0-dev.0'
   "@ix-ax/ax.axopen.app": '0.0.0-dev.0'
 scripts:
-  # Obsolete scripts, could be  removed at some point ====>
-  delta:
-    - START=$(date +%s)
-    - apax build --ignore-scripts
-    - apax sld load --accept-security-disclaimer -t $AXTARGET -i $AXTARGETPLATFORMINPUT --mode delta
-    - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"
-  download:
-    - START=$(date +%s)
-    - apax build --ignore-scripts
-    - dotnet ixc
-    - apax download_only
-    - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"
-  download_only:
-    - apax sld load --accept-security-disclaimer -t $AXTARGET -i $AXTARGETPLATFORMINPUT -r
-  check+download: |
-    if [ $AXTARGET ]; then
-      if [ $AXTARGETPLATFORMINPUT ]; then
-        if ping -n 1 $AXTARGET &> /dev/null; then
-          echo "Downloading from:" $AXTARGETPLATFORMINPUT "=>" $AXTARGET
-          apax download_only
-        else
-          echo "Target with IP address:" $AXTARGET "is not accessible. No download is going to be performed!!!"
-        fi
-      else
-        echo "Environment variable AXTARGETPLATFORMINPUT not defined!!!"
-      fi
-    else
-      echo "Environment variable AXTARGET not defined!!!"
-    fi
-  watch:
-    - dotnet watch --project ..\\app\\ix-blazor\\AXOpen.Components.Cognex.Vision.blazorapp.csproj
-  fr:
-    - ..\\..\\integrations\\scripts\\StartPlcSimAdvCli.exe
-    - apax rr
-  frw:
-    - apax fr
-    - apax watch
-  rr:
-    - START=$(date +%s)
-    - apax clean
-    - apax install
-    - apax download
-    - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"
-  rrw:
-    - apax rr
-    - apax watch
-  d:
-    - apax download
-  do:
-    - apax download_only
-  dd:
-    - apax delta
-  # <==== Obsolete scripts, could be  removed at some point
-
   # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables.
   # Local variables can override environment variables.
   # It is highly recommended NOT to store secrets such as 'AX_USERNAME' and 'MY_VERY_STRONG_PASSWORD' in local variables.
   # PLC_NAME: Name of the PLC (also equal to the PLC Profinet name)
   # AX_USERNAME: Name of the PLC user used for WebAPI and HMI
   # AXTARGET: IP address of the PLC
-  # AXTARGETPLATFORMINPUT: Folder of the compiled software to be downloaded to the PLC. Use the value ".\bin\plcsim\" in case PLCSIM is used. For an S7-1500 controller, use ".\bin\1500\"
+  # AXTARGETPLATFORMINPUT: Folder of the compiled software to be downloaded to the PLC. Use the value ".\bin\1500\" for the S7-1500 controller, even if running inside PLCSIM
   # AXTARGETPLCSIMINSTANCE: Name of the PLCSIM instance to start. The instance must already exist.
   # MY_VERY_STRONG_PASSWORD: Password for 'AX_USERNAME'
+  # AXUSEPLCSIM with value of "true" will automatically trigger PLCSIM when calling apax alf or apax all
   # PNIO_MAC: MAC address of the network adapter connected to the Profinet network  
   plcsim: ..\\..\\scripts\\StartPlcSimAdvCli.exe #start PLCSIM
 
@@ -141,6 +88,5 @@ scripts:
     START=$(date +%s)
     ..\\..\\scripts\\all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $MY_VERY_STRONG_PASSWORD
     echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"    
-
 installStrategy: strict
 apaxVersion: 3.1.1
diff --git a/src/components.desoutter.tightening/app/apax.yml b/src/components.desoutter.tightening/app/apax.yml
@@ -17,69 +17,16 @@ dependencies:
   "@ix-ax/axopen.simatic1500": '0.0.0-dev.0'
   "@ix-ax/ax.axopen.app": '0.0.0-dev.0'
 scripts:
-  # Obsolete scripts, could be  removed at some point ====>
-  delta:
-    - START=$(date +%s)
-    - apax build --ignore-scripts
-    - apax sld load --accept-security-disclaimer -t $AXTARGET -i $AXTARGETPLATFORMINPUT --mode delta
-    - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"
-  download:
-    - START=$(date +%s)
-    - apax build --ignore-scripts
-    - dotnet ixc
-    - apax download_only
-    - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"
-  download_only:
-    - apax sld load --accept-security-disclaimer -t $AXTARGET -i $AXTARGETPLATFORMINPUT -r
-  check+download: |
-    if [ $AXTARGET ]; then
-      if [ $AXTARGETPLATFORMINPUT ]; then
-        if ping -n 1 $AXTARGET &> /dev/null; then
-          echo "Downloading from:" $AXTARGETPLATFORMINPUT "=>" $AXTARGET
-          apax download_only
-        else
-          echo "Target with IP address:" $AXTARGET "is not accessible. No download is going to be performed!!!"
-        fi
-      else
-        echo "Environment variable AXTARGETPLATFORMINPUT not defined!!!"
-      fi
-    else
-      echo "Environment variable AXTARGET not defined!!!"
-    fi
-  watch:
-    - dotnet watch --project ..\\app\\ix-blazor\\AXOpen.Components.Desoutter.Tightening.blazorapp.csproj
-  fr:
-    - ..\\..\\integrations\\scripts\\StartPlcSimAdvCli.exe
-    - apax rr
-  frw:
-    - apax fr
-    - apax watch
-  rr:
-    - START=$(date +%s)
-    - apax clean
-    - apax install
-    - apax download
-    - echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"
-  rrw:
-    - apax rr
-    - apax watch
-  d:
-    - apax download
-  do:
-    - apax download_only
-  dd:
-    - apax delta
-  # <==== Obsolete scripts, could be  removed at some point
-
   # For proper execution of these scripts, the following variables need to be defined as environment variables or local variables.
   # Local variables can override environment variables.
   # It is highly recommended NOT to store secrets such as 'AX_USERNAME' and 'MY_VERY_STRONG_PASSWORD' in local variables.
   # PLC_NAME: Name of the PLC (also equal to the PLC Profinet name)
   # AX_USERNAME: Name of the PLC user used for WebAPI and HMI
   # AXTARGET: IP address of the PLC
-  # AXTARGETPLATFORMINPUT: Folder of the compiled software to be downloaded to the PLC. Use the value ".\bin\plcsim\" in case PLCSIM is used. For an S7-1500 controller, use ".\bin\1500\"
+  # AXTARGETPLATFORMINPUT: Folder of the compiled software to be downloaded to the PLC. Use the value ".\bin\1500\" for the S7-1500 controller, even if running inside PLCSIM
   # AXTARGETPLCSIMINSTANCE: Name of the PLCSIM instance to start. The instance must already exist.
   # MY_VERY_STRONG_PASSWORD: Password for 'AX_USERNAME'
+  # AXUSEPLCSIM with value of "true" will automatically trigger PLCSIM when calling apax alf or apax all
   # PNIO_MAC: MAC address of the network adapter connected to the Profinet network  
   plcsim: ..\\..\\scripts\\StartPlcSimAdvCli.exe #start PLCSIM
 
@@ -144,6 +91,5 @@ scripts:
     START=$(date +%s)
     ..\\..\\scripts\\all.sh $PLC_NAME $AXTARGET $AXTARGETPLATFORMINPUT $AX_USERNAME $MY_VERY_STRONG_PASSWORD
     echo $(date +%D)"-"$(date +%H)":"$(date +%M)":"$(date +%S) " - Finished in :" $(expr $(date +%s) - $START) "s"    
-
 installStrategy: strict
 apaxVersion: 3.1.1