Skip to content

Commit 0dec942

Browse files
authored
Merge pull request #164 from hugtalbot/202501_bump_v2412
Bump SOFA version v24.12
2 parents fde141c + 5eda172 commit 0dec942

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

10_Getting_Started/20_Build/10_Linux.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ SOFA requires some libraries:
129129
sudo apt install libpng-dev libjpeg-dev libtiff-dev libglew-dev zlib1g-dev
130130
```
131131
132-
- SOFA v20.06 and newer also need **Eigen** (>= 3.2.10)
132+
- **Eigen** (>= 3.2.10)
133133
```
134134
sudo apt install libeigen3-dev
135135
```
@@ -180,16 +180,16 @@ as follows:
180180
sofa/
181181
├── build/
182182
│ ├── master/
183-
│ └── v24.06/
183+
│ └── v24.12/
184184
└── src/
185185
└── < SOFA sources here >
186186
```
187187

188188
**First**, checkout the sources from Git repository:
189189

190-
Get the current **stable** version on the v24.06 branch:
190+
Get the current **stable** version on the v24.12 branch:
191191
``` {.bash .stable}
192-
git clone -b v24.06 https://github.com/sofa-framework/sofa.git sofa/src
192+
git clone -b v24.12 https://github.com/sofa-framework/sofa.git sofa/src
193193
```
194194

195195
**OR** get the development **unstable** version on the master branch:
@@ -289,7 +289,8 @@ Fedora image: [https://hub.docker.com/r/sofaframework/sofabuilder_fedora](https:
289289
## Nix package
290290

291291
[Nix](https://nix.dev/) is a package manager which stores all packages into a common place called the Nix store, usually located at /nix/store. Each package is stored in a unique subdirectory in the store, and each package has its own tree structure. A Nix package for SOFA is available and can be used as follows:
292+
292293
- Install [Nix](https://nix.dev/install-nix), you can run `sh <(curl -L https://nixos.org/nix/install) --daemon`, restart your terminal or check the installation using `nix --version`
293294
- From the SOFA sources, build using the command `nix build --extra-experimental-features nix-command --extra-experimental-features flakes` (for master). Note that you can point towards any commit hash: `nix build github:sofa-framework/sofa/COMMIT_HASH_HERE`
294295
- Command `nix develop` provides a shell with an environment containing all required dependencies to build the project in the usual CMake way
295-
- Finally, starts SOFA `nix run --extra-experimental-features nix-command --extra-experimental-features flakes`
296+
- Finally, starts SOFA `nix run --impure .#nixgl --extra-experimental-features nix-command --extra-experimental-features flakes`

10_Getting_Started/20_Build/20_MacOS.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ SOFA requires some libraries:
102102
brew install libpng libjpeg libtiff glew
103103
```
104104

105-
- SOFA v20.06 and newer also need **Eigen** (>= 3.2.10)
105+
- **Eigen** (>= 3.2.10)
106106
```bash
107107
brew install eigen
108108
```
@@ -148,16 +148,16 @@ as follows:
148148
sofa/
149149
├── build/
150150
│ ├── master/
151-
│ └── v24.06/
151+
│ └── v24.12/
152152
└── src/
153153
└── < SOFA sources here >
154154
```
155155
156156
**First**, checkout the sources from Git repository:
157157
158-
Get the current **stable** version on the v24.06 branch:
158+
Get the current **stable** version on the v24.12 branch:
159159
``` {.bash .stable}
160-
git clone -b v24.06 https://github.com/sofa-framework/sofa.git sofa/src
160+
git clone -b v24.12 https://github.com/sofa-framework/sofa.git sofa/src
161161
```
162162
163163
**OR** get the development **unstable** version on the master branch:

10_Getting_Started/20_Build/30_Windows.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ SOFA requires some libraries:
7575
Download the [Windows dependency pack](https://www.sofa-framework.org/download/WinDepPack/VS-2017/latest).
7676
You will need to unzip it directly in SOFA sources (later in this tutorial).
7777
78-
- SOFA v20.06 and newer also need **Eigen** (>= 3.2.10)
78+
- **Eigen** (>= 3.2.10)
7979
Download and extract the [latest Eigen sources](https://gitlab.com/libeigen/eigen/-/releases).
8080
8181
### [optional] PATH modification
@@ -97,16 +97,16 @@ as follows:
9797
sofa/
9898
├── build/
9999
│ ├── master/
100-
│ └── v24.06/
100+
│ └── v24.12/
101101
└── src/
102102
└── < SOFA sources here >
103103
```
104104
105105
**First**, checkout the sources from Git repository:
106106
107-
Get the current **stable** version on the v24.06 branch:
107+
Get the current **stable** version on the v24.12 branch:
108108
``` {.bash .stable}
109-
git clone -b v24.06 https://github.com/sofa-framework/sofa.git sofa/src
109+
git clone -b v24.12 https://github.com/sofa-framework/sofa.git sofa/src
110110
```
111111

112112
**OR** get the development **unstable** version on the master branch:

0 commit comments

Comments
 (0)