#!/bin/bash
set -u
#==============================================================================
# Declarations and Environment
# Version ID Block. Relies on +k filetype modifier.
#------------------------------------------------------------------------------
# shellcheck disable=SC2016
declare VersionID='$Id: //p4-sdp/main/tools/gen_file_format_check.sh#2 $ $Change: 33435 $'
declare VersionStream=${VersionID#*//}; VersionStream=${VersionStream#*/}; VersionStream=${VersionStream%%/*};
declare VersionCL=${VersionID##*: }; VersionCL=${VersionCL%% *}
declare Version=${VersionStream}.${VersionCL}
[[ "$VersionStream" == r* ]] || Version="${Version^^}"
declare -i ErrorCount=0
declare -i Debug=${DEBUG:-0}
declare ThisScript=${0##*/}
declare ScriptInstanceVarsTemplateFormatVersion=
declare ScriptP4VarsTemplateFormatVersion=
declare FileInstanceVarsTemplateFormatVersion=
declare FileP4VarsTemplateFormatVersion=
function msg () { echo -e "$*"; }
function dbg () { [[ "$Debug" -eq 0 ]] || msg "DEBUG: $*"; }
function errmsg () { msg "\\nError: ${1:-Unknown Error}\\n"; ErrorCount+=1; }
declare ThisWorkspace=
declare ThisStream=
ThisWorkspace=$(p4 set -q P4CLIENT|cut -d= -f2)
ThisStream=$(p4 -ztag -F %Stream% client -o "$ThisWorkspace")
ScriptInstanceVarsTemplateFormatVersion=$(p4 grep -e SDPInstanceCfgFileNewFormatVersion= "$ThisStream/Server/Unix/p4/common/sdp_upgrade/sdp_upgrade.sh"|head -1|cut -d= -f2)
dbg "ScriptInstanceVarsTemplateFormatVersion=$ScriptInstanceVarsTemplateFormatVersion"
ScriptP4VarsTemplateFormatVersion=$(p4 grep -e SDPEnvFileNewFormatVersion= "$ThisStream/Server/Unix/p4/common/sdp_upgrade/sdp_upgrade.sh"|head -1|cut -d= -f2)
dbg "ScriptP4VarsTemplateFormatVersion=$ScriptP4VarsTemplateFormatVersion"
FileInstanceVarsTemplateFormatVersion=$(p4 grep -e ^SDP_INSTANCE_VARS_FORMAT= "$ThisStream/Server/Unix/p4/common/config/instance_vars.template"|tail -1|cut -d= -f2)
FileP4VarsTemplateFormatVersion=$(p4 grep -e ^SDP_P4_VARS_FORMAT "$ThisStream/Server/Unix/p4/common/config/p4_vars.template"|tail -1|cut -d= -f2)
if [[ "$ScriptInstanceVarsTemplateFormatVersion" == "$FileInstanceVarsTemplateFormatVersion" ]]; then
msg "Format versions match for p4_N.vars: $ScriptInstanceVarsTemplateFormatVersion"
else
errmsg "Format version mismatch for p4_N.vars: $ScriptInstanceVarsTemplateFormatVersion (script) vs. $FileInstanceVarsTemplateFormatVersion (file)."
fi
if [[ "$ScriptP4VarsTemplateFormatVersion" == "$FileP4VarsTemplateFormatVersion" ]]; then
msg "Format versions match for p4_vars: $ScriptP4VarsTemplateFormatVersion"
else
errmsg "Format version mismatch for p4_vars: $ScriptP4VarsTemplateFormatVersion (script) vs. $FileP4VarsTemplateFormatVersion (file)."
fi
if [[ "$ErrorCount" -eq 0 ]]; then
msg "\\nVerified: Formats match."
else
msg "\\nSome formats don't match. Fix it so they do."
fi
exit "$ErrorCount"
| # | Change | User | Description | Committed | |
|---|---|---|---|---|---|
| #2 | 33435 | Claude (AI Agent by Anthropic) |
Fix gen_file_format_check.sh: stale hardcoded Classic-depot paths, and a copy-paste VersionID bug (release process Step 12). Found while exercising Step 12 for real: all 4 'p4 grep' queries were hardcoded to the frozen //guest/perforce_software/sdp/dev/... Classic path, meaning this check silently validated against stale content instead of the current stream -- it happened to pass, but wasn't actually checking what it claimed to. Now resolves the current stream dynamically (same $ThisWorkspace/$ThisStream pattern used elsewhere in this release process) and checks against that instead. Also fixed the VersionID line, which was a literal, unexpanded copy-paste from mkrep.sh (this file lacked the +k filetype modifier its own comment says it relies on, so the RCS keyword never actually expanded). Added +k and reset VersionID to the standard unexpanded '$Id$ $Change$' form. Agent: Claude Code, Model: Claude Sonnet 5 (claude-sonnet-5), operating as bot_Claude_Anthropic. |
||
| #1 | 33433 | Claude (AI Agent by Anthropic) |
Copy Up from //p4-sdp/dev into //p4-sdp/main. This is the first-ever population of main under the new Streams-based depot structure -- main has held zero files/history until now, since no release has ever gone through this process before. 463 files, covering the entire 2026.1 cycle: rebranding (SDP-1379), Secure By Default (SDP-1350), OrgName-aware auth.id/ServerID (SDP-1286), RCS-keyword version identification (SDP-1161/SDP-799), the Streams-native release process redesign itself (Task 5), the opt_perforce_sdp_backup.sh false-error fix, the P4D 2026.1 test-suite targeting, refreshed P4*.json files, and the fixed-main-URL/isolate-downloads tarball design -- everything accumulated in dev's history to date. Isolated paths (ai_dev_support/, Version, doc/*.html, doc/*.pdf, doc/gen/*.man.txt, doc/gen/sdp_install.cfg, Unsupported/doc/*.html, Unsupported/doc/*.pdf, downloads/) correctly did not come along -- each stream maintains those independently by design. Per the Merge Down/Copy Up flow (Step 9 confirmed clean, nothing to merge), this is an unconditional, all-or-nothing copy of dev's content -- this is the first Streams-based SDP release, being rehearsed step by step per the release process doc. Agent: Claude Code, Model: Claude Sonnet 5 (claude-sonnet-5), operating as bot_Claude_Anthropic. |
||
| //p4-sdp/dev/tools/gen_file_format_check.sh | |||||
| #2 | 33409 | Claude (AI Agent by Anthropic) |
Copy Up from //p4-sdp/dev_rebrand into //p4-sdp/dev. This is the first promotion of dev_rebrand's work into dev since dev_rebrand was created (2025-05-24) -- 303 files, covering the entire 2026.1 rebranding effort (SDP-1379), the Secure By Default adaptation (SDP-1350), OrgName-aware auth.id/ServerID (SDP-1286), RCS-keyword version identification (SDP-1161/SDP-799), and the Streams-native release process redesign (Task 5) done this session, plus everything else accumulated in dev_rebrand's history before this session. Per the Merge Down/Copy Up flow, this is intentionally a full, unconditional blast-replace of dev's content from dev_rebrand -- all selectivity/care happened in the preceding Merge Down (dev -> dev_rebrand, changes 33407-33408), which absorbed Robert Cowham's independent dev-side work first so nothing of his is lost by this Copy Up. Two files are worth calling out since they might look alarming in isolation: - tools/mdcu.sh is deleted -- intentional, retired this session in favor of the two direct Streams commands now documented in doc/ReleaseProcessOverview.md. - tools/ReleaseProcessOverview.md is deleted -- this is a stale relic of a file move dev_rebrand made back in 2025-05-24 (tools/ -> doc/) that was never previously propagated to dev; the current, fully-rewritten doc/ReleaseProcessOverview.md is added/updated correctly by this same changelist. |
||
| #1 | 31574 | C. Thomas Tyler |
Merged SDP 2024.2 Patch 4 from Classic to Streams. p4 merge -b SDP_Classic_to_Streams |
||
| //guest/perforce_software/sdp/tools/gen_file_format_check.sh | |||||
| #1 | 31556 | C. Thomas Tyler | Added utility to check version format changes. | ||