Merge branch 'v3.x/staging' into user/markackert/3.x-workflow-triggers

README.md

@@ -155,7 +155,7 @@ For each Zowe component, we have point of contact(s) in case if we want to confi
     - zowe-cli-ftp-plugin
 - Explorer (Visual Studio Code Extension): Fernando Rijo Cedeno, Mark Ackert
   * Source Dependencies
-    - vscode-extension-for-zowe
+    - zowe-explorer-vscode
 - License: Mark Ackert
   * Binary Dependencies
     - org.zowe.licenses

manifest.json.template

@@ -342,8 +342,8 @@
     {
       "componentGroup": "Zowe Visual Studio Code Extension",
       "entries": [{
-        "repository": "vscode-extension-for-zowe",
-        "tag": "master",
+        "repository": "zowe-explorer-vscode",
+        "tag": "next",
         "destinations": ["Visual Studio Code Marketplace"]
       }]
     },

smpe/bld/SMPMCS.txt

@@ -78,12 +78,6 @@
 ++HFS(ZWEPAX06)      SYSLIB(SZWEZFS ) DISTLIB(AZWEZFS ) RELFILE(4)
    SHSCRIPT(ZWESHPAX,PRE,POST)
    BINARY            PARM(PATHMODE(0,7,5,5)) .
-++HFS(ZWEPAX07)      SYSLIB(SZWEZFS ) DISTLIB(AZWEZFS ) RELFILE(4)
-   SHSCRIPT(ZWESHPAX,PRE,POST)
-   BINARY            PARM(PATHMODE(0,7,5,5)) .
-++HFS(ZWEPAX08)      SYSLIB(SZWEZFS ) DISTLIB(AZWEZFS ) RELFILE(4)
-   SHSCRIPT(ZWESHPAX,PRE,POST)
-   BINARY            PARM(PATHMODE(0,7,5,5)) .
 ++HFS(ZWEWRF01)      SYSLIB(SZWEZFS ) DISTLIB(AZWEZFS ) RELFILE(4)
    TEXT              PARM(PATHMODE(0,7,5,5)) .
 ++HFS(ZWEYML01)      SYSLIB(SZWEZFS ) DISTLIB(AZWEZFS ) RELFILE(4)

smpe/bld/_README.txt

@@ -153,6 +153,22 @@ site requirements.
 8. Contact documentation team to update the Program Directory
 9. Notify an IBM-employed build engineer to update the IBM processes
 
+Adding or removing Zowe components
+---------------------------
+When modifying Zowe components included in the PAX via manifest.json.template, 
+changes may be required to the SMPMCS.txt and smpe-split.sh scripts. The smpe-split.sh 
+script chunks the Zowe install into multiple PAX files, which are included in the SMPMCS.txt
+file as HFS definitions. For example:
+++HFS(ZWEPAX02)      SYSLIB(SZWEZFS ) DISTLIB(AZWEZFS ) RELFILE(4)
+
+In general, adding new components will continue to work with the SMP/e build,
+while removing components, either by renaming directories or deleting them outright, 
+will result in errors.
+
+See the smpe-split.sh script for additional inline documentation, and consult with an IBM SMP/e 
+engineer before finalizing any changes to the smpe-split.sh or SMPMCS.txt file.
+
+
 Add product member to build
 ---------------------------
 1. Add member to files/..., e.g. files/jcl/ZWENOSEC.jcl

smpe/bld/smpe-split.sh

@@ -91,14 +91,15 @@ _cmd mkdir -p $split
 # . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
 cnt=0                           # counter, part of target pax file name
-# let will: increase $cnt
-# "echo 0$cnt" will: create a counter at least 2 chars long
-# sed will: take the last 2 chars of the expanded counter
 
 # ---
 
 # split large components/files into their own pax
-# ACTION: update SMPMCS.txt when altering this logic
+# ACTION: update SMPMCS.txt when adding/removing pax files
+# ACTION: do NOT remove pax files in service stream without consulting
+#         an SMP/E specialist, as doing so without precautions will 
+#         break the SUPersede chain of the PTFs (see also _README.txt).
+#         You can change pax content in the service stream.
 list=""                                  # path based on $ZOWE_ROOT_DIR
 list="$list components/api-catalog"                             # pax01
 list="$list components/caching-service"                         # pax02
@@ -109,13 +110,17 @@ list="$list components/app-server"                              # pax05
 test "$debug" && echo "for f in $list"
 for f in $list
 do
+# let will: increase $cnt
+# "echo 0$cnt" will: create a counter at least 2 chars long
+# sed will: take the last 2 chars of the expanded counter
   let cnt=$cnt+1 ; file=${mask}$(echo 0$cnt | sed 's/.*\(..\)$/\1/')
   _move $stage $split/$file echo $f
 done    # for f
 
 # ---
 
 # all remaining files and directories
+# see earlier for explanation of "file=" logic 
 # ACTION: update SMPMCS.txt when altering this logic
 let cnt=$cnt+1 ; file=${mask}$(echo 0$cnt | sed 's/.*\(..\)$/\1/')
 _move $stage $split/$file ls -A $stage                          # pax08