Skip to content

Commit df234ff

Browse files
authored
Documentation (#86)
* Updating documentation to use normal visual studio * Update vcpkg.json to use "version" instead of "version-string".
1 parent 581ca06 commit df234ff

File tree

5 files changed

+23
-13
lines changed

5 files changed

+23
-13
lines changed

.github/appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ install:
143143
# In short: set "build version number" to "version_num-current_commit_short_hash" or when tagged to "tag name" (Travis style).
144144
- ps: |
145145
$vcpkg_json = Get-Content "vcpkg.json" -Raw | ConvertFrom-Json
146-
$env:PROJECT_VERSION = $vcpkg_json."version-string"
146+
$env:PROJECT_VERSION = $vcpkg_json."version"
147147
write-host "build_version_number -> $env:build_version_number"
148148
if ($env:APPVEYOR_REPO_TAG -eq "true")
149149
{

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ endif()
3232
# vcpkg.json is the primary source for version data
3333
file(READ ${CMAKE_SOURCE_DIR}/vcpkg.json VCPKG_JSON_STRING)
3434
string(JSON APP_NAME GET ${VCPKG_JSON_STRING} "name")
35-
string(JSON APP_VERSION GET ${VCPKG_JSON_STRING} "version-string")
35+
string(JSON APP_VERSION GET ${VCPKG_JSON_STRING} "version")
3636
string(JSON APP_LICENSE GET ${VCPKG_JSON_STRING} "license")
3737
string(JSON APP_DESC GET ${VCPKG_JSON_STRING} "description")
3838
string(JSON APP_HOMEPAGE GET ${VCPKG_JSON_STRING} "homepage")

docs/CONTRIBUTING.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Here is a description on how to install for the development of ttauri.
4343

4444
Installation requirements:
4545

46-
- The latest Microsoft Visual Studio Preview from <https://visualstudio.microsoft.com/vs/preview/>
46+
- The latest Microsoft Visual Studio from <https://visualstudio.microsoft.com/downloads/>
4747
- C++ core desktop features
4848
- C++ CMake tools for Windows
4949
- Test Adapter for Google Test
@@ -88,15 +88,15 @@ Select the x64-MSVC-Debug and use the following menu items to build the project:
8888
- Project / Generate Cache for ttauri
8989
- Build / Build All
9090

91-
After building you can select "ttauri_demo.exe" from "Select Startup Item..." next to the run-button. Then
91+
After building you can select "ttauri\_demo.exe" from "Select Startup Item..." next to the run-button. Then
9292
press that button to run the debug build (with the debugger attached).
9393

9494
You may also want to read the following about how to use CMake projects with visual studio:
9595
<https://docs.microsoft.com/en-us/cpp/build/cmake-projects-in-visual-studio?view=msvc-160>
9696

9797
#### Developer Command Prompt for VS 2019
9898

99-
If you already have vcpkg installed you still will need to set VCPKG_ROOT and 'integrate'
99+
If you already have vcpkg installed you still will need to set `VCPKG_ROOT` and 'integrate'
100100
each time you start a new shell.
101101

102102
```
@@ -172,3 +172,4 @@ Code of Conduct
172172

173173
This project and everyone participating in it is governed by the
174174
[TTauri Code of Conduct](https://github.com/ttauri-project/ttauri/blob/main/docs/CODE_OF_CONDUCT.md)
175+

docs/code_style.md

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Code Style rules
2-
================
1+
Code Style
2+
==========
33

44
Identifiers
55
-----------
@@ -26,18 +26,27 @@ The following identifiers are in CamelCase:
2626
Capital letters within a snake\_case identifier are allowed for proper nouns and
2727
abbreviations.
2828

29+
### Common names
30+
31+
Common identifiers:
32+
33+
- `i`, `j`, `k`: Index inside a loop.
34+
- `it`, `jt`, `kt`: Iterator inside a loop.
35+
- `r`: Return value being prepared.
36+
- `first`, `last`: Iterator arguments to a function.
37+
2938
### Prefixes and Suffixes
3039

3140
Common prefixes and suffixes:
3241

3342
- prefix `num_`: Size of a list of items. The prefixed name should be plural
3443
- suffix `_nr`: Ordinal of an item.
3544
- suffix `_i` `_j` `_k`: Index inside a loop associated with an specific list.
36-
- suffix `_it` `_jt` `_kt1`: Iterator inside a loop associated with an specific list.
45+
- suffix `_it` `_jt` `_kt`: Iterator inside a loop associated with an specific list.
3746
- prefix `_`: Private or protected member variables and functions.
3847
- suffix `_`: A variable after conversion to a different type.
39-
- prefix `tt_`: A macro
4048
- suffix `_type`: A type created inside a class.
49+
- prefix `tt_`: A macro
4150

4251
Private or protected member variables are prefixed with "\_", so that
4352
getter/setter member functions names will not alias with the variables.
@@ -73,7 +82,7 @@ variable would be a mutex named `mutex`.
7382
Two phase construction
7483
----------------------
7584

76-
When a polymorphic class needs to polymorphic initialization and destruction it should
85+
When a polymorphic class needs polymorphic initialization and destruction it should
7786
add the following two virtual functions:
7887

7988
- virtual void `init()`
@@ -114,6 +123,6 @@ Subsystems
114123
----------
115124

116125
A subsystem will have a name in the `system_status_type` enum, and will have a global function under the same name
117-
suffixed with \_start. This subsystem_start function is used to initialize and register the deinitialize function
118-
with the system_status. The subsystem_start function must be low latency so that it can be called very often to make
126+
suffixed with \_start. This subsystem\_start function is used to initialize and register the deinitialize function
127+
with the system\_status. The subsystem\_start function must be low latency so that it can be called very often to make
119128
sure the subsystem is started when functionality of the subsystem is used for the first time.

vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ttauri",
3-
"version-string": "0.3.0",
3+
"version": "0.3.0",
44
"license": "BSL-1.0",
55
"homepage": "https://github.com/ttauri-project/ttauri",
66
"description": "A portable, low latency, retained-mode GUI library written in C++.",

0 commit comments

Comments
 (0)