From 265d392ece420d86c26cb27d38b81e197e77492f Mon Sep 17 00:00:00 2001
From: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Date: Thu, 07 May 2026 07:16:49 +0000
Subject: [PATCH] Switch Windows native build from x86 to x64
---
opendj-server-legacy/src/build-tools/windows/opendj_service.exe.manifest | 2 +-
opendj-server-legacy/src/build-tools/windows/Makefile | 2 +-
.github/workflows/build.yml | 2 +-
opendj-server-legacy/src/build-tools/windows/launcher_administrator.exe.manifest | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a7723c0..a6db0f7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -69,7 +69,7 @@
echo Unable to locate a Visual Studio installation with C++ build tools.
exit /b 1
)
- call "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" x86
+ call "%VSINSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" x64
if errorlevel 1 exit /b %errorlevel%
pushd opendj-server-legacy\src\build-tools\windows
if errorlevel 1 exit /b %errorlevel%
diff --git a/opendj-server-legacy/src/build-tools/windows/Makefile b/opendj-server-legacy/src/build-tools/windows/Makefile
index c1da51e..38b5fc3 100644
--- a/opendj-server-legacy/src/build-tools/windows/Makefile
+++ b/opendj-server-legacy/src/build-tools/windows/Makefile
@@ -36,7 +36,7 @@
SERVICE_PROGNAME=opendj_service.exe
LAUNCHER_ADMINISTRATOR_PROGNAME=launcher_administrator.exe
WINLAUNCHER_PROGNAME=winlauncher.exe
-LINKER=link -nologo /machine:x86
+LINKER=link -nologo /machine:x64
LIBS=advapi32.lib
CFLAGS= -D_WINDOWS -nologo -W3 -O2
diff --git a/opendj-server-legacy/src/build-tools/windows/launcher_administrator.exe.manifest b/opendj-server-legacy/src/build-tools/windows/launcher_administrator.exe.manifest
index f0c7d11..febba1d 100644
--- a/opendj-server-legacy/src/build-tools/windows/launcher_administrator.exe.manifest
+++ b/opendj-server-legacy/src/build-tools/windows/launcher_administrator.exe.manifest
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="1.0.0.0"
- processorArchitecture="X86" name="launcher_administrator" type="win32"/>
+ processorArchitecture="amd64" name="launcher_administrator" type="win32"/>
<description>Executable used to run code that requires administrator privileges</description>
<!-- Identify the application security requirements. -->
<ms_asmv2:trustInfo xmlns:ms_asmv2="urn:schemas-microsoft-com:asm.v2">
diff --git a/opendj-server-legacy/src/build-tools/windows/opendj_service.exe.manifest b/opendj-server-legacy/src/build-tools/windows/opendj_service.exe.manifest
index 55d0c5f..1826a8e 100644
--- a/opendj-server-legacy/src/build-tools/windows/opendj_service.exe.manifest
+++ b/opendj-server-legacy/src/build-tools/windows/opendj_service.exe.manifest
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="1.0.0.0"
- processorArchitecture="X86" name="opendj_service" type="win32"/>
+ processorArchitecture="amd64" name="opendj_service" type="win32"/>
<description>Executable used to run OpenDJ as a Windows Service</description>
<!-- Identify the application security requirements. -->
<ms_asmv2:trustInfo xmlns:ms_asmv2="urn:schemas-microsoft-com:asm.v2">
--
Gitblit v1.10.0