Skip to content

Commit 7f3656c

Browse files
committed
Full update to xSTUDIO Documentation
Signed-off-by: Ted Waine <[email protected]>
1 parent ba9cc9f commit 7f3656c

File tree

431 files changed

+20163
-10306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

431 files changed

+20163
-10306
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ if (USE_VCPKG)
197197
message(FATAL_ERROR "Failed to ensurepip.")
198198
else()
199199
execute_process(
200-
COMMAND "${Python_EXECUTABLE}" -m pip install setuptools sphinx breathe sphinx-rtd-theme OpenTimelineIO-Plugins importlib_metadata zipp
200+
COMMAND "${Python_EXECUTABLE}" -m pip install setuptools sphinx breathe sphinx-rtd-theme OpenTimelineIO-Plugins importlib_metadata myst-parser zipp
201201
RESULT_VARIABLE PIP_RESULT
202202
)
203203
if(PIP_RESULT)

CMakePresets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"Qt6_DIR": "/Users/tedwaine/Qt6/6.5.3/macos/lib/cmake/Qt6",
1111
"CMAKE_INSTALL_PREFIX": "xstudio_install",
1212
"X_VCPKG_APPLOCAL_DEPS_INSTALL": "ON",
13-
"BUILD_DOCS": "OFF",
13+
"BUILD_DOCS": "ON",
1414
"USE_VCPKG": "ON"
1515
}
1616
},

README.md

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,21 @@
1-
# Welcome to xSTUDIO - v1.0.0 (alpha)
1+
# Welcome to xSTUDIO - v1.0.0
22

33
xSTUDIO is a media playback and review application designed for professionals working in the film and TV post production industries, particularly the Visual Effects and Feature Animation sectors. xSTUDIO is focused on providing an intuitive, easy to use interface with a high performance playback engine at its core and C++ and Python APIs for pipeline integration and customisation for total flexibility.
44

5-
This codebase will build version 1.0.0 (alpha) of xstudio. There are some known issues that are currently being worked on:
5+
## xSTUDIO Documentation
66

7-
* Moderate audio distortion on playback (Windows only)
8-
* Ueser Documentation and API Documentation is badly out-of-date.
9-
* Saved sessions might not restore media correctly (Windows only)
7+
You can browse xSTUDIO's user and reference documentation [here](share/docs/index.html).
108

119
## Building xSTUDIO
1210

13-
This release of xSTUDIO can be built on various Linux flavours and Windows 10 and 11. MacOS compatibility is not available yet but this work is on the roadmap for early 2025.
11+
This release of xSTUDIO can be built on various Linux flavours, MacOS and Windows 10 and 11. Comprehensive build instructions are available as follows:
1412

15-
We provide comprehensive build steps for 4 of the most popular distributions.
16-
17-
### Building xSTUDIO for Linux
18-
19-
* [Linux Generic](docs/build_guides/linux_generic.md)
20-
* [CentOS 7](docs/build_guides/centos_7.md)
21-
* [Rocky Linux 9.1](docs/build_guides/rocky_linux_9_1.md)
22-
* [Ubuntu 22.04](docs/build_guides/ubuntu_22_04.md)
23-
24-
### Building xSTUDIO for Windows
25-
26-
* [Windows](docs/build_guides/windows.md)
27-
28-
### Building xSTUDIO for MacOS
29-
30-
* [MacOS](docs/build_guides/macos.md)
13+
* [Windows](docs/reference/build_guides/windows.md)
14+
* [MacOS](docs/reference/build_guides/macos.md)
15+
* [Linux Generic using VCPKG](docs/reference/build_guides/linux_generic.md)
16+
* [Rocky Linux 9.1](docs/reference/build_guides/rocky_linux_9_1.md)
17+
* [Ubuntu 22.04](docs/reference/build_guides/ubuntu_22_04.md)
3118

3219
### Documentation Note
3320

34-
Note that the xSTUDIO user guide is built with Sphinx using the Read-The-Docs theme. The package dependencies for building the docs can be challenging to install so we instead include the fully built docs as part of xSTUDIO's repo, as well as the source for building the docs. Our build set-up by default disables the building of the docs to make life easy!
21+
Note that the xSTUDIO user guide is built with Sphinx using the Read-The-Docs theme and API documentation is auto-generated using the Breathe plugin for Sphinx. The package dependencies for building the docs can be challenging to build/obtain/install so we instead include the fully built docs as part of xSTUDIO's repo, as well as the source for building the docs. Our build set-up by default disables the building of the docs to make life easy!

docs/CMakeLists.txt

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,11 @@ endforeach(target_var)
2626
set(DOXYGEN_INPUT_DIR ${PROJECT_SOURCE_DIR})
2727
set(DOXYGEN_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/docs/doxygen)
2828
set(DOXYGEN_INDEX_FILE ${DOXYGEN_OUTPUT_DIR}/xml/index.xml)
29+
30+
# TODO: output config should be somewhere in CMAKE_CURRENT_BINARY_DIR, but
31+
# sphinx expects config.py to be in the docs source dir
2932
set(DOXYFILE_IN ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in)
30-
set(DOXYFILE_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
33+
set(DOXYFILE_OUT ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile)
3134
set(CONFFILE_IN ${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in)
3235
set(CONFFILE_OUT ${CMAKE_CURRENT_SOURCE_DIR}/conf.py)
3336

@@ -66,20 +69,9 @@ add_custom_target(Sphinx ALL
6669
-D version=${PROJECT_VERSION}
6770
-D release=${PROJECT_VERSION}
6871
${SPHINX_SOURCE} ${SPHINX_BUILD}
69-
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
72+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
7073
COMMENT "Generating documentation with Sphinx")
7174

72-
set(USER_DOCS_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/user_docs)
73-
set(USER_DOCS_BUILD ${CMAKE_CURRENT_BINARY_DIR}/../bin/user_docs)
74-
75-
add_custom_target(UserDocs ALL
76-
COMMAND ${SPHINX_EXECUTABLE} -q
77-
-D version=${PROJECT_VERSION}
78-
-D release=${PROJECT_VERSION}
79-
${USER_DOCS_SOURCE} ${USER_DOCS_BUILD}
80-
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
81-
COMMENT "Generating user documentation with Sphinx")
82-
8375
if (APPLE)
8476
install(DIRECTORY ${SPHINX_BUILD}/ DESTINATION ${CMAKE_BINARY_DIR}/xSTUDIO.app/Contents/Resources/docs)
8577
else()

0 commit comments

Comments
 (0)