diff --git a/.gitignore b/.gitignore index d810931..abd3a41 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ .DS_Store **/node_modules +third_party +config +target diff --git a/boundle.sh b/boundle.sh new file mode 100755 index 0000000..6476ca3 --- /dev/null +++ b/boundle.sh @@ -0,0 +1,25 @@ +source ./common.sh + +cd ./pomelo && npm install +echo '============ pomelo npm installed ============' +cd .. +cd ./pomelo-globalchannel-plugin && npm install +echo '============ pomelo-globalchannel-plugi npm installed ============' +cd .. +cd ./game-server && npm install +echo '============ game-server npm installed ============' +cd .. +cd ./proxy && npm install +echo '============ proxy npm installed ============' +cd .. +cd ./web-server && npm install +echo '============ web-server npm installed ============' +cd .. + +tag_name=`git status |grep '# On branch '|sed 's/# On branch //g'` +dir_name=`basename $PWD` +package_name=${dir_name}.tar.gz + +tar --exclude=*.git -chzf target/${package_name} pomelo pomelo-globalchannel-plugin game-server shared proxy common.sh reload.sh restart.sh config ${EXT_PKG_FILES} + +echo 'success' \ No newline at end of file diff --git a/common.sh b/common.sh new file mode 100644 index 0000000..b6ae8e8 --- /dev/null +++ b/common.sh @@ -0,0 +1,6 @@ +PROJECT_NAME=r2 +SOURCE_PATH=. +SCRIPT=r2 +EXT_PKG_FILES=r2 +PRE_COMPILE_CMD="" +POST_COMPILE_CMD="" diff --git a/reload.sh b/reload.sh new file mode 100644 index 0000000..e69de29 diff --git a/restart.sh b/restart.sh new file mode 100644 index 0000000..e69de29 diff --git a/web-server/package-lock.json b/web-server/package-lock.json index 11a5e07..6428cea 100644 --- a/web-server/package-lock.json +++ b/web-server/package-lock.json @@ -33,6 +33,14 @@ "nodemon": "^1.19.1" } }, + "../shared": { + "version": "1.0.5", + "license": "ISC", + "dependencies": { + "mysql2": "^3.3.0", + "redis": "^4.6.6" + } + }, "node_modules/@babel/runtime": { "version": "7.21.5", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.5.tgz", @@ -3377,9 +3385,8 @@ "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" }, "node_modules/shared": { - "version": "1.0.5", - "resolved": "file:../shared", - "license": "ISC" + "resolved": "../shared", + "link": true }, "node_modules/shebang-command": { "version": "1.2.0",