Skip to content

Add win11 on win11 #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KathrynBaker merged 3 commits into from
Mar 14, 2025
Merged

Add win11 on win11 #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4c9a50
Add win11 on win11
FreddieAkeroyd Mar 4, 2025
35d3a78
ruff
FreddieAkeroyd Mar 4, 2025
9b05dcb
ruff
FreddieAkeroyd Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions installation_and_upgrade/IBEX_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,13 @@ def _get_latest_existing_dir_path(release_dir: str, component: str) -> str:
choices=["x64", "x86"],
help="Server build architecture.",
)
parser.add_argument(
"--server_winbuild",
dest="server_winbuild",
default="win7",
choices=["win7", "win10", "win11"],
help="Server winbuild.",
)

deployment_types = [
f"{choice}: {deployment_types}" for choice, (_, deployment_types) in UPGRADE_TYPES.items()
Expand Down Expand Up @@ -179,13 +186,19 @@ def _get_latest_existing_dir_path(release_dir: str, component: str) -> str:
elif args.kits_icp_dir is not None:
if args.deployment_type == "install_latest_incr":
epics_build_dir = os.path.join(
args.kits_icp_dir, "EPICS", args.server_build_prefix + "_win7_" + args.server_arch
args.kits_icp_dir,
"EPICS",
args.server_build_prefix + "_" + args.server_winbuild + "_" + args.server_arch,
)
else:
epics_build_dir = os.path.join(
args.kits_icp_dir,
"EPICS",
args.server_build_prefix + "_CLEAN_win7_" + args.server_arch,
args.server_build_prefix
+ "_CLEAN_"
+ args.server_winbuild
+ "_"
+ args.server_arch,
)

try:
Expand Down
10 changes: 8 additions & 2 deletions installation_and_upgrade/instrument_install_latest_build_only.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ REM normally will use EPICS_win7_x64 or EPICS_CLEAN_win7_x64 depending on incre
REM with prefix specified will use {prefix}_win7_x64 and {prefix}_CLEAN_win7_x64 for server install source directory
REM argument 3 can be x86 or x64, defaults to x64 if not specified.
REM this will change e.g. {prefix}_win7_x64 to {prefix}_win7_x86 as server source directory to use
REM argument 4 can be server winbuild, defaults to win7 if not specified.
REM this will change e.g. {prefix}_win7_x64 to {prefix}_win1_x64 as server source directory to use

setlocal EnableDelayedExpansion

Expand Down Expand Up @@ -34,6 +36,10 @@ set SERVER_ARCH=x64
if not "%3" == "" set SERVER_ARCH=%3
@echo Using server arch %SERVER_ARCH%

set SERVER_WINBUILD=win7
if not "%4" == "" set SERVER_WINBUILD=%4
@echo Using server winbuild %SERVER_WINBUILD%

set INSTALL_TYPE=install_latest
if "%1" == "INCR" (
set INSTALL_TYPE=install_latest_incr
Expand Down Expand Up @@ -72,9 +78,9 @@ if "%1" == "RELEASE" (
REM set INSTALL_TYPE=instrument_install
REM set INSTALL_TYPE=training_update
set INSTALL_TYPE=install_latest
"%LATEST_PYTHON%" -u "%~dp0IBEX_upgrade.py" --release_dir "%RELEASE_SOURCE%" --server_arch %SERVER_ARCH% --quiet !INSTALL_TYPE!
"%LATEST_PYTHON%" -u "%~dp0IBEX_upgrade.py" --release_dir "%RELEASE_SOURCE%" --server_arch %SERVER_ARCH% --quiet !INSTALL_TYPE! --server_winbuild %SERVER_WINBUILD%
) else (
"%LATEST_PYTHON%" -u "%~dp0IBEX_upgrade.py" --kits_icp_dir "%KITS_ICP_PATH%" %SERVER_BUILD_PREFIX% --server_arch %SERVER_ARCH% --quiet !INSTALL_TYPE!
"%LATEST_PYTHON%" -u "%~dp0IBEX_upgrade.py" --kits_icp_dir "%KITS_ICP_PATH%" %SERVER_BUILD_PREFIX% --server_arch %SERVER_ARCH% --quiet !INSTALL_TYPE! --server_winbuild %SERVER_WINBUILD%
)
IF %errorlevel% neq 0 (
echo Error %errorlevel% returned from IBEX_upgrade script
Expand Down