From e88168f7e88c8bbbdd1b52732611a6fa506f87db Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Tue, 31 Oct 2023 10:54:28 +0200
Subject: [PATCH] Use XSD 4.2.0

IB-7856

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 examples/android/build.gradle     |  2 +-
 prepare_win_build_environment.ps1 | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/examples/android/build.gradle b/examples/android/build.gradle
index 14aa5e2cc..05a5c9a5e 100644
--- a/examples/android/build.gradle
+++ b/examples/android/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
+        classpath 'com.android.tools.build:gradle:8.1.3'
     }
 }
 
diff --git a/prepare_win_build_environment.ps1 b/prepare_win_build_environment.ps1
index 8ad35fe18..eecc4b8f0 100644
--- a/prepare_win_build_environment.ps1
+++ b/prepare_win_build_environment.ps1
@@ -2,24 +2,20 @@
 param(
 	[string]$vcpkg = "vcpkg\vcpkg.exe",
 	[string]$git = "git.exe",
-	[string]$7zip = "C:\Program Files\7-Zip\7z.exe",
 	[string]$toolset = "142",
-	[string]$xsdver = "xsd-4.0.0-i686-windows",
 	[switch]$xsd = $false,
 	[switch]$dependencies = $false
 )
 
-if(!(Test-Path -Path $vcpkg)) {
-	$vcpkg_dir = (split-path -parent $vcpkg)
-	& $git clone --depth 1 https://github.com/microsoft/vcpkg $vcpkg_dir
-	& $vcpkg_dir\bootstrap-vcpkg.bat
-}
-
 function xsd() {
 	$client = new-object System.Net.WebClient
-	$client.DownloadFile("http://www.codesynthesis.com/download/xsd/4.0/windows/i686/$xsdver.zip", "$PSScriptRoot\$xsdver.zip")
-	& $7zip x "$xsdver.zip" > $null
-	Rename-Item $xsdver xsd
+	& mkdir xsd
+	foreach($xsdver in @("xsd-4.2.0-x86_64-windows10", "libxsd-4.2.0-windows")) {
+		$client.DownloadFile("https://www.codesynthesis.com/download/xsd/4.2/windows/windows10/x86_64/$xsdver.zip", "$PSScriptRoot\$xsdver.zip")
+		& tar xf "$xsdver.zip"
+		& xcopy /e /r /y $xsdver\*.* xsd
+		& Remove-Item $xsdver -Force -Recurse -ErrorAction Ignore
+	}
 }
 
 if($xsd) {
@@ -27,6 +23,11 @@ if($xsd) {
 }
 
 if($dependencies) {
+	if(!(Test-Path -Path $vcpkg)) {
+		$vcpkg_dir = (split-path -parent $vcpkg)
+		& $git clone --depth 1 https://github.com/microsoft/vcpkg $vcpkg_dir
+		& $vcpkg_dir\bootstrap-vcpkg.bat
+	}
 	& $vcpkg install --clean-after-build --triplet x86-windows-v$toolset --x-feature=tests --x-install-root=vcpkg_installed_x86
 	& $vcpkg install --clean-after-build --triplet x64-windows-v$toolset --x-feature=tests --x-install-root=vcpkg_installed_x64
 }