Skip to content

Commit

Permalink
Fix errors in the binary-release Windows build script
Browse files Browse the repository at this point in the history
I still had no chance to try this on CircleCI, but manually following the
instructions revealed these errors.
Also explicitly specify the compile toolchain on linux, so the script is
not so much dependent on what shows up in the environment.
  • Loading branch information
PatZim committed Feb 1, 2020
1 parent 15621b8 commit d01d4b2
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion tools/build/binary-release/build-linux.sh
Expand Up @@ -19,7 +19,7 @@ tar -xzf rakudo.tgz
cd rakudo-*

# Build Rakudo
perl Configure.pl --gen-moar --gen-nqp --backends=moar --relocatable
perl Configure.pl --gen-moar --gen-nqp --backends=moar --moar-option='--toolchain=gnu' --relocatable
make
make install

Expand Down
11 changes: 5 additions & 6 deletions tools/build/binary-release/build-windows.ps1
Expand Up @@ -35,7 +35,7 @@ cd rakudo-*

# Build Rakudo

perl Configure.pl --gen-moar --gen-nqp --backends=moar --relocatable
perl Configure.pl --gen-moar --gen-nqp --backends=moar --moar-option='--toolchain=msvc' --relocatable
CheckLastExitCode
nmake install
CheckLastExitCode
Expand All @@ -54,16 +54,15 @@ CheckLastExitCode
cd zef
..\install\bin\raku.exe -I. bin\zef install .
CheckLastExitCode
cd ..


# Prepare the package

cp -r "tools\build\binary-release\Windows\*" install
cp -Force -r "tools\build\binary-release\Windows\*" install
cp LICENSE install

$version = Get-Content -Path .\VERSION -Raw
$version = $version.Trim()
mv install rakudo-$version
mv install rakudo-$Env:VERSION

Compress-Archive -Path rakudo-$version -DestinationPath ..\rakudo-win.zip
Compress-Archive -Path rakudo-$Env:VERSION -DestinationPath ..\rakudo-win.zip

0 comments on commit d01d4b2

Please sign in to comment.