-
Notifications
You must be signed in to change notification settings - Fork 425
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4 from EQEmu/master
Update
- Loading branch information
Showing
75 changed files
with
1,452 additions
and
672 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| // For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at: | ||
| // https://github.com/microsoft/vscode-dev-containers/tree/v0.101.1/containers/ubuntu-18.04-git | ||
| { | ||
| "name": "Ubuntu 18.04 EQEMU", | ||
| // Moved from dockerfile to image so it builds faster | ||
| "image": "eqemu/devcontainer:0.0.2", | ||
|
|
||
| // Set *default* container specific settings.json values on container create. | ||
| "settings": { | ||
| "terminal.integrated.shell.linux": "/bin/bash" | ||
| }, | ||
|
|
||
| "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ], | ||
|
|
||
| // Add the IDs of extensions you want installed when the container is created. | ||
| "extensions": ["ms-vscode.cpptools", "ms-azuretools.vscode-docker"], | ||
| "mounts": ["source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"], | ||
| "remoteEnv": { | ||
| "HOST_PROJECT_PATH": "${localWorkspaceFolder}" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,8 @@ | |
| *.out | ||
| *.app | ||
|
|
||
| .bash_history | ||
|
|
||
| # CMake | ||
| CMakeCache.txt | ||
| CMakeFiles | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "configurations": [ | ||
| { | ||
| "name": "Linux", | ||
| "includePath": [ | ||
| "${workspaceFolder}/**", | ||
| "/usr/include/mysql" | ||
| ], | ||
| "defines": [], | ||
| "compilerPath": "/usr/bin/gcc", | ||
| "cStandard": "c11", | ||
| "cppStandard": "c++17" | ||
| } | ||
| ], | ||
| "version": 4 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| { | ||
| // See https://go.microsoft.com/fwlink/?LinkId=733558 | ||
| // for the documentation about the tasks.json format | ||
| "version": "2.0.0", | ||
| "tasks": [ | ||
| { | ||
| "label": "make", | ||
| "type": "shell", | ||
| "command": "cd build && make", | ||
| "group": { | ||
| "kind": "build", | ||
| "isDefault": true | ||
| }, | ||
| "problemMatcher": [ | ||
| "$gcc" | ||
| ] | ||
| }, | ||
| { | ||
| "label": "make clean", | ||
| "type": "shell", | ||
| "command": "cd build && make clean", | ||
| "group": { | ||
| "kind": "build", | ||
| "isDefault": true | ||
| }, | ||
| "problemMatcher": [ | ||
| "$gcc" | ||
| ] | ||
| }, | ||
| { | ||
| "label": "cmake", | ||
| "type": "shell", | ||
| "command": "mkdir -p build && cd build && rm CMakeCache.txt && cmake -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_LUA=ON -G 'Unix Makefiles' ..", | ||
| "group": { | ||
| "kind": "build", | ||
| "isDefault": true | ||
| }, | ||
| "problemMatcher":{ | ||
| "owner": "cpp", | ||
| "fileLocation": "relative", | ||
| "pattern":[ | ||
| { | ||
| "regexp": "([\\w+|\\\\]*\\.\\w+)\\((\\d+)\\)\\: (warning|error) (.*)$", | ||
| "file": 1, | ||
| "location": 2, | ||
| "severity": 3, | ||
| "message": 4 | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "label": "download maps", | ||
| "type": "shell", | ||
| "command": "mkdir -p build/bin && cd build/bin && wget https://codeload.github.com/Akkadius/EQEmuMaps/zip/master -O maps.zip && unzip -o maps.zip && rm ./maps -rf && mv EQEmuMaps-master maps && rm maps.zip", | ||
| "group": { | ||
| "kind": "build", | ||
| "isDefault": true | ||
| }, | ||
| "problemMatcher": [ | ||
| "$gcc" | ||
| ] | ||
| }, | ||
| { | ||
| "label": "download quests", | ||
| "type": "shell", | ||
| "command": "mkdir -p build/bin && cd build/bin && cd server && git -C ./quests pull 2> /dev/null || git clone https://github.com/ProjectEQ/projecteqquests.git quests", | ||
| "group": { | ||
| "kind": "build", | ||
| "isDefault": true | ||
| }, | ||
| "problemMatcher": [ | ||
| "$gcc" | ||
| ] | ||
| }, | ||
| { | ||
| "label": "download eqemu_config", | ||
| "type": "shell", | ||
| "command": "mkdir -p build/bin && cd build/bin && wget --no-check-certificate https://raw.githubusercontent.com/Akkadius/EQEmuInstall/master/eqemu_config_docker.json -O eqemu_config.json", | ||
| "group": { | ||
| "kind": "build", | ||
| "isDefault": true | ||
| }, | ||
| "problemMatcher": [ | ||
| "$gcc" | ||
| ] | ||
| }, | ||
| { | ||
| "label": "rebuild database (mariadb must be started)", | ||
| "type": "shell", | ||
| "command": "mkdir -p build/bin && cd build/bin && docker run -i --rm --privileged -v ${HOST_PROJECT_PATH}/build/bin:/src --network=eqemu -it eqemu/server:0.0.3 bash -c './eqemu_server.pl source_peq_db && ./eqemu_server.pl check_db_updates && ./eqemu_server.pl linux_login_server_setup'", | ||
| "group": { | ||
| "kind": "build", | ||
| "isDefault": true | ||
| }, | ||
| "problemMatcher": [ | ||
| "$gcc" | ||
| ] | ||
| }, | ||
| { | ||
| "label": "zone 7000", | ||
| "type": "shell", | ||
| "command": "docker stop zone7000 | true && docker network create eqemu | true && docker run -i --rm --name zone7000 --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged -v ${HOST_PROJECT_PATH}/build/bin:/src --ulimit core=10000000 --network=eqemu -p 7000:7000/udp -e LD_LIBRARY_PATH=/src/ eqemu/server:0.0.3 gdb -ex run --args ./zone dynamic_zone7000:7000", | ||
| "group": { | ||
| "kind": "test", | ||
| "isDefault": true | ||
| } | ||
| }, | ||
| { | ||
| "label": "zone 7001", | ||
| "type": "shell", | ||
| "command": "docker stop zone7001 | true && docker network create eqemu | true && docker run -i --rm --name zone7001 --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged -v ${HOST_PROJECT_PATH}/build/bin:/src --ulimit core=10000000 --network=eqemu -p 7001:7001/udp -e LD_LIBRARY_PATH=/src/ eqemu/server:0.0.3 gdb -ex run --args ./zone dynamic_zone7001:7001", | ||
| "group": { | ||
| "kind": "test", | ||
| "isDefault": true | ||
| } | ||
| }, | ||
| { | ||
| "label": "loginserver", | ||
| "type": "shell", | ||
| "command": "docker stop loginserver | true && docker network create eqemu | true && docker run -i --rm --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --privileged -v ${HOST_PROJECT_PATH}/build/bin:/src --ulimit core=10000000 --network=eqemu --name loginserver -p 5999:5999/udp -p 5998:5998/udp -e LD_LIBRARY_PATH=/src/ eqemu/server:0.0.3 gdb -ex run --args ./loginserver", | ||
| "group": { | ||
| "kind": "test", | ||
| "isDefault": true | ||
| } | ||
| }, | ||
| { | ||
| "label": "shared_memory, world", | ||
| "type": "shell", | ||
| "command": "docker stop sharedmemory | true && docker stop world | true && docker network create eqemu | true && docker run --rm -v ${HOST_PROJECT_PATH}/build/bin:/src --network=eqemu --name sharedmemory eqemu/server:0.0.3 ./shared_memory && docker run --rm -v ${HOST_PROJECT_PATH}/build/bin:/src --ulimit core=10000000 -e LD_LIBRARY_PATH=/src/ --network=eqemu --name world -p 9000:9000 -p 9000:9000/udp -p 9001:9001 -p 9080:9080 eqemu/server:0.0.3 gdb -ex run ./world", | ||
| "group": { | ||
| "kind": "test", | ||
| "isDefault": true | ||
| } | ||
| }, | ||
| { | ||
| "label": "queryserv", | ||
| "type": "shell", | ||
| "command": "docker stop queryserv | true && docker run --rm -v ${HOST_PROJECT_PATH}/build/bin:/src --ulimit core=10000000 -e LD_LIBRARY_PATH=/src/ --network=eqemu --name queryserv eqemu/server:0.0.3 gdb -ex run ./queryserv", | ||
| "group": { | ||
| "kind": "test", | ||
| "isDefault": true | ||
| } | ||
| }, | ||
| { | ||
| "label": "mariadb", | ||
| "type": "shell", | ||
| "command": "docker stop mariadb | true && cd build/bin && docker network create eqemu | true && docker run --rm -v ${HOST_PROJECT_PATH}/build/bin/db:/bitnami/mariadb -p 3306:3306 -e MARIADB_DATABASE=peq -e MARIADB_USER=eqemu -e MARIADB_PASSWORD=eqemupass -e ALLOW_EMPTY_PASSWORD=yes --name mariadb --network=eqemu bitnami/mariadb:latest", | ||
| "group": { | ||
| "kind": "test", | ||
| "isDefault": true | ||
| } | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.