mirror of
https://github.com/ossrs/srs.git
synced 2025-11-23 19:34:05 +08:00
Refactor: Rename ide/ directory to cmake/ for better clarity (#4539)
This PR renames the trunk/ide/ directory to trunk/cmake/ to better reflect its actual purpose. The directory contains CMake build configuration files used by multiple IDEs (CLion, VSCode), not IDE-specific files. * Directory rename: trunk/ide/ → trunk/cmake/ * Build output location: trunk/ide/vscode-build/ → trunk/cmake/build/ * CMakeLists.txt: Moved from trunk/ide/srs_clion/CMakeLists.txt to trunk/cmake/CMakeLists.txt
This commit is contained in:
@@ -41,4 +41,4 @@
|
||||
**/usr/**
|
||||
**/.github/**
|
||||
**/gdb/**
|
||||
**/ide/**
|
||||
**/cmake/**
|
||||
|
||||
8
.gitignore
vendored
8
.gitignore
vendored
@@ -35,12 +35,6 @@
|
||||
*.exe
|
||||
|
||||
cmake-build-debug
|
||||
/trunk/ide/srs_clion/CMakeCache.txt
|
||||
/trunk/ide/srs_clion/CMakeFiles
|
||||
/trunk/ide/srs_clion/Makefile
|
||||
/trunk/ide/srs_clion/cmake_install.cmake
|
||||
/trunk/ide/srs_clion/srs
|
||||
/trunk/ide/srs_clion/Testing/
|
||||
/trunk/ide/vscode-build
|
||||
/build/
|
||||
/trunk/cmake/build
|
||||
|
||||
|
||||
14
.vscode/README.md
vendored
14
.vscode/README.md
vendored
@@ -17,26 +17,26 @@ Run commmand to configure the project by pressing `Command+Shift+P`, then type `
|
||||
then select `Clang` as the toolchain. Or run the command manually in terminal:
|
||||
|
||||
```bash
|
||||
cmake -S $HOME/git/srs/trunk/ide/srs_clion -B $HOME/git/srs/trunk/ide/vscode-build
|
||||
cmake -S $HOME/git/srs/trunk/cmake -B $HOME/git/srs/trunk/cmake/build
|
||||
```
|
||||
|
||||
> Note: Sometimes it may fail to configure when building libsrtp. Just retry, and it will succeed.
|
||||
|
||||
> Note: Make sure you have `xcode` installed, and run `xcode-select --install` to setup the toolchains.
|
||||
|
||||
> Note: The `settings.json` is used to configure the cmake. It will use `$HOME/git/srs/trunk/ide/srs_clion/CMakeLists.txt`
|
||||
> and `$HOME/git/srs/trunk/ide/vscode-build` as the source file and build directory.
|
||||
> Note: The `settings.json` is used to configure the cmake. It will use `$HOME/git/srs/trunk/cmake/CMakeLists.txt`
|
||||
> and `$HOME/git/srs/trunk/cmake/build` as the source file and build directory.
|
||||
|
||||
Click the `Run > Run Without Debugging` or `Run > Start Debugging` from menu to start or
|
||||
debug the server. It will invoke the `build` task defined in `tasks.json`, or you can run
|
||||
it manually:
|
||||
|
||||
```bash
|
||||
cmake --build $HOME/git/srs/trunk/ide/vscode-build
|
||||
cmake --build $HOME/git/srs/trunk/cmake/build
|
||||
```
|
||||
|
||||
> Note: The `launch.json` is used for running and debugging. The build will output the binary to
|
||||
> `$HOME/git/srs/trunk/ide/vscode-build/srs`.
|
||||
> `$HOME/git/srs/trunk/cmake/build/srs`.
|
||||
|
||||
## macOS: SRS UTest
|
||||
|
||||
@@ -51,7 +51,7 @@ Run commmand to configure the project by pressing `Command+Shift+P`, then type `
|
||||
then select `Clang` as the toolchain. Or run the command manually in terminal:
|
||||
|
||||
```bash
|
||||
cmake -S $HOME/git/srs/trunk/ide/srs_clion -B $HOME/git/srs/trunk/ide/vscode-build
|
||||
cmake -S $HOME/git/srs/trunk/cmake -B $HOME/git/srs/trunk/cmake/build
|
||||
```
|
||||
|
||||
> Note: Sometimes it may fail to configure when building libsrtp. Just retry, and it will succeed.
|
||||
@@ -60,7 +60,7 @@ Afterwards, build the utest by pressing `Command+Shift+P`, then type `CMake: Bui
|
||||
build command. It will invoke the `build` task defined in `tasks.json`, or you can run it manually:
|
||||
|
||||
```bash
|
||||
cmake --build $HOME/git/srs/trunk/ide/vscode-build
|
||||
cmake --build $HOME/git/srs/trunk/cmake/build
|
||||
```
|
||||
|
||||
Then you will discover all the unit testcases from the `View > Testing` panel. You can
|
||||
|
||||
2
.vscode/launch.json
vendored
2
.vscode/launch.json
vendored
@@ -5,7 +5,7 @@
|
||||
"name": "Launch SRS",
|
||||
"type": "cppdbg",
|
||||
"request": "launch",
|
||||
"program": "${workspaceFolder}/trunk/ide/vscode-build/srs",
|
||||
"program": "${workspaceFolder}/trunk/cmake/build/srs",
|
||||
"args": ["-c", "conf/console.conf"],
|
||||
"stopAtEntry": false,
|
||||
"cwd": "${workspaceFolder}/trunk",
|
||||
|
||||
6
.vscode/settings.json
vendored
6
.vscode/settings.json
vendored
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"cmake.sourceDirectory": "${workspaceFolder}/trunk/ide/srs_clion",
|
||||
"cmake.buildDirectory": "${workspaceFolder}/trunk/ide/vscode-build",
|
||||
"cmake.sourceDirectory": "${workspaceFolder}/trunk/cmake",
|
||||
"cmake.buildDirectory": "${workspaceFolder}/trunk/cmake/build",
|
||||
"cmake.configureOnOpen": false,
|
||||
"cmake.ctest.testExplorerIntegrationEnabled": false,
|
||||
"testMate.cpp.test.advancedExecutables": [
|
||||
"{build,Build,BUILD,out,Out,OUT}/**/*{test,Test,TEST}*",
|
||||
"${workspaceFolder}/trunk/ide/vscode-build/**/*{utest,test,Test,TEST}*"
|
||||
"${workspaceFolder}/trunk/cmake/build/**/*{utest,test,Test,TEST}*"
|
||||
],
|
||||
"files.associations": {
|
||||
"vector": "cpp",
|
||||
|
||||
2
.vscode/tasks.json
vendored
2
.vscode/tasks.json
vendored
@@ -4,7 +4,7 @@
|
||||
{
|
||||
"label": "build",
|
||||
"type": "shell",
|
||||
"command": "cmake --build ${workspaceFolder}/trunk/ide/vscode-build",
|
||||
"command": "cmake --build ${workspaceFolder}/trunk/cmake/build",
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
|
||||
@@ -11,7 +11,7 @@ set (CMAKE_CXX_STANDARD 11)
|
||||
|
||||
###########################################################
|
||||
execute_process(
|
||||
COMMAND bash -c "cd ${PROJECT_SOURCE_DIR}/../../ && pwd"
|
||||
COMMAND bash -c "cd ${PROJECT_SOURCE_DIR}/../ && pwd"
|
||||
OUTPUT_VARIABLE SRS_DIR
|
||||
)
|
||||
string(STRIP ${SRS_DIR} SRS_DIR)
|
||||
Reference in New Issue
Block a user