mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

copilot-swe-agent[bot]
yesterday 265d392ece420d86c26cb27d38b81e197e77492f
Switch Windows native build from x86 to x64

Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenDJ/sessions/b9617c34-8ae7-4c63-bd59-85cc0ed53cf1

Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com>
4 files modified
8 ■■■■ changed files
.github/workflows/build.yml 2 ●●● patch | view | raw | blame | history
opendj-server-legacy/src/build-tools/windows/Makefile 2 ●●● patch | view | raw | blame | history
opendj-server-legacy/src/build-tools/windows/launcher_administrator.exe.manifest 2 ●●● patch | view | raw | blame | history
opendj-server-legacy/src/build-tools/windows/opendj_service.exe.manifest 2 ●●● patch | view | raw | blame | history
.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%
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
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">
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">