Skip to content
9 changes: 6 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
All notable changes to the Zowe Launcher package will be documented in this file.
This repo is part of the app-server Zowe Component, and the change logs here may appear on Zowe.org in that section.

## 3.3
- Bugfix: `zowe.sysMessages` feature was ignoring messages where the matching string was after the position of 126 ([#157]https://github.com/zowe/launcher/pull/157)
## 3.4.0
- Enhancement: Message `ZWEL0021I` includes the version of launcher ([#167](https://github.com/zowe/launcher/pull/167))

## 3.3.0
- Bugfix: `zowe.sysMessages` feature was ignoring messages where the matching string was after the position of 126 ([#157](https://github.com/zowe/launcher/pull/157))
- Enhancement: Launcher can now accept PARMLIB CONFIG entries that have more than one member name ([#146](https://github.com/zowe/launcher/pull/146))
- Enhancement: Trimming the sys messages to print from the sys-message-id as optional based on the zowe.sysMessageTrim=true/false. (#147)
- Enhancement: Avoid starting individual apiml components when apiml modulith is enabled ([#160](https://github.com/zowe/launcher/pull/160))

## 3.1
## 3.1.0
- Bugfix: HEAPPOOLS and HEAPPOOLS64 no longer need to be set to OFF for launcher (#133)

## 2.17.0
Expand Down
9 changes: 7 additions & 2 deletions build/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ DEPS_DESTINATION=$(get_destination "${WORKING_DIR}/.." "${PROJECT}")
# These paths assume that the build is run from /launcher/builds

date_stamp=$(date +%Y%m%d%S)
launcher_date_stamp=$(date +%Y%m%d)

TMP_DIR="${WORKING_DIR}/tmp-${date_stamp}"

Expand Down Expand Up @@ -56,7 +57,7 @@ mkdir -p "${LAUNCHER}/bin"
GSKDIR=/usr/lpp/gskssl
GSKINC="${GSKDIR}/include"

echo "Compiling qascii libyaml and quickjs"
echo "Compiling qascii libyaml \"${LIBYAML_BRANCH}\" and quickjs \"${QUICKJS_BRANCH}\""

xlclang \
-c \
Expand Down Expand Up @@ -94,7 +95,7 @@ if [ $rc -ne 0 ]; then
exit 8
fi

echo "Compiling zowe_launcher"
echo "Compiling zowe_launcher ${MAJOR}.${MINOR}.${PATCH}+${launcher_date_stamp}"

xlclang \
-q64 \
Expand All @@ -107,6 +108,10 @@ xlclang \
-DNOIBMHTTP=1 \
-DNEW_CAA_LOCATIONS=1 \
-DUSE_ZOWE_TLS=1 \
-DPRODUCT_MAJOR_VERSION="${MAJOR}" \
-DPRODUCT_MINOR_VERSION="${MINOR}" \
-DPRODUCT_REVISION="${PATCH}" \
-DPRODUCT_VERSION_DATE_STAMP="${launcher_date_stamp}" \
-I "${LAUNCHER}/src/msg.h" \
-I "${DEPS_DESTINATION}/${COMMON}/h" \
-I "${DEPS_DESTINATION}/${COMMON}/platform/posix" \
Expand Down
19 changes: 17 additions & 2 deletions src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,20 @@ extern char ** environ;

#define YAML_ERROR_MAX 1024

#ifndef PRODUCT_MAJOR_VERSION
#define PRODUCT_MAJOR_VERSION 0
#endif
#ifndef PRODUCT_MINOR_VERSION
#define PRODUCT_MINOR_VERSION 0
#endif
#ifndef PRODUCT_REVISION
#define PRODUCT_REVISION 0
#endif
#ifndef PRODUCT_VERSION_DATE_STAMP
#define PRODUCT_VERSION_DATE_STAMP 0
#endif
char launcherVersion[40];

// Progressive restart internals in seconds
static int restart_intervals_default[] = {1, 1, 1, 5, 5, 10, 20, 60, 120, 240};

Expand Down Expand Up @@ -1908,9 +1922,10 @@ int main(int argc, char **argv) {
}

setenv("_BPXK_AUTOCVT", "ON", 1);
INFO(MSG_LAUNCHER_START);
sprintf(launcherVersion, "%d.%d.%d+%d", PRODUCT_MAJOR_VERSION, PRODUCT_MINOR_VERSION, PRODUCT_REVISION, PRODUCT_VERSION_DATE_STAMP);
INFO(MSG_LAUNCHER_START, launcherVersion);
INFO(MSG_LINE_LENGTH);
printf_wto(MSG_LAUNCHER_START); // Manual sys log print (messages not set here yet)
printf_wto(MSG_LAUNCHER_START, launcherVersion); // Manual sys log print (messages not set here yet)

zl_config_t config = read_config(argc, argv);
zl_context.config = config;
Expand Down
2 changes: 1 addition & 1 deletion src/msg.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#define MSG_INST_PREPARED MSG_PREFIX "0018I" " Zowe instance prepared successfully\n"
#define MSG_LAUNCHER_STOPING MSG_PREFIX "0019I" " Zowe Launcher stopping\n"
#define MSG_LOADING_YAML MSG_PREFIX "0020I" " loading '%s'\n"
#define MSG_LAUNCHER_START MSG_PREFIX "0021I" " Zowe Launcher starting\n"
#define MSG_LAUNCHER_START MSG_PREFIX "0021I" " Zowe Launcher starting, version is %s\n"
#define MSG_LAUNCHER_STOPPED MSG_PREFIX "0022I" " Zowe Launcher stopped\n"
#define MSG_YAML_FILE MSG_PREFIX "0023I" " Zowe YAML config file is \'%s\'\n"
#define MSG_HA_INST_ID MSG_PREFIX "0024I" " HA_INSTANCE_ID is '%s'\n"
Expand Down
7 changes: 5 additions & 2 deletions test/config-syntax.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
print=
errors=0

# Get the launchers's version
. ../build/launcher.proj.env

if [ ! -z "${1}" ]; then
print='1'
fi
Expand Down Expand Up @@ -77,8 +80,8 @@ done <<EOF
CONFIG | HA-INSTANCE | TEXT-TO-FIND | DESCRIPTION | ZLDEBUG
| | PANIC! readJson got null pathElement | No config leads to PANIC!
FILE(${ZOWE_EMPTY}) | | ZWEL0318E - failed to get root node in YAML | Empty config leads to ZWEL0318E
${ABS_ZOWE} | | ZWEL0021I Zowe Launcher starting | Check the basic message ZWEL0021I
${ZOWE} | | INFO ZWEL0023I Zowe YAML config file is 'FILE(${ZOWE})' | ZWEL0023I wrapped by FILE()
${ABS_ZOWE} | | ZWEL0021I Zowe Launcher starting, version is ${VERSION}+ | Check the basic message ZWEL0021I
${ZOWE} | | INFO ZWEL0023I Zowe YAML config file is '${ZOWE}' | ZWEL0023I
FILE(${ZOWE}) | | INFO ZWEL0023I Zowe YAML config file is 'FILE(${ZOWE})' | Same as previous test
${ABS_ZOWE} | | INFO ZWEL0023I Zowe YAML config file is 'FILE(${ABS_ZOWE})' | ZWEL0023I wrapped by FILE()
${ABS_ZOWE2} | | INFO ZWEL0023I Zowe YAML config file is 'FILE(${ABS_ZOWE2})' | Should be able to read the file
Expand Down
Loading