Skip to content

Commit

Permalink
update development docs
Browse files Browse the repository at this point in the history
  • Loading branch information
shun2wang authored and RensDofferhoff committed May 17, 2024
1 parent 046b1a1 commit d2f91b9
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 16 deletions.
11 changes: 6 additions & 5 deletions Docs/development/jasp-build-guide-linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ If you have not cloned the `jasp-desktop` repository, please head back to the [b
- `openssl (1.1.1m)`^1
- `patchelf`^1
- `readstat`^2
- `sqlite`^1
- `V8` (for `jaspProcess`)
- `zlib`^1
- Qt (>= 6.2)
- Qt Creator 7
- Qt (>= 6.7)
- Qt Creator 13

*1: make dependencies (i.e., required for building but not for running JASP)*

Expand Down Expand Up @@ -71,7 +72,7 @@ You also need Qt Creator and Qt 6 to be able to build and test JASP's libraries
- You need to download and install the Qt installer from [Qt website](https://www.qt.io/download).
- After downloading the installer, run the installer and make sure that the following packages are selected for installation
- **Qt**
- **Qt 6.2.4** (or newest stable Qt)
- **Qt 6.7.0** (or newest stable Qt)
- [x] Desktop gcc 64-bit
- [x] Qt 5 Compatibility Module
- [x] Qt Shader Tools
Expand All @@ -80,8 +81,8 @@ You also need Qt Creator and Qt 6 to be able to build and test JASP's libraries
- [x] Qt Web Channel
- [x] Qt Positioning
- **Developer and Designer Tools**
- **Qt Creator 7**
- [x] Qt Creator 7 Debug Symbols
- **Qt Creator 13**
- [x] Qt Creator 13 Debug Symbols
- [x] CMake
- [x] Ninja

Expand Down
6 changes: 3 additions & 3 deletions Docs/development/jasp-build-guide-macos.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ You also need Qt Creator and Qt 6 to be able to build and test JASP's libraries
- Make sure you scroll all the way down to where the FAQ starts and find the button "Download the Qt online installer". This gives access to both proprietary and open-source installs. They want to hide the open-source installs real bad to get people to buy a developer license but it isn't necessary for us. You *do* need a Qt account but you can signup straight from the installer.
- After downloading the installer, run the installer and make sure that the following packages are selected for installation
- **Qt**
- **Qt 6.3.1** (or newest stable Qt)
- **Qt 6.7.0** (or newest stable Qt)
- [x] macOS
- [x] Qt 5 Compatibility Module
- [x] Qt Shader Tools
Expand All @@ -38,8 +38,8 @@ You also need Qt Creator and Qt 6 to be able to build and test JASP's libraries
- [x] Qt Web Channel
- [x] Qt Positioning
- **Developer and Designer Tools**
- **Qt Creator 7**
- [x] Qt Creator 7 Debug Symbols
- **Qt Creator 13**
- [x] Qt Creator 13 Debug Symbols
- [x] CMake
- [x] Ninja

Expand Down
16 changes: 8 additions & 8 deletions Docs/development/jasp-build-guide-windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ If you have not cloned the `jasp-desktop` repository, please head back to the [b
## Requirements

- [Microsoft Visual Studio](https://visualstudio.microsoft.com/downloads/)
- [Qt Creator](https://www.qt.io/download) / Qt >= 6.2
- Qt Creator 7
- [Qt Creator](https://www.qt.io/download) / Qt >= 6.7
- Qt Creator 13
- [RTools44](https://cran.r-project.org/bin/windows/Rtools/rtools44/rtools.html), for building R modules
- [Conan](https://github.com/conan-io/conan/releases) > 1.45.0
- [Conan](https://github.com/conan-io/conan/releases) > 2.0.0
- [WIX Toolset](https://wixtoolset.org), if you want to distribute JASP, i.e., creating an installer.

### Installing Visual Studio
Expand Down Expand Up @@ -37,7 +37,7 @@ You also need Qt Creator and Qt 6 to be able to build and test JASP's libraries
- Make sure you scroll all the way down to where the FAQ starts and find the button "Download the Qt online installer". This gives access to both proprietary and open-source installs. They want to hide the open-source installs real bad to get people to buy a developer license but it isn't necessary for us. You *do* need a Qt account but you can signup straight from the installer.
- After downloading the installer, run the installer and make sure that the following packages are selected for installation
- **Qt**
- **Qt 6.3.1** (or newest stable Qt)
- **Qt 6.7.0** (or newest stable Qt)
- [x] MSVC 2019 64-bit
- [x] MSVC 2019 ARM64 (Optional)
- [x] Qt 5 Compatibility Module
Expand All @@ -47,9 +47,9 @@ You also need Qt Creator and Qt 6 to be able to build and test JASP's libraries
- [x] Qt Web Channel
- [x] Qt Positioning
- **Developer and Designer Tools**
- **Qt Creator 7**
- [x] Qt Creator 7 CDB Debugger Support
- [x] Qt Creator 7 Debug Symbols
- **Qt Creator 13**
- [x] Qt Creator 13 CDB Debugger Support
- [x] Qt Creator 13 Debug Symbols
- [x] Debugging Tools for Windows
- [x] CMake
- [x] Ninja
Expand All @@ -75,7 +75,7 @@ pacman -Syu mingw-w64-ucrt-x86_64-toolchain mingw-w64-ucrt-x86_64-boost jsoncpp
In addition to these libraries, you need to manually download and install the ReadStat library. You can do that by typing the following commands into the command line.

```
git clone https://github.com/WizardMac/ReadStat.git
git clone -b v1.1.9 https://github.com/WizardMac/ReadStat.git
cd ReadStat
export CFLAGS=-Wno-error; export CXXFLAGS=-Wno-error; # I couldnt build 1.1.7 nor 1.1.8 without setting these
autoreconf -i -f
Expand Down

0 comments on commit d2f91b9

Please sign in to comment.