Skip to content

Commit 5b05720

Browse files
committed
Merge branch 'dev' of https://github.com/sonic-pi-net/sonic-pi into dev
2 parents 89623ad + 49f56a5 commit 5b05720

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

BUILD-WINDOWS.md

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ dependencies:
4343
1. Visual Studio 2022
4444
2. Qt (6.7+)
4545
3. CMake (3.29+)
46-
4. Ruby (3.3.0+)
46+
4. Ruby (3.3.1+)
4747
5. Elixir (1.16+)
4848

4949
Let's look at each in turn.
@@ -113,10 +113,9 @@ Ruby is needed both for a number of the build steps and as the main
113113
runtime for the language server. We need to install both it and some
114114
additional libraries.
115115

116-
Firstly, install the latest version of Ruby (3.3.0 - 64 bit with devkit) from:
117-
118-
https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.3.0-1/rubyinstaller-3.3.0-1-x64.exe
116+
Firstly, install the latest version of Ruby (3.3.1 - 64 bit with devkit) from:
119117

118+
https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.3.1-1/rubyinstaller-devkit-3.3.1-1-x64.exe
120119

121120
Once you have installed Ruby, you need to grab some additional
122121
libraries. We can do this from the command prompt with the following:
@@ -128,6 +127,15 @@ gem install rugged
128127
This uses the Ruby library management tool `gem` to install rugged which is used to
129128
store the code diffs in a local Git repository.
130129

130+
Note - with Ruby 3.3.1 you will need to modify line 321 of `lib\ruby\3.3.0\win32\registry.rb` from:
131+
132+
```
133+
data = "\0".force_encoding('ASCII-8BIT') * unpackdw(size)
134+
```
135+
to
136+
```
137+
data = "\0".b * unpackdw(size)
138+
```
131139

132140
### 1.5 Install Elixir
133141

@@ -153,7 +161,7 @@ code. The easiest way of getting this is likely to be cloning from GitHub
153161
into a folder on your hard drive such as `C:\dev\sonic-pi`:
154162

155163
```
156-
zgit clone https://github.com/sonic-pi-net/sonic-pi.git C:\dev\sonic-pi
164+
git clone https://github.com/sonic-pi-net/sonic-pi.git C:\dev\sonic-pi
157165
```
158166

159167
If you don't have Git installed you should be able to download a `.zip`
@@ -252,8 +260,4 @@ https://in-thread.sonic-pi.net
252260
- If you're already familiar with Visual Studio you should be able to
253261
take the existing solution file from within the `build` directory
254262
and build things with that.
255-
- For Ruby to work correctly with systems that have their locale set to
256-
Arabic, you need to modify the registry.rb in your Ruby install to
257-
force the locale to UTF-8. For more information see:
258-
https://github.com/sonic-pi-net/sonic-pi/issues/2416
259263

install/windows/wix/LICENSE.rtf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
\cf1 Main Source Code\par
66
\b0\f1\fs12 (contents of \cf2 app/\cf1 directory)\par
77
The MIT License (MIT)\par
8-
Copyright (c) 2012 - 2023 Samuel Aaron and contributors (\cf2 sam@sonic-pi.net\cf1 )\par
8+
Copyright (c) 2012 - 2024 Samuel Aaron and contributors (\cf2 sam@sonic-pi.net\cf1 )\par
99
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\par
1010
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.\par
1111
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\par

0 commit comments

Comments
 (0)