diff --git a/build.xml b/build.xml index f465275473173932c249ae3797a03c6357779765..040bfc51e381528c629f61f8e95a80b8b59de37e 100644 --- a/build.xml +++ b/build.xml @@ -1,85 +1,86 @@ + - - + + - - + + - - + + - - + + - - + + - - + + - - + + callback( - { - "windows": { + { + "windows": { "system": "windows", "name": "o2server-windows-${VERSION}", "fileName": "o2server-windows-${VERSION}.zip", @@ -87,8 +88,8 @@ "updateTime": "${TODAY}", "url": "/download/o2server-windows-${VERSION}.zip", "sha256": "${build_win.sha}" - }, - "linux": { + }, + "linux": { "system": "linux", "name": "o2server-linux-${VERSION}", "fileName": "o2server-linux-${VERSION}.zip", @@ -96,8 +97,8 @@ "updateTime": "${TODAY}", "url": "/download/o2server-linux-${VERSION}.zip", "sha256": "${build_linux.sha}" - }, - "macos": { + }, + "macos": { "system": "macos", "name": "o2server-macos-${VERSION}", "fileName": "o2server-macos-${VERSION}.zip", @@ -105,8 +106,8 @@ "updateTime": "${TODAY}", "url": "/download/o2server-macos-${VERSION}.zip", "sha256": "${build_macos.sha}" - }, - "aix": { + }, + "aix": { "system": "aix", "name": "o2server-aix-${VERSION}", "fileName": "o2server-aix-${VERSION}.zip", @@ -114,8 +115,8 @@ "updateTime": "${TODAY}", "url": "/download/o2server-aix-${VERSION}.zip", "sha256": "${build_aix.sha}" - }, - "raspberrypi": { + }, + "raspberrypi": { "system": "raspberrypi", "name": "o2server-raspberrypi-${VERSION}", "fileName": "o2server-raspberrypi-${VERSION}.zip", @@ -123,32 +124,32 @@ "updateTime": "${TODAY}", "url": "/download/o2server-raspberrypi-${VERSION}.zip", "sha256": "${build_raspberrypi.sha}" - }, - "neokylin_loongson": { - "system": "neokylin_loongson", - "name": "o2server-neokylin-loongson-${VERSION}", - "fileName": "o2server-neokylin-loongson-${VERSION}.zip", - "fileSize": "${length_neokylin-loongson_mb}MB", + }, + "risc": { + "system": "risc", + "name": "o2server-risc-${VERSION}", + "fileName": "o2server-risc-${VERSION}.zip", + "fileSize": "${length_risc_mb}MB", "updateTime": "${TODAY}", - "url": "/download/o2server-neokylin-loongson-${VERSION}.zip", - "sha256": "${build_neokylin-loongson.sha}" - }, - "kylinos_phytium": { - "system": "kylinos_phytium", - "name": "o2server-kylinos-phytium-${VERSION}", - "fileName": "o2server-kylinos-phytium-${VERSION}.zip", - "fileSize": "${length_kylinos_phytium_mb}MB", + "url": "/download/o2server-risc-${VERSION}.zip", + "sha256": "${build_risc.sha}" + }, + "arm": { + "system": "arm", + "name": "o2server-arm-${VERSION}", + "fileName": "o2server-arm-${VERSION}.zip", + "fileSize": "${length_arm_mb}MB", "updateTime": "${TODAY}", - "url": "/download/o2server-kylinos-phytium-${VERSION}.zip", - "sha256": "${build_kylinos_phytium.sha}" - }, - "jvm_windows": {} - } - ) + "url": "/download/o2server-arm-${VERSION}.zip", + "sha256": "${build_arm.sha}" + }, + "jvm_windows": {} + } + ) { - "title": "O2OA V${VERSION}", - "publishTime": "${TODAY}", - "windows": { + "title": "O2OA V${VERSION}", + "publishTime": "${TODAY}", + "windows": { "system": "windows", "name": "o2server-windows-${VERSION}", "fileName": "o2server-windows-${VERSION}.zip", @@ -156,8 +157,8 @@ "updateTime": "${TODAY}", "url": "/download/o2server-windows-${VERSION}.zip", "sha256": "${build_win.sha}" - }, - "linux": { + }, + "linux": { "system": "linux", "name": "o2server-linux-${VERSION}", "fileName": "o2server-linux-${VERSION}.zip", @@ -165,8 +166,8 @@ "updateTime": "${TODAY}", "url": "/download/o2server-linux-${VERSION}.zip", "sha256": "${build_linux.sha}" - }, - "macos": { + }, + "macos": { "system": "macos", "name": "o2server-macos-${VERSION}", "fileName": "o2server-macos-${VERSION}.zip", @@ -174,8 +175,8 @@ "updateTime": "${TODAY}", "url": "/download/o2server-macos-${VERSION}.zip", "sha256": "${build_macos.sha}" - }, - "aix": { + }, + "aix": { "system": "aix", "name": "o2server-aix-${VERSION}", "fileName": "o2server-aix-${VERSION}.zip", @@ -183,8 +184,8 @@ "updateTime": "${TODAY}", "url": "/download/o2server-aix-${VERSION}.zip", "sha256": "${build_aix.sha}" - }, - "raspberrypi": { + }, + "raspberrypi": { "system": "raspberrypi", "name": "o2server-raspberrypi-${VERSION}", "fileName": "o2server-raspberrypi-${VERSION}.zip", @@ -192,34 +193,34 @@ "updateTime": "${TODAY}", "url": "/download/o2server-raspberrypi-${VERSION}.zip", "sha256": "${build_raspberrypi.sha}" - }, - "neokylin_loongson": { - "system": "neokylin_loongson", - "name": "o2server-neokylin-loongson-${VERSION}", - "fileName": "o2server-neokylin-loongson-${VERSION}.zip", - "fileSize": "${length_neokylin-loongson_mb}MB", + }, + "risc": { + "system": "risc", + "name": "o2server-risc-${VERSION}", + "fileName": "o2server-risc-${VERSION}.zip", + "fileSize": "${length_risc_mb}MB", "updateTime": "${TODAY}", - "url": "/download/o2server-neokylin-loongson-${VERSION}.zip", - "sha256": "${build_neokylin-loongson.sha}" - }, - "kylinos_phytium": { - "system": "kylinos_phytium", - "name": "o2server-kylinos-phytium-${VERSION}", - "fileName": "o2server-kylinos-phytium-${VERSION}.zip", - "fileSize": "${length_kylinos_phytium_mb}MB", + "url": "/download/o2server-risc-${VERSION}.zip", + "sha256": "${build_risc.sha}" + }, + "arm": { + "system": "arm", + "name": "o2server-arm-${VERSION}", + "fileName": "o2server-arm-${VERSION}.zip", + "fileSize": "${length_arm_mb}MB", "updateTime": "${TODAY}", - "url": "/download/o2server-kylinos-phytium-${VERSION}.zip", - "sha256": "${build_kylinos_phytium.sha}" - }, - "source":{ + "url": "/download/o2server-arm-${VERSION}.zip", + "sha256": "${build_arm.sha}" + }, + "source":{ "name":"o2oa-master", "updateTime":"${TODAY}", "fileSize":"990MB", "url":"https://github.com/o2oa/o2oa" - } - } + } + } - + @@ -227,7 +228,7 @@ {"version":"${VERSION}","date":"${TODAY}"} - + @@ -248,7 +249,7 @@ - + @@ -268,7 +269,7 @@ - + @@ -288,7 +289,7 @@ - + @@ -308,7 +309,7 @@ - + @@ -327,8 +328,8 @@ - - + + @@ -339,16 +340,16 @@ - - - - - + + + + + - - + + @@ -359,11 +360,11 @@ - - - - - + + + + + diff --git a/gulpfile.js b/gulpfile.js index 758201a275090d2fbc0cd007be3423ba63e8fc9c..64c09766684cbf97113c1db6b8d2e129beb78a1b 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -25,9 +25,9 @@ var jvmUrls = { "all": "/build/jvm.tar.gz", "linux": "/build/linux.tar.gz", "aix": "/build/aix.tar.gz", - "kylinos": "/build/kylinos_phytium.tar", + "arm": "/build/arm.tar.gz", "macos": "/build/macos.tar.gz", - "neokylin": "/build/neokylin_loongson.tar.gz", + "risc": "/build/risc.tar.gz", "raspberrypi": "/build/raspberrypi.tar.gz", "windows": "/build/windows.tar.gz" }; @@ -35,9 +35,9 @@ var scripts = { "all": ["o2server/*.sh", "o2server/*.jar", "o2server/*.html", "o2server/*.bat", "o2server/version.o2"], "linux": ["o2server/*linux*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"], "aix": ["o2server/*aix*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"], - "kylinos": ["o2server/*kylinos_phytium*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"], + "arm": ["o2server/*arm*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"], "macos": ["o2server/*macos*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"], - "neokylin": ["o2server/*neokylin_loongson*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"], + "risc": ["o2server/*risc*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"], "raspberrypi": ["o2server/*raspberrypi*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"], "windows": ["o2server/*windows*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"] }; diff --git a/jenkinsBuildfile b/jenkinsBuildfile index ad93a208c9db04c49ca22e8e06aec7b4dff2a430..956def8fd4db5da1adeacbcd0c0ca2e25e10595a 100644 --- a/jenkinsBuildfile +++ b/jenkinsBuildfile @@ -1,6 +1,13 @@ pipeline { agent {label 'master' } stages { + stage('getParameter') { + steps { + echo 'env.sshServer='+env.sshServer + echo 'env.preName='+env.preName + echo 'env.isallTag='+env.isallTag + } + } stage('envtag') { steps { bat "cd.> \"gitTag.txt\"" @@ -8,7 +15,8 @@ pipeline { script { json_file = "gitTag.txt" file_contents = readFile json_file - if(file_contents.trim().indexOf("-")!=-1){ + + if(file_contents.trim().indexOf("-")!=-1&&env.isallTag.trim().indexOf("true")==-1){ env.tag =file_contents.trim().substring(0,file_contents.trim().indexOf("-")) }else{ env.tag =file_contents.trim(); @@ -29,15 +37,14 @@ pipeline { } stage('antzip') { steps { - bat 'ant -DVERSION='+env.tag + bat 'ant -DVERSION='+env.tag+' -DpreName='+env.preName } } stage('sshZipSend') { steps { - sshPublisher(publishers: [sshPublisherDesc(configName: '172.16.95.60', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/o2server/servers/webServer/download', remoteDirectorySDF: false, removePrefix: '', sourceFiles: 'o2server-*'+env.tag+'.zip')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)]) - sshPublisher(publishers: [sshPublisherDesc(configName: '172.16.95.60', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/o2server/servers/webServer/download', remoteDirectorySDF: false, removePrefix: '', sourceFiles: 'download-pro.json,download_preview.jsonp')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)]) + sshPublisher(publishers: [sshPublisherDesc(configName: ''+env.sshServer+'', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/o2server/servers/webServer/download', remoteDirectorySDF: false, removePrefix: '', sourceFiles: '*'+env.tag+'.zip')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)]) + sshPublisher(publishers: [sshPublisherDesc(configName: ''+env.sshServer+'', transfers: [sshTransfer(cleanRemote: false, excludes: '', execCommand: '', execTimeout: 120000, flatten: false, makeEmptyDirs: false, noDefaultExcludes: false, patternSeparator: '[, ]+', remoteDirectory: '/o2server/servers/webServer/download', remoteDirectorySDF: false, removePrefix: '', sourceFiles: 'download-pro.json,download_preview.jsonp')], usePromotionTimestamp: false, useWorkspaceInPromotion: false, verbose: false)]) } } - } - + } } diff --git a/o2server/console_arm.sh b/o2server/console_arm.sh new file mode 100644 index 0000000000000000000000000000000000000000..cc3c3aac47df9287038fb0dae1570d6fe486c3f2 --- /dev/null +++ b/o2server/console_arm.sh @@ -0,0 +1 @@ +$(cd "$(dirname "$0")"; pwd)/jvm/arm/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.Shadow \ No newline at end of file diff --git a/o2server/console_kylinos_phytium.sh b/o2server/console_kylinos_phytium.sh deleted file mode 100644 index 7b1c109fe5748f711d1c66027477d5f8a1828479..0000000000000000000000000000000000000000 --- a/o2server/console_kylinos_phytium.sh +++ /dev/null @@ -1 +0,0 @@ -$(cd "$(dirname "$0")"; pwd)/jvm/kylinos_phytium/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.Shadow \ No newline at end of file diff --git a/o2server/console_neokylin_loongson.sh b/o2server/console_neokylin_loongson.sh deleted file mode 100644 index 8971b9e98c93a4dce023ddaa9159b835b24e9c71..0000000000000000000000000000000000000000 --- a/o2server/console_neokylin_loongson.sh +++ /dev/null @@ -1 +0,0 @@ -$(cd "$(dirname "$0")"; pwd)/jvm/neokylin_loongson/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.Shadow \ No newline at end of file diff --git a/o2server/console_risc.sh b/o2server/console_risc.sh new file mode 100644 index 0000000000000000000000000000000000000000..79a2d4a8b4d77cdd17e0d28ad02366e5a8fe4d86 --- /dev/null +++ b/o2server/console_risc.sh @@ -0,0 +1 @@ +$(cd "$(dirname "$0")"; pwd)/jvm/risc/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.Shadow \ No newline at end of file diff --git a/o2server/start_aix.sh b/o2server/start_aix.sh index 76b610858b899397eec8319d009d93f6deaec26d..15fd997cdb7b8d521da775447905494afdf8f247 100644 --- a/o2server/start_aix.sh +++ b/o2server/start_aix.sh @@ -118,17 +118,17 @@ if [ -d ${current_dir}/local/update ]; then if [ -f ${current_dir}/console_raspberrypi.sh ]; then cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/stop_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/console_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/ fi if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/ diff --git a/o2server/start_aix_debug.sh b/o2server/start_aix_debug.sh index 2a17574a7329b486b88001206560238d0fb3a5d5..aa96cdb3c4873583044ac70739e01cd14736b6b7 100644 --- a/o2server/start_aix_debug.sh +++ b/o2server/start_aix_debug.sh @@ -118,29 +118,29 @@ if [ -d ${current_dir}/local/update ]; then if [ -f ${current_dir}/console_raspberrypi.sh ]; then cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/stop_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/console_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/stop_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/console_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/ fi cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/ rm -Rf ${current_dir}/local/update diff --git a/o2server/start_kylinos_phytium.sh b/o2server/start_arm.sh similarity index 78% rename from o2server/start_kylinos_phytium.sh rename to o2server/start_arm.sh index 27d2276571ddc52da1bf8d52d1debf8db873c577..e64e5f805b7343d74f500be4dfca8dfedaed0ce2 100644 --- a/o2server/start_kylinos_phytium.sh +++ b/o2server/start_arm.sh @@ -118,32 +118,32 @@ if [ -d ${current_dir}/local/update ]; then if [ -f ${current_dir}/console_raspberrypi.sh ]; then cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/stop_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/console_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/stop_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/console_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/ fi cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/ rm -Rf ${current_dir}/local/update fi fi -setsid ${current_dir}/jvm/kylinos_phytium/bin/java -server -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar \ No newline at end of file +setsid ${current_dir}/jvm/arm/bin/java -server -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar \ No newline at end of file diff --git a/o2server/start_neokylin_loongson.sh b/o2server/start_arm_debug.sh similarity index 78% rename from o2server/start_neokylin_loongson.sh rename to o2server/start_arm_debug.sh index 14a3614a80da87784ca6fa1fbd20bc5f699369af..b02cabeaac0cfe768c986687760876261d61c0e2 100644 --- a/o2server/start_neokylin_loongson.sh +++ b/o2server/start_arm_debug.sh @@ -118,32 +118,32 @@ if [ -d ${current_dir}/local/update ]; then if [ -f ${current_dir}/console_raspberrypi.sh ]; then cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/stop_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/console_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/stop_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/console_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/ fi cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/ rm -Rf ${current_dir}/local/update fi fi -setsid ${current_dir}/jvm/neokylin_loongson/bin/java -server -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar \ No newline at end of file +setsid ${current_dir}/jvm/arm/bin/java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar \ No newline at end of file diff --git a/o2server/start_linux.sh b/o2server/start_linux.sh index b17f25d981f39f358f7c6b0d7d9c0d7560b1613b..5eafe76966521b8534c2a3df3b2c85918d12967d 100644 --- a/o2server/start_linux.sh +++ b/o2server/start_linux.sh @@ -118,29 +118,29 @@ if [ -d ${current_dir}/local/update ]; then if [ -f ${current_dir}/console_raspberrypi.sh ]; then cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/stop_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/console_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/stop_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/console_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/ fi cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/ rm -Rf ${current_dir}/local/update diff --git a/o2server/start_linux_debug.sh b/o2server/start_linux_debug.sh index b04e9091b177d3eb74d625c776e7508b70ddeee9..6c53ff976dc1fa36ab7aebce6dbe9678a8c33713 100644 --- a/o2server/start_linux_debug.sh +++ b/o2server/start_linux_debug.sh @@ -118,29 +118,29 @@ if [ -d ${current_dir}/local/update ]; then if [ -f ${current_dir}/console_raspberrypi.sh ]; then cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/stop_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/console_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/stop_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/console_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/ fi cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/ rm -Rf ${current_dir}/local/update diff --git a/o2server/start_macos.sh b/o2server/start_macos.sh index 40e715b576f5bc4812eae7085743a70b79dd18fa..73f52c3e5475d2c52e076afc73ec1daa1f4642ff 100644 --- a/o2server/start_macos.sh +++ b/o2server/start_macos.sh @@ -122,26 +122,26 @@ if [ -d ${current_dir}/local/update ]; then if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/stop_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/ fi if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/stop_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/console_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/ fi cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/ rm -Rf ${current_dir}/local/update diff --git a/o2server/start_macos_debug.sh b/o2server/start_macos_debug.sh index 63d4aaa387322d18405fb2f11f301069ea3163f0..7b79fc94739fe04f84b43068d61cf323cb3ea6bf 100644 --- a/o2server/start_macos_debug.sh +++ b/o2server/start_macos_debug.sh @@ -119,29 +119,29 @@ if [ -d ${current_dir}/local/update ]; then if [ -f ${current_dir}/console_raspberrypi.sh ]; then cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/stop_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/console_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/stop_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/console_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/ fi cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/ rm -Rf ${current_dir}/local/update diff --git a/o2server/start_raspberrypi.sh b/o2server/start_raspberrypi.sh index b0c7739a83b4abb3585f6861de0b4e81b23d92eb..0972528e3947c5536b6d66d96a276d713f504f36 100644 --- a/o2server/start_raspberrypi.sh +++ b/o2server/start_raspberrypi.sh @@ -118,29 +118,29 @@ if [ -d ${current_dir}/local/update ]; then if [ -f ${current_dir}/console_raspberrypi.sh ]; then cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/stop_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/console_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/stop_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/console_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/ fi sudo cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/ sudo rm -Rf ${current_dir}/local/update diff --git a/o2server/start_raspberrypi_debug.sh b/o2server/start_raspberrypi_debug.sh index 2c679f8628ff620c4690a871092d4666d8acdcda..4154c9f0069a451d5f152cf217368bb8922bdee8 100644 --- a/o2server/start_raspberrypi_debug.sh +++ b/o2server/start_raspberrypi_debug.sh @@ -118,29 +118,29 @@ if [ -d ${current_dir}/local/update ]; then if [ -f ${current_dir}/console_raspberrypi.sh ]; then cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/stop_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/console_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/stop_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/console_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/ fi sudo cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/ sudo rm -Rf ${current_dir}/local/update diff --git a/o2server/start_kylinos_phytium_debug.sh b/o2server/start_risc.sh similarity index 78% rename from o2server/start_kylinos_phytium_debug.sh rename to o2server/start_risc.sh index 0f2a1afcfb3344ff83a45cad1cf0d6d5dba41b81..79120304c2426c0dfc7948b8d49714cb40c38071 100644 --- a/o2server/start_kylinos_phytium_debug.sh +++ b/o2server/start_risc.sh @@ -118,32 +118,32 @@ if [ -d ${current_dir}/local/update ]; then if [ -f ${current_dir}/console_raspberrypi.sh ]; then cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/stop_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/console_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/stop_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/console_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/ fi cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/ rm -Rf ${current_dir}/local/update fi fi -setsid ${current_dir}/jvm/kylinos_phytium/bin/java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar \ No newline at end of file +setsid ${current_dir}/jvm/risc/bin/java -server -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar \ No newline at end of file diff --git a/o2server/start_neokylin_loongson_debug.sh b/o2server/start_risc_debug.sh similarity index 78% rename from o2server/start_neokylin_loongson_debug.sh rename to o2server/start_risc_debug.sh index 4c0bc858c91fff0590c3e7705b0689dbd68383bd..8b360c653b0807a814a8436c96b267e3455107a9 100644 --- a/o2server/start_neokylin_loongson_debug.sh +++ b/o2server/start_risc_debug.sh @@ -118,32 +118,32 @@ if [ -d ${current_dir}/local/update ]; then if [ -f ${current_dir}/console_raspberrypi.sh ]; then cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_neokylin_loongson_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_neokylin_loongson_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_risc_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/stop_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_neokylin_loongson.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_neokylin_loongson.sh ${current_dir}/ + if [ -f ${current_dir}/console_risc.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/start_kylinos_phytium_debug.sh ]; then - cp -f ${current_dir}/local/update/o2server/start_kylinos_phytium_debug.sh ${current_dir}/ + if [ -f ${current_dir}/start_arm_debug.sh ]; then + cp -f ${current_dir}/local/update/o2server/start_arm_debug.sh ${current_dir}/ fi - if [ -f ${current_dir}/stop_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/stop_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/stop_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/stop_arm.sh ${current_dir}/ fi - if [ -f ${current_dir}/console_kylinos_phytium.sh ]; then - cp -f ${current_dir}/local/update/o2server/console_kylinos_phytium.sh ${current_dir}/ + if [ -f ${current_dir}/console_arm.sh ]; then + cp -f ${current_dir}/local/update/o2server/console_arm.sh ${current_dir}/ fi cp ${current_dir}/local/update/o2server/version.o2 ${current_dir}/ rm -Rf ${current_dir}/local/update fi fi -setsid ${current_dir}/jvm/neokylin_loongson/bin/java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar \ No newline at end of file +setsid ${current_dir}/jvm/risc/bin/java -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms2g -Xmx8g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar \ No newline at end of file diff --git a/o2server/start_windows.bat b/o2server/start_windows.bat index 365a6c9938ad7257dbb04ef870ab993870f47e57..5a1403b48f00d7f56d441e655590c732c5f4f235 100644 --- a/o2server/start_windows.bat +++ b/o2server/start_windows.bat @@ -115,29 +115,29 @@ if exist "%~dp0local\update" ( if exist "%~dp0console_raspberrypi.sh" ( copy "%~dp0local\update\o2server\console_raspberrypi.sh" "%~dp0" ) - if exist "%~dp0start_neokylin_loongson.sh" ( - copy "%~dp0local\update\o2server\start_neokylin_loongson.sh" "%~dp0" + if exist "%~dp0start_risc.sh" ( + copy "%~dp0local\update\o2server\start_risc.sh" "%~dp0" ) - if exist "%~dp0start_neokylin_loongson_debug.sh" ( - copy "%~dp0local\update\o2server\start_neokylin_loongson_debug.sh" "%~dp0" + if exist "%~dp0start_risc_debug.sh" ( + copy "%~dp0local\update\o2server\start_risc_debug.sh" "%~dp0" ) - if exist "%~dp0stop_neokylin_loongson.sh" ( - copy "%~dp0local\update\o2server\stop_neokylin_loongson.sh" "%~dp0" + if exist "%~dp0stop_risc.sh" ( + copy "%~dp0local\update\o2server\stop_risc.sh" "%~dp0" ) - if exist "%~dp0console_neokylin_loongson.sh" ( - copy "%~dp0local\update\o2server\console_neokylin_loongson.sh" "%~dp0" + if exist "%~dp0console_risc.sh" ( + copy "%~dp0local\update\o2server\console_risc.sh" "%~dp0" ) - if exist "%~dp0start_kylinos_phytium.sh" ( - copy "%~dp0local\update\o2server\start_kylinos_phytium.sh" "%~dp0" + if exist "%~dp0start_arm.sh" ( + copy "%~dp0local\update\o2server\start_arm.sh" "%~dp0" ) - if exist "%~dp0start_kylinos_phytium_debug.sh" ( - copy "%~dp0local\update\o2server\start_kylinos_phytium_debug.sh" "%~dp0" + if exist "%~dp0start_arm_debug.sh" ( + copy "%~dp0local\update\o2server\start_arm_debug.sh" "%~dp0" ) - if exist "%~dp0stop_kylinos_phytium.sh" ( - copy "%~dp0local\update\o2server\stop_kylinos_phytium.sh" "%~dp0" + if exist "%~dp0stop_arm.sh" ( + copy "%~dp0local\update\o2server\stop_arm.sh" "%~dp0" ) - if exist "%~dp0console_kylinos_phytium.sh" ( - copy "%~dp0local\update\o2server\console_kylinos_phytium.sh" "%~dp0" + if exist "%~dp0console_arm.sh" ( + copy "%~dp0local\update\o2server\console_arm.sh" "%~dp0" ) copy "%~dp0local\update\o2server\version.o2" "%~dp0" rmdir /S/Q "%~dp0local\update" diff --git a/o2server/start_windows_debug.bat b/o2server/start_windows_debug.bat index 2b6d1c7b6c93f30b2273379a139d15d5571ca914..dfa5151d313caaa26532a1ba703e8de071624a2e 100644 --- a/o2server/start_windows_debug.bat +++ b/o2server/start_windows_debug.bat @@ -115,29 +115,29 @@ if exist "%~dp0local\update" ( if exist "%~dp0console_raspberrypi.sh" ( copy "%~dp0local\update\o2server\console_raspberrypi.sh" "%~dp0" ) - if exist "%~dp0start_neokylin_loongson.sh" ( - copy "%~dp0local\update\o2server\start_neokylin_loongson.sh" "%~dp0" + if exist "%~dp0start_risc.sh" ( + copy "%~dp0local\update\o2server\start_risc.sh" "%~dp0" ) - if exist "%~dp0start_neokylin_loongson_debug.sh" ( - copy "%~dp0local\update\o2server\start_neokylin_loongson_debug.sh" "%~dp0" + if exist "%~dp0start_risc_debug.sh" ( + copy "%~dp0local\update\o2server\start_risc_debug.sh" "%~dp0" ) - if exist "%~dp0stop_neokylin_loongson.sh" ( - copy "%~dp0local\update\o2server\stop_neokylin_loongson.sh" "%~dp0" + if exist "%~dp0stop_risc.sh" ( + copy "%~dp0local\update\o2server\stop_risc.sh" "%~dp0" ) - if exist "%~dp0console_neokylin_loongson.sh" ( - copy "%~dp0local\update\o2server\console_neokylin_loongson.sh" "%~dp0" + if exist "%~dp0console_risc.sh" ( + copy "%~dp0local\update\o2server\console_risc.sh" "%~dp0" ) - if exist "%~dp0start_kylinos_phytium.sh" ( - copy "%~dp0local\update\o2server\start_kylinos_phytium.sh" "%~dp0" + if exist "%~dp0start_arm.sh" ( + copy "%~dp0local\update\o2server\start_arm.sh" "%~dp0" ) - if exist "%~dp0start_kylinos_phytium_debug.sh" ( - copy "%~dp0local\update\o2server\start_kylinos_phytium_debug.sh" "%~dp0" + if exist "%~dp0start_arm_debug.sh" ( + copy "%~dp0local\update\o2server\start_arm_debug.sh" "%~dp0" ) - if exist "%~dp0stop_kylinos_phytium.sh" ( - copy "%~dp0local\update\o2server\stop_kylinos_phytium.sh" "%~dp0" + if exist "%~dp0stop_arm.sh" ( + copy "%~dp0local\update\o2server\stop_arm.sh" "%~dp0" ) - if exist "%~dp0console_kylinos_phytium.sh" ( - copy "%~dp0local\update\o2server\console_kylinos_phytium.sh" "%~dp0" + if exist "%~dp0console_arm.sh" ( + copy "%~dp0local\update\o2server\console_arm.sh" "%~dp0" ) copy "%~dp0local\update\o2server\version.o2" "%~dp0" rmdir /S/Q "%~dp0local\update" diff --git a/o2server/stop_arm.sh b/o2server/stop_arm.sh new file mode 100644 index 0000000000000000000000000000000000000000..098a1bb4c71b29daceaf31b728a75c595615889d --- /dev/null +++ b/o2server/stop_arm.sh @@ -0,0 +1 @@ +$(cd "$(dirname "$0")"; pwd)/jvm/arm/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit \ No newline at end of file diff --git a/o2server/stop_kylinos_phytium.sh b/o2server/stop_kylinos_phytium.sh deleted file mode 100644 index 0817f88d32ac1c0b2481ec2696e726aee9222763..0000000000000000000000000000000000000000 --- a/o2server/stop_kylinos_phytium.sh +++ /dev/null @@ -1 +0,0 @@ -$(cd "$(dirname "$0")"; pwd)/jvm/kylinos_phytium/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit \ No newline at end of file diff --git a/o2server/stop_neokylin_loongson.sh b/o2server/stop_neokylin_loongson.sh deleted file mode 100644 index 6c186b0ce27b80f9955f8bb20ac85ff2e8dc63c3..0000000000000000000000000000000000000000 --- a/o2server/stop_neokylin_loongson.sh +++ /dev/null @@ -1 +0,0 @@ -$(cd "$(dirname "$0")"; pwd)/jvm/neokylin_loongson/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit \ No newline at end of file diff --git a/o2server/stop_risc.sh b/o2server/stop_risc.sh new file mode 100644 index 0000000000000000000000000000000000000000..6d31e28a6baeb579e7de166cda4c7a8919360e6a --- /dev/null +++ b/o2server/stop_risc.sh @@ -0,0 +1 @@ +$(cd "$(dirname "$0")"; pwd)/jvm/risc/bin/java -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.swapcommand.Exit \ No newline at end of file diff --git a/package.json b/package.json index 5a21ce3d1ae24c95f394bffff3cb2d54c5d61a9d..b11d32061616379cca5c4736c5fb20190035acb5 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,9 @@ "preperation:win": "gulp preperation --e windows", "preperation:linux": "gulp preperation --e linux", "preperation:aix": "gulp preperation --e aix", - "preperation:kylinos": "gulp preperation --e kylinos", + "preperation:arm": "gulp preperation --e arm", "preperation:macos": "gulp preperation --e macos", - "preperation:neokylin": "gulp preperation --e neokylin", + "preperation:risc": "gulp preperation --e risc", "preperation:rpi": "gulp preperation --e raspberrypi", "build_server": "gulp build_server", "build_server_script": "cd o2server && mvn clean && mvn install", @@ -20,9 +20,9 @@ "deploy:win": "gulp deploy --e windows", "deploy:linux": "gulp deploy --e linux", "deploy:aix": "gulp deploy --e aix", - "deploy:kylinos": "gulp deploy --e kylinos", + "deploy:arm": "gulp deploy --e arm", "deploy:macos": "gulp deploy --e macos", - "deploy:neokylin": "gulp deploy --e neokylin", + "deploy:risc": "gulp deploy --e risc", "deploy:rpi": "gulp deploy --e raspberrypi", "typeInfor": "type welcome && echo Your server is build success: target/o2server/", "clear": "gulp clear_build", @@ -30,17 +30,17 @@ "build:win": "npm run clear && npm run preperation:win && npm run build_parallel && npm run deploy:win && npm run typeInfor", "build:linux": "npm run clear && npm run preperation:linux && npm run build_parallel && npm run deploy:linux && npm run typeInfor", "build:aix": "npm run clear && npm run preperation:aix && npm run build_parallel && npm run deploy:aix && npm run typeInfor", - "build:kylinos": "npm run clear && npm run preperation:kylinos && npm run build_parallel && npm run deploy:kylinos && npm run typeInfor", + "build:arm": "npm run clear && npm run preperation:arm && npm run build_parallel && npm run deploy:arm && npm run typeInfor", "build:macos": "npm run clear && npm run preperation:macos && npm run build_parallel && npm run deploy:macos && npm run typeInfor", - "build:neokylin": "npm run clear && npm run preperation:neokylin && npm run build_parallel && npm run deploy:neokylin && npm run typeInfor", + "build:risc": "npm run clear && npm run preperation:risc && npm run build_parallel && npm run deploy:risc && npm run typeInfor", "build:rpi": "npm run clear && npm run preperation:rpi && npm run build_parallel && npm run deploy:rpi && npm run typeInfor", "build_ci": "npm run clear && npm run preperation && npm run build_parallel && npm run deploy && npm run typeInfor", "build_ci:win": "npm run clear && npm run preperation:win && npm run build_parallel && npm run deploy:win && npm run typeInfor", "build_ci:linux": "npm run clear && npm run preperation:linux && npm run build_parallel && npm run deploy:linux && npm run typeInfor", "build_ci:aix": "npm run clear && npm run preperation:aix && npm run build_parallel && npm run deploy:aix && npm run typeInfor", - "build_ci:kylinos": "npm run clear && npm run preperation:kylinos && npm run build_parallel && npm run deploy:kylinos && npm run typeInfor", + "build_ci:arm": "npm run clear && npm run preperation:arm && npm run build_parallel && npm run deploy:arm && npm run typeInfor", "build_ci:macos": "npm run clear && npm run preperation:macos && npm run build_parallel && npm run deploy:macos && npm run typeInfor", - "build_ci:neokylin": "npm run clear && npm run preperation:neokylin && npm run build_parallel && npm run deploy:neokylin && npm run typeInfor", + "build_ci:risc": "npm run clear && npm run preperation:risc && npm run build_parallel && npm run deploy:risc && npm run typeInfor", "build_ci:rpi": "npm run clear && npm run preperation:rpi && npm run build_parallel && npm run deploy:rpi && npm run typeInfor", "test": "type welcome" },