Skip to content

Commit e082528

Browse files
committed
To 4.0.0a10 - Fix Boost Download
1 parent 2bdd2ef commit e082528

2 files changed

Lines changed: 18 additions & 6 deletions

File tree

config/Versions.ini

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@ qtinstprog=qt-unified-windows-x64-online.exe
1313
qtsource=http://www.nic.funet.fi/pub/mirrors/download.qt-project.org
1414
nsisv=3.09
1515
pkgconfigv=2.1.0
16-
rubyv=3.3.0-1
16+
rubyv=3.3.6-2
1717
svnv=1.14.2b
1818
#cmakev can be qtcmake for Qt deployed cmake - qtcmake - or set version number if deployed standalone i.e. 3.19.3
1919
cmakev=qtcmake
20-
sqlitev=3.45.1
20+
sqlitev=3.47.1
21+
# Next specifies the Boost download mirror to use. Mandatory.
22+
#b##stsource=https://boostorg.jfrog.io/artifactory/main/
23+
boostsource=https://archives.boost.io/
24+
# Note Version set to 1.85.0 for Qt 5.15.2 compatibility
2125
boostv=1.85.0
2226
unixtools=disabled
2327
cleanfirst=No
@@ -29,8 +33,8 @@ pulllatest=Yes
2933
cpuusage=Solo
3034
srcd=C:\JTSDK64-Tools\tmp\wsjtx
3135
destd=C:\JTSDK64-Tools\tmp\wsjtx-output
32-
#future enhancement to set Qt version
36+
#future enhancement to set Qt version; qt5v is legacy
3337
qt5v=5.15.2
34-
qt6v=6.6.1
38+
qt6v=6.6.3
3539
# next can be pwsh (PS 7+) or powershell (PS Windows 5.1)
3640
pss=pwsh

tools/scripts/Download-Boost.ps1

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#-----------------------------------------------------------------------------#
22
# Name .........: Download-Boost.ps1
33
# Project ......: Part of the JTSDK64 Tools Project
4-
# Version ......: 3.4.1 Beta
4+
# Version ......: 4.0.0 Alpha
55
# Description ..: Downloads selected Boost deployment specified in Versions.ini
66
# Usage ........: Call this file directly from the command line
77
#
@@ -14,6 +14,7 @@
1414
# As of Version 3.2.4 using GIT source for Boost - Steve VK3VM 2024-01-08
1515
# Version 4.0 Beta Revert back to JFrog Steve VK3VM 2023-04-21
1616
# Revert back to Ver 3.4.1; Minor cleanups Steve VK3VM 2023-04-21
17+
# Deal with contrary download locations for boost - read from Versions.ini coordinated by Steve VK3VM 2024-01-11
1718
#
1819
#-----------------------------------------------------------------------------#
1920

@@ -46,6 +47,7 @@ Get-Content $env:jtsdk64VersionConfig | foreach-object -begin {$configTable=@{}}
4647
# Retrieve Boost Version
4748

4849
$boostv = $configTable.Get_Item("boostv")
50+
$boostsource = $configTable.Get_Item("boostsource")
4951

5052
# Place into file format for Boost distribution
5153
# Note: Multi stage here - can be simplified.
@@ -60,11 +62,17 @@ $dLoc = $dlFile.Replace(".zip","") # Remove the .zip extenstion [ For decompre
6062
# Boost Distribution URL
6163

6264
#refert back to JFrog structures 2024-04-21
63-
$dlPath = "https://boostorg.jfrog.io/artifactory/main/release/$boostv/source/$dlFile" # Comment for GIT source
65+
# $dlPath = "https://boostorg.jfrog.io/artifactory/main/release/$boostv/source/$dlFile" # Comment for GIT source
6466
# Example URL used for GIT Development: https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.zip
6567
# Example URL used for JFrog Development: https://boostorg.jfrog.io/artifactory/main/release/1.85.0/source/boost_1_85_0.zip
6668
# $dlPath = "https://github.com/boostorg/boost/releases/download/$dLoc/$dlFile" # Comment for JFrog source
6769

70+
# Read path from veriable from Versions.ini
71+
# i.e.1. We look for https://boostorg.jfrog.io/artifactory/main/release/1.87.0/source/boost_1_87_0.zip
72+
# i.e.2: It now downloads again from https://archives.boost.io/release/1.87.0/source/boost_1_87_0.zip
73+
74+
$dlPath = $boostsource+"release/$boostv/source/$dlFile"
75+
6876
Write-Host " --> Requested Source: $dlPath"
6977

7078
# Download

0 commit comments

Comments
 (0)