Skip to content

devel and version-2-0 channels now use csources_v2 #317

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
ringabout wants to merge 2 commits into
base: master
Choose a base branch
from
Open

devel and version-2-0 channels now use csources_v2 #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b620832
devel and version-2-0 now uses csource_v2
ringabout Dec 22, 2022
420eb93
typo
ringabout Dec 22, 2022
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
2 changes: 1 addition & 1 deletion src/choosenimpkg/builder.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ proc buildCompiler(version: Version, params: CliParams) =
display("Warning:", "Building from latest C sources. They may not be " &
"compatible with the Nim version you have chosen to " &
"install.", Warning, HighPriority)
let path = downloadCSources(params)
let path = downloadCSources(version, params)
let extractDir = getCurrentDir() / "csources"
extract(path, extractDir)

Expand Down
14 changes: 11 additions & 3 deletions src/choosenimpkg/download.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,11 +316,19 @@ proc download*(version: Version, params: CliParams): string =
raise newException(ChooseNimError, "Version $1 does not exist." %
$version)

proc downloadCSources*(params: CliParams): string =
template useCSourcesV2(version: Version): bool =
$version in ["#head", "#devel", "#version-2-0"]

proc downloadCSources*(version: Version, params: CliParams): string =
let csourcesAdaptedUrl =
if useCSourcesV2(version):
csourcesUrl & "_v2"
else:
csourcesUrl
let
commit = getLatestCommit(csourcesUrl, "master")
commit = getLatestCommit(csourcesAdaptedUrl, "master")
archive = if commit.len != 0: commit else: "master"
csourcesArchiveUrl = $(parseUri(csourcesUrl) / (dlArchive % archive))
csourcesArchiveUrl = $(parseUri(csourcesAdaptedUrl) / (dlArchive % archive))

var outputPath: string
if not needsDownload(params, csourcesArchiveUrl, outputPath):
Expand Down