Skip to content

S
srvpro
Commit f95fca2d authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' of https://github.com/purerosefallen/ygopro-server

parents 7de02845 9dd264b8
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 65 deletions
config_build/config.json
View file @ f95fca2d
...@@ -165,20 +165,6 @@ ...@@ -165,20 +165,6 @@
"port": 7213, "port": 7213,
"password": "Nanahira", "password": "Nanahira",
"hooks": { "hooks": {
"script": {
"path": "./ygopro/script/",
"remote": "origin",
"branch": "master",
"callback": {
"command": "git",
"args": [
"reset",
"--hard",
"FETCH_HEAD"
],
"path": "./ygopro/script/"
}
},
"windbot": { "windbot": {
"path": "./windbot/", "path": "./windbot/",
"remote": "origin", "remote": "origin",
...@@ -194,12 +180,12 @@ ...@@ -194,12 +180,12 @@
"ygopro": { "ygopro": {
"path": "./ygopro/", "path": "./ygopro/",
"remote": "origin", "remote": "origin",
"branch": "master", "branch": "server",
"callback": { "callback": {
"command": "bash", "command": "bash",
"args": [ "args": [
"-c", "-c",
"premake4 gmake ; cd build ; make config=release ; cd .. ; strip ygopro" "git reset --hard FETCH_HEAD ; cd ocgcore ; git pull origin master ; git reset --hard FETCH_HEAD ; cd ../script ; git pull origin master ; git reset --hard FETCH_HEAD ; cd .. ; premake4 gmake ; cd build ; make config=release ; cd .. ; strip ygopro"
], ],
"path": "./ygopro/" "path": "./ygopro/"
} }
......
config_tourney/config.json
View file @ f95fca2d
...@@ -165,20 +165,6 @@ ...@@ -165,20 +165,6 @@
"port": 7213, "port": 7213,
"password": "Nanahira", "password": "Nanahira",
"hooks": { "hooks": {
"script": {
"path": "./ygopro/script/",
"remote": "origin",
"branch": "master",
"callback": {
"command": "git",
"args": [
"reset",
"--hard",
"FETCH_HEAD"
],
"path": "./ygopro/script/"
}
},
"windbot": { "windbot": {
"path": "./windbot/", "path": "./windbot/",
"remote": "origin", "remote": "origin",
...@@ -194,12 +180,12 @@ ...@@ -194,12 +180,12 @@
"ygopro": { "ygopro": {
"path": "./ygopro/", "path": "./ygopro/",
"remote": "origin", "remote": "origin",
"branch": "master", "branch": "server",
"callback": { "callback": {
"command": "bash", "command": "bash",
"args": [ "args": [
"-c", "-c",
"premake4 gmake ; cd build ; make config=release ; cd .. ; strip ygopro" "git reset --hard FETCH_HEAD ; cd ocgcore ; git pull origin master ; git reset --hard FETCH_HEAD ; cd ../script ; git pull origin master ; git reset --hard FETCH_HEAD ; cd .. ; premake4 gmake ; cd build ; make config=release ; cd .. ; strip ygopro"
], ],
"path": "./ygopro/" "path": "./ygopro/"
} }
......
data/default_config.json
View file @ f95fca2d
...@@ -165,25 +165,6 @@ ...@@ -165,25 +165,6 @@
"port": 7966, "port": 7966,
"password": "123456", "password": "123456",
"hooks": { "hooks": {
"script": {
"path": "./ygopro/script/",
"remote": "origin",
"branch": "master",
"callback": false
},
"ocgcore": {
"path": "./ygopro/ocgcore/",
"remote": "origin",
"branch": "master",
"callback": {
"command": "bash",
"args": [
"-c",
"premake4 gmake ; cd build ; make config=release ; cd .. ; strip ygopro"
],
"path": "./ygopro/"
}
},
"ygopro": { "ygopro": {
"path": "./ygopro/", "path": "./ygopro/",
"remote": "origin", "remote": "origin",
...@@ -192,7 +173,7 @@ ...@@ -192,7 +173,7 @@
"command": "bash", "command": "bash",
"args": [ "args": [
"-c", "-c",
"premake4 gmake ; cd build ; make config=release ; cd .. ; strip ygopro" "cd ocgcore ; git pull origin master ; cd ../script ; git pull origin master ; cd .. ; premake4 gmake ; cd build ; make config=release ; cd .. ; strip ygopro"
], ],
"path": "./ygopro/" "path": "./ygopro/"
} }
......
docs/install_centos.sh
View file @ f95fca2d
...@@ -58,22 +58,25 @@ cd .. ...@@ -58,22 +58,25 @@ cd ..
cd .. cd ..
git clone --depth=1 https://github.com/purerosefallen/ygopro-server ygopro-server git clone https://github.com/purerosefallen/ygopro-server ygopro-server
cd ygopro-server cd ygopro-server
npm install npm install
cp -rf config_build config cp -rf config_build config
mkdir decks decks_save replays mkdir decks decks_save replays
git clone --depth=1 https://github.com/purerosefallen/ygopro-7210srv ygopro git clone https://github.com/purerosefallen/ygopro --branch=server --recursive
cd ygopro cd ygopro/
premake4 gmake premake4 gmake
cd build cd ocgcore/
git checkout master
cd ../script/
git checkout master
cd ../build/
make config=release make config=release
cd .. cd ..
ln -s bin/release/ygopro . ln -s bin/release/ygopro ./
strip ygopro strip ygopro
mkdir replay mkdir replay
git clone --depth=1 https://github.com/Smile-DK/ygopro-scripts script
cd .. cd ..
git clone --depth=1 https://github.com/purerosefallen/windbot git clone --depth=1 https://github.com/purerosefallen/windbot
......
docs/install_ubnutu.sh
View file @ f95fca2d
...@@ -57,25 +57,28 @@ cd .. ...@@ -57,25 +57,28 @@ cd ..
cd .. cd ..
git clone --depth=1 https://github.com/purerosefallen/ygopro-server ygopro-server git clone https://github.com/purerosefallen/ygopro-server ygopro-server
cd ygopro-server cd ygopro-server
npm install npm install
cp -rf config_build config cp -rf config_build config
mkdir decks decks_save replays mkdir decks decks_save replays
git clone --depth=1 https://github.com/purerosefallen/ygopro-7210srv ygopro git clone https://github.com/purerosefallen/ygopro --branch=server --recursive
cd ygopro cd ygopro/
premake4 gmake premake4 gmake
cd build cd ocgcore/
git checkout master
cd ../script/
git checkout master
cd ../build/
make config=release make config=release
cd .. cd ..
ln -s bin/release/ygopro . ln -s bin/release/ygopro ./
strip ygopro strip ygopro
mkdir replay mkdir replay
git clone --depth=1 https://github.com/Smile-DK/ygopro-scripts script
cd .. cd ..
git clone --depth=1 https://github.com/purerosefallen/windbot git clone https://github.com/purerosefallen/windbot
cd windbot cd windbot
echo y | xbuild /property:Configuration=Release echo y | xbuild /property:Configuration=Release
ln -s bin/Release/WindBot.exe . ln -s bin/Release/WindBot.exe .
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment