support to run tests in wine and allow to add to WINE* variables
This commit is contained in:
4
configure/os/CONFIG.Linux.win32-x86
Normal file
4
configure/os/CONFIG.Linux.win32-x86
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
include $(CONFIG)/os/CONFIG.win32-x86.win32-x86
|
||||||
|
|
||||||
|
PATH := /opt/wine-msvc-2017/bin/x86:$(PATH)
|
||||||
|
export WINEPREFIX = $(HOME)/.wine32-$(EPICS_HOST_ARCH)
|
@ -4,8 +4,8 @@ VALID_BUILDS = Ioc Command
|
|||||||
|
|
||||||
MSVC_VERSION ?= 2019
|
MSVC_VERSION ?= 2019
|
||||||
PATH := /opt/gfa-wine/bin:/opt/wine-msvc-$(MSVC_VERSION)/bin/x64:$(PATH)
|
PATH := /opt/gfa-wine/bin:/opt/wine-msvc-$(MSVC_VERSION)/bin/x64:$(PATH)
|
||||||
|
export WINE ?= wine64
|
||||||
export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH)
|
export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH)
|
||||||
export WINEDEBUG=fixme-all
|
export WINEDEBUG := err-all,warn-all,fixme-all$(WINEDEBUG:%=,%)
|
||||||
export WINEDLLOVERRIDES="mscoree,mshtml="
|
export WINEDLLOVERRIDES := mscoree,mshtml=$(WINEDLLOVERRIDES:%=,%)
|
||||||
export WINE = wine64
|
export WINEPATH := $(WINEPATH:%=%;)$(abspath $(INSTALL_BIN))
|
||||||
export WINEPATH = $(realpath $(INSTALL_BIN))
|
|
||||||
|
@ -2,9 +2,12 @@ include $(CONFIG)/os/CONFIG_SITE.linux-x86_64.Common
|
|||||||
|
|
||||||
# Improved error checking with clang
|
# Improved error checking with clang
|
||||||
CROSS_COMPILER_TARGET_ARCHS += RHEL9-x86_64-clang
|
CROSS_COMPILER_TARGET_ARCHS += RHEL9-x86_64-clang
|
||||||
|
CROSS_COMPILER_RUNTEST_ARCHS += RHEL9-x86_64-clang
|
||||||
|
|
||||||
# Build for old RHEL8 64 bit
|
# Build for old RHEL8 64 bit
|
||||||
CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64
|
CROSS_COMPILER_TARGET_ARCHS += RHEL8-x86_64
|
||||||
|
CROSS_COMPILER_RUNTEST_ARCHS += RHEL8-x86_64
|
||||||
|
|
||||||
# Build for old RHEL7 64 bit
|
# Build for old RHEL7 64 bit
|
||||||
#CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64
|
#CROSS_COMPILER_TARGET_ARCHS += RHEL7-x86_64
|
||||||
|
#CROSS_COMPILER_RUNTEST_TARGET_ARCHS += RHEL7-x86_64
|
||||||
|
@ -6,3 +6,9 @@
|
|||||||
# Inherit from the linux-x86 host architecture
|
# Inherit from the linux-x86 host architecture
|
||||||
include $(CONFIG)/os/CONFIG_SITE.linux-x86.win32-x86-mingw
|
include $(CONFIG)/os/CONFIG_SITE.linux-x86.win32-x86-mingw
|
||||||
|
|
||||||
|
MINGWLIBS ?= /usr/i686-w64-mingw32/sys-root/mingw/bin
|
||||||
|
export WINE ?= wine
|
||||||
|
export WINEPREFIX = $(HOME)/.wine32-$(EPICS_HOST_ARCH)
|
||||||
|
export WINEDEBUG := err-all,warn-all,fixme-all$(WINEDEBUG:%=,%)
|
||||||
|
export WINEDLLOVERRIDES := mscoree,mshtml=$(WINEDLLOVERRIDES:%=,%)
|
||||||
|
export WINEPATH := $(WINEPATH:%=%;)$(MINGWLIBS);$(abspath $(INSTALL_BIN))
|
||||||
|
@ -6,3 +6,9 @@
|
|||||||
# Inherit from the linux-x86 host architecture
|
# Inherit from the linux-x86 host architecture
|
||||||
include $(CONFIG)/os/CONFIG_SITE.linux-x86.windows-x64-mingw
|
include $(CONFIG)/os/CONFIG_SITE.linux-x86.windows-x64-mingw
|
||||||
|
|
||||||
|
MINGWLIBS ?= /usr/x86_64-w64-mingw32/sys-root/mingw/bin
|
||||||
|
export WINE ?= wine64
|
||||||
|
export WINEPREFIX = $(HOME)/.wine-$(EPICS_HOST_ARCH)
|
||||||
|
export WINEDEBUG := err-all,warn-all,fixme-all$(WINEDEBUG:%=,%)
|
||||||
|
export WINEDLLOVERRIDES := mscoree,mshtml=$(WINEDLLOVERRIDES:%=,%)
|
||||||
|
export WINEPATH := $(WINEPATH:%=%;)$(MINGWLIBS);$(abspath $(INSTALL_BIN))
|
||||||
|
Reference in New Issue
Block a user