Skip to content

OXT-1831 Support 2022 EWDK #2

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

Open
denisj-ais wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OXT-1831 Support 2022 EWDK #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
[submodule "xenbus"]
path = xenbus
url = https://github.com/OpenXT/xenbus.git
branch = openxt-staging-9.0
[submodule "xenvusb"]
path = xenvusb
url = https://github.com/OpenXT/xenvusb.git
Expand All @@ -12,16 +8,20 @@
branch = master
[submodule "ivc"]
path = ivc
url = https://gitlab.com/ericch/ivc.git
branch = troy-winbuild
url = https://gitlab.com/vglass/ivc.git
branch = master
[submodule "pv-display-helper"]
path = pv-display-helper
url = https://gitlab.com/ericch/pv-display-helper.git
branch = troy-winbuild
url = https://gitlab.com/vglass/pv-display-helper.git
branch = master
[submodule "glasswddm"]
path = glasswddm
url = https://gitlab.com/ericch/glasswddm.git
branch = 9.0.0-unify
url = https://gitlab.com/vglass/glasswddm.git
branch = master
[submodule "xenbus"]
path = xenbus
url = https://github.com/OpenXT/xenbus.git
branch = openxt-staging-9.0
[submodule "xencons"]
path = xencons
url = https://github.com/OpenXT/xencons.git
Expand Down
2 changes: 1 addition & 1 deletion glasswddm
Open in desktop
Submodule glasswddm updated from d0aa80 to cb4f7b
10 changes: 0 additions & 10 deletions installer/installer.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
<File Id='XenbusCat' Source='$(var.DIR_XENBUS)xenbus.cat' />
<File Id='XenSys' Source='$(var.DIR_XENBUS)xen.sys' />
<File Id='XenfiltSys' Source='$(var.DIR_XENBUS)xenfilt.sys' />
<File Id='XenbusCoinst' Source='$(var.DIR_XENBUS)xenbus_coinst.dll' />
<File Id='XenbusMonitorDll' Source='$(var.DIR_XENBUS)xenbus_monitor.dll' />
<File Id='XenbusMonitorExe' Source='$(var.DIR_XENBUS)xenbus_monitor.exe' />
<difx:Driver AddRemovePrograms='no' PlugAndPlayPrompt='no' />
Expand All @@ -83,7 +82,6 @@
<File Id='XenconsSys' Source='$(var.DIR_XENCONS)xencons.sys' KeyPath='yes' />
<File Id='XenconsInf' Source='$(var.DIR_XENCONS)xencons.inf' />
<File Id='XenconsCat' Source='$(var.DIR_XENCONS)xencons.cat' />
<File Id='XenconsCoinst' Source='$(var.DIR_XENCONS)xencons_coinst.dll' />
<File Id='XenconsMonitorDll' Source='$(var.DIR_XENCONS)xencons_monitor.dll' />
<File Id='XenconsMonitorExe' Source='$(var.DIR_XENCONS)xencons_monitor.exe' />
<File Id='XenconsTtyExe' Source='$(var.DIR_XENCONS)xencons_tty.exe' />
Expand All @@ -93,7 +91,6 @@
<File Id='XenifaceSys' Source='$(var.DIR_XENIFACE)xeniface.sys' KeyPath='yes' />
<File Id='XenifaceInf' Source='$(var.DIR_XENIFACE)xeniface.inf' />
<File Id='XenifaceCat' Source='$(var.DIR_XENIFACE)xeniface.cat' />
<File Id='XenifaceCoinst' Source='$(var.DIR_XENIFACE)xeniface_coinst.dll' />
<File Id='XenagentDll' Source='$(var.DIR_XENIFACE)xenagent.dll' />
<File Id='XenagentExe' Source='$(var.DIR_XENIFACE)xenagent.exe' />
<difx:Driver AddRemovePrograms='no' PlugAndPlayPrompt='no' />
Expand All @@ -102,28 +99,24 @@
<File Id='XenhidSys' Source='$(var.DIR_XENHID)xenhid.sys' KeyPath='yes' />
<File Id='XenhidInf' Source='$(var.DIR_XENHID)xenhid.inf' />
<File Id='XenhidCat' Source='$(var.DIR_XENHID)xenhid.cat' />
<File Id='XenhidCoinst' Source='$(var.DIR_XENHID)xenhid_coinst.dll' />
<difx:Driver AddRemovePrograms='no' PlugAndPlayPrompt='no' />
</Component>
<Component Id='Xenvkbd' Guid='B3C80249-E80F-4CA4-A293-8E858B45288C' Directory='Xenvkbd'>
<File Id='XenvkbdSys' Source='$(var.DIR_XENVKBD)xenvkbd.sys' KeyPath='yes' />
<File Id='XenvkbdInf' Source='$(var.DIR_XENVKBD)xenvkbd.inf' />
<File Id='XenvkbdCat' Source='$(var.DIR_XENVKBD)xenvkbd.cat' />
<File Id='XenvkbdCoinst' Source='$(var.DIR_XENVKBD)xenvkbd_coinst.dll' />
<difx:Driver AddRemovePrograms='no' PlugAndPlayPrompt='no' />
</Component>
<Component Id='Xenvif' Guid='AA02F568-3DC4-43B6-83BC-75832CA4E4F0' Directory='Xenvif'>
<File Id='XenvifSys' Source='$(var.DIR_XENVIF)xenvif.sys' KeyPath='yes' />
<File Id='XenvifInf' Source='$(var.DIR_XENVIF)xenvif.inf' />
<File Id='XenvifCat' Source='$(var.DIR_XENVIF)xenvif.cat' />
<File Id='XenvifCoinst' Source='$(var.DIR_XENVIF)xenvif_coinst.dll' />
<difx:Driver AddRemovePrograms='no' PlugAndPlayPrompt='no' />
</Component>
<Component Id='Xennet' Guid='3E83BF0A-9405-4523-B418-605D33EC0345' Directory='Xennet'>
<File Id='XennetSys' Source='$(var.DIR_XENNET)xennet.sys' KeyPath='yes' />
<File Id='XennetInf' Source='$(var.DIR_XENNET)xennet.inf' />
<File Id='XennetCat' Source='$(var.DIR_XENNET)xennet.cat' />
<File Id='XennetCoinst' Source='$(var.DIR_XENNET)xennet_coinst.dll' />
<difx:Driver AddRemovePrograms='no' PlugAndPlayPrompt='no' />
</Component>
<Component Id='Xenvbd' Guid='30D77968-F9A7-4466-8436-2A3020F007F3' Directory='Xenvbd'>
Expand All @@ -132,7 +125,6 @@
<File Id='XenvbdCat' Source='$(var.DIR_XENVBD)xenvbd.cat' />
<File Id='XencrshSys' Source='$(var.DIR_XENVBD)xencrsh.sys' />
<File Id='XendiskSys' Source='$(var.DIR_XENVBD)xendisk.sys' />
<File Id='XenvbdCoinst' Source='$(var.DIR_XENVBD)xenvbd_coinst.dll' />
<difx:Driver AddRemovePrograms='no' PlugAndPlayPrompt='no' />
</Component>
</ComponentGroup>
Expand All @@ -141,14 +133,12 @@
<File Id='XenvusbSys' Source='$(var.DIR_XENVUSB)xenvusb.sys' KeyPath='yes' />
<File Id='XenvusbInf' Source='$(var.DIR_XENVUSB)xenvusb.inf' />
<File Id='XenvusbCat' Source='$(var.DIR_XENVUSB)xenvusb.cat' />
<File Id='XenvusbCoinst' Source='$(var.DIR_XENVUSB)xenvusb_coinst.dll' />
<difx:Driver AddRemovePrograms='no' PlugAndPlayPrompt='no' />
</Component>
<Component Id='Xenusbdevice' Guid='3D2B8FE3-A2C4-4D78-B0D1-35D5DFFEBE9A' Directory='Xenusbdevice'>
<File Id='XenusbdeviceSys' Source='$(var.DIR_XENUSBDEVICE)xenusbdevice.sys' KeyPath='yes' />
<File Id='XenusbdeviceInf' Source='$(var.DIR_XENUSBDEVICE)xenusbdevice.inf' />
<File Id='XenusbdeviceCat' Source='$(var.DIR_XENUSBDEVICE)xenusbdevice.cat' />
<File Id='XenusbdeviceCoinst' Source='$(var.DIR_XENUSBDEVICE)xenusbdevice_coinst.dll' />
<difx:Driver AddRemovePrograms='no' PlugAndPlayPrompt='no' />
</Component>
</ComponentGroup>
Expand Down
2 changes: 1 addition & 1 deletion ivc
Open in desktop
Submodule ivc updated from 64929d to b58679
2 changes: 1 addition & 1 deletion pv-display-helper
Open in desktop
Submodule pv-display-helper updated from 3cf21d to 426f0b
2 changes: 1 addition & 1 deletion xenusbdevice
Open in desktop
Submodule xenusbdevice updated 21 files
+22 −6 .gitignore
+12 −7 build.ps1
+42 −14 msbuild.ps1
+0 −5 scripts/genfiles.ps1
+0 −715 src/coinst/coinst.c
+0 −37 src/coinst/xenusbdevice.def
+1 −12 src/xenusbdevice.inf
+0 −6 vs2017/package/package.vcxproj.user
+0 −119 vs2017/xenusbdevice.sln
+0 −64 vs2017/xenusbdevice_coinst/xenusbdevice_coinst.vcxproj
+0 −3 vs2019/package/package.vcxproj
+0 −21 vs2019/xenusbdevice.sln
+1 −1 vs2019/xenusbdevice/xenusbdevice.vcxproj
+0 −64 vs2019/xenusbdevice_coinst/xenusbdevice_coinst.vcxproj
+0 −20 vs2022/configs.props
+0 −0 vs2022/outputpaths.props
+11 −14 vs2022/package/package.vcxproj
+0 −16 vs2022/targets.props
+6 −1 vs2022/version/version.vcxproj
+62 −0 vs2022/xenusbdevice.sln
+11 −13 vs2022/xenusbdevice/xenusbdevice.vcxproj
2 changes: 1 addition & 1 deletion xenvusb
Open in desktop
Submodule xenvusb updated 19 files
+22 −0 .gitignore
+12 −7 build.ps1
+42 −13 msbuild.ps1
+0 −5 scripts/genfiles.ps1
+0 −715 src/coinst/coinst.c
+0 −37 src/coinst/xenvusb_coinst.def
+0 −11 src/xenvusb.inf
+0 −6 vs2017/package/package.vcxproj.user
+0 −65 vs2017/xenvusb_coinst/xenvusb_coinst.vcxproj
+0 −3 vs2019/package/package.vcxproj
+0 −6 vs2019/package/package.vcxproj.user
+0 −21 vs2019/xenvusb.sln
+0 −65 vs2019/xenvusb_coinst/xenvusb_coinst.vcxproj
+0 −0 vs2022/configs.props
+7 −5 vs2022/package/package.vcxproj
+0 −0 vs2022/targets.props
+5 −0 vs2022/version/version.vcxproj
+0 −21 vs2022/xenvusb.sln
+4 −1 vs2022/xenvusb/xenvusb.vcxproj