Skip to content

Commit 14cd9bf

Browse files
authored
Merge pull request #25 from dirkolbrich/master
2 parents 78ed435 + 03ad57c commit 14cd9bf

File tree

2 files changed

+36
-27
lines changed

2 files changed

+36
-27
lines changed

codeformatting/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ FreeCAD's codebase currently includes a preliminary [.clang-format](https://gith
1818
### C++ Copyright Header
1919

2020
The following is the standard C++ copyright header that should be included in all new C++ files (and backported to files a developer is making significant changes to if they do not already have this format).
21-
```
22-
// SPDX-License-Identifier: LGPL-2.1-or-later
2321

22+
```cpp
23+
// SPDX-License-Identifier: LGPL-2.1-or-later
2424
/****************************************************************************
2525
* *
2626
* Copyright (c) <YEAR> <YOUR NAME> <YOUR EMAIL> *
@@ -52,7 +52,7 @@ There is no unified Python coding style agreed upon for the FreeCAD codebase: ea
5252

5353
The following is the standard Python copyright header that should be included in all new Python files (and backported to files a developer is making significant changes to if they do not already have this format).
5454

55-
```
55+
```python
5656
# SPDX-License-Identifier: LGPL-2.1-or-later
5757
# ***************************************************************************
5858
# * *

gettingstarted/index.md

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,40 +13,49 @@ Working on FreeCAD is similar to working on may other open-source projects. This
1313
## Build Environment
1414

1515
To work on FreeCAD you will need CMake, git, a code editor, a C++ compiler, and a Python interpreter. Many different combinations work:
16-
* On Linux, it's common to use vim, emacs, KDevelop, or CLion as your editor. Compilation with GCC and Clang is supported.
17-
* On Windows we support Visual Studio, Visual Studio Code, and CLion for development, all using the MSVC compiler toolchain.
18-
* On MacOS you will need to install the XCode command line tools, and can use XCode, Visual Studio Code, or CLion as your editor.
16+
17+
- On Linux, it's common to use vim, emacs, KDevelop, or CLion as your editor. Compilation with GCC and Clang is supported.
18+
- On Windows we support Visual Studio, Visual Studio Code, and CLion for development, all using the MSVC compiler toolchain.
19+
- On MacOS you will need to install the XCode command line tools, and can use XCode, Visual Studio Code, or CLion as your editor.
1920

2021
Other combinations may work as well, these are just the ones that you will be able to get help with most readily on the [FreeCAD Forum](https://forum.freecad.org).
2122

2223
## Dependencies
2324

2425
FreeCAD depends on many other open source projects to provide the basic foundations of the program. There are many ways of installing these dependencies: for details and the complete list, see the following Wiki pages:
25-
* Linux: https://wiki.freecad.org/Compile_on_Linux
26-
* Windows: https://wiki.freecad.org/Compile_on_Windows
27-
* Mac: https://wiki.freecad.org/Compile_on_MacOS
26+
27+
- Linux: https://wiki.freecad.org/Compile_on_Linux
28+
- Windows: https://wiki.freecad.org/Compile_on_Windows
29+
- Mac: https://wiki.freecad.org/Compile_on_MacOS
2830

2931
## Setting up for Development
3032

31-
1) Fork https://github.com/FreeCAD/FreeCAD on GitHub
32-
2) Clone your fork: for example, on the command line you can use `git clone https://github.com/YourUsername/FreeCAD FreeCAD-src`
33-
3) Set up `pre-commit` (our automatic code-formatter and checker):
34-
1) `pip install pre-commit`
35-
2) `cd FreeCAD-src`
36-
3) `pre-commit install`
37-
4) Run CMake, either in via the CMake GUI or on the command line see the wiki compilation page for your operating system for a detailed list of options. Note: we **strongly** recommend doing an out-of-source build, putting all generated files in their own directory.
38-
5) CMake will generate project files that can be read by your IDE of choice. See your IDE's documentation for details. In general:
39-
* On Linux, compile with a command like `cmake --build /path/to/FreeCAD-src` run from your build directory.
40-
* On Windows with Visual Studio, build the "ALL_BUILD target" (you will have to change the path to the final executable the first time you try to run that target).
41-
* On Mac on the command line use `cmake --build /path/to/FreeCAD-src` from your build directory, or if using CLion be sure to "Build All" the first time you run.
42-
6) If you plan on submitting a PR, create a branch: `git checkout -b fixTheThing`
33+
1. Fork https://github.com/FreeCAD/FreeCAD on GitHub
34+
2. Clone your fork: for example, on the command line you can use `git clone https://github.com/YourUsername/FreeCAD FreeCAD-src`
35+
3. Set up `pre-commit` (our automatic code-formatter and checker):
36+
37+
38+
- `pip install pre-commit`
39+
- `cd FreeCAD-src`
40+
- `pre-commit install`
41+
42+
43+
4. Run CMake, either in via the CMake GUI or on the command line see the wiki compilation page for your operating system for a detailed list of options. Note: we **strongly** recommend doing an out-of-source build, putting all generated files in their own directory.
44+
5. CMake will generate project files that can be read by your IDE of choice. See your IDE's documentation for details. In general:
45+
46+
- On Linux, compile with a command like `cmake --build /path/to/FreeCAD-src` run from your build directory.
47+
- On Windows with Visual Studio, build the "ALL_BUILD target" (you will have to change the path to the final executable the first time you try to run that target).
48+
- On Mac on the command line use `cmake --build /path/to/FreeCAD-src` from your build directory, or if using CLion be sure to "Build All" the first time you run.
49+
50+
6. If you plan on submitting a PR, create a branch: `git checkout -b fixTheThing`
4351

4452
## Submitting a PR
4553

4654
The basic process is:
47-
1) Write some code (and possibly some unit tests)
48-
2) `git add file1.cpp file2.cpp`
49-
3) `git commit -m "Sketcher: Fixed bug in constraints" -m "Added foo to bar. Fixes #1234."`
50-
* When running `git commit` our pre-commit hooks will run to check your code. If the scripts had to make changes, you will have to `git add` the changed files and run `git commit` again.
51-
4) `git push` to send your changes to GitHub
52-
5) Visit https://github.com/FreeCAD/FreeCAD -- at the top of the screen you should see a yellow banner suggesting you create a Pull Request. Follow the instructions on the site to get the process started.
55+
56+
1. Write some code (and possibly some unit tests)
57+
2. `git add file1.cpp file2.cpp`
58+
3. `git commit -m "Sketcher: Fixed bug in constraints" -m "Added foo to bar. Fixes #1234."`
59+
- When running `git commit` our pre-commit hooks will run to check your code. If the scripts had to make changes, you will have to `git add` the changed files and run `git commit` again.
60+
4. `git push` to send your changes to GitHub
61+
5. Visit https://github.com/FreeCAD/FreeCAD -- at the top of the screen you should see a yellow banner suggesting you create a Pull Request. Follow the instructions on the site to get the process started.

0 commit comments

Comments
 (0)