打包命名规则修改

16d65d67 · tangxl · fb239fee · 16d65d67 · 16d65d67 · 16d65d67
6 changed file
--- a/build.xml
+++ b/build.xml
@@ -15,8 +15,8 @@
 			project.setNewProperty("length_win_mb", length_win_mbytes);
 		]]>
 		</script>
-		<checksum file="${preName}-${VERSION}-linux.zip" property="build_linux.sha" algorithm="SHA-256" />
-		<length file="${preName}-${VERSION}-linux.zip" property="length_linux"/>
+		<checksum file="${preName}-${VERSION}-linux-x86.zip" property="build_linux.sha" algorithm="SHA-256" />
+		<length file="${preName}-${VERSION}-linux-x86.zip" property="length_linux"/>
 		<script language="javascript">
 			<![CDATA[
 			var length_linux_bytes = project.getProperty("length_linux");
@@ -45,8 +45,8 @@
 			project.setNewProperty("length_aix_mb", length_aix_mbytes);
 		]]>
 		</script>
-		<checksum file="${preName}-${VERSION}-raspberrypi.zip" property="build_raspberrypi.sha" algorithm="SHA-256" />
-		<length file="${preName}-${VERSION}-raspberrypi.zip" property="length_raspberrypi"/>
+		<checksum file="${preName}-${VERSION}-raspi.zip" property="build_raspberrypi.sha" algorithm="SHA-256" />
+		<length file="${preName}-${VERSION}-raspi.zip" property="length_raspberrypi"/>
 		<script language="javascript">
 			<![CDATA[
 			var length_raspberrypi_bytes = project.getProperty("length_raspberrypi");
@@ -55,18 +55,18 @@
 			project.setNewProperty("length_raspberrypi_mb", length_raspberrypi_mbytes);
 		]]>
 		</script>
-		<checksum file="${preName}-${VERSION}-risc.zip" property="build_risc.sha" algorithm="SHA-256" />
-		<length file="${preName}-${VERSION}-risc.zip" property="length_risc"/>
+		<checksum file="${preName}-${VERSION}-linux-mips.zip" property="build_mips.sha" algorithm="SHA-256" />
+		<length file="${preName}-${VERSION}-linux-mips.zip" property="length_mips"/>
 		<script language="javascript">
 			<![CDATA[
-			var length_risc_bytes = project.getProperty("length_risc");
-			var length_risc_kbytes = Math.round((length_risc_bytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
-			var length_risc_mbytes = Math.round((length_risc_kbytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
-			project.setNewProperty("length_risc_mb", length_risc_mbytes);
+			var length_mips_bytes = project.getProperty("length_mips");
+			var length_mips_kbytes = Math.round((length_mips_bytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
+			var length_mips_mbytes = Math.round((length_mips_kbytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
+			project.setNewProperty("length_mips_mb", length_mips_mbytes);
 		]]>
 		</script>
-		<checksum file="${preName}-${VERSION}-arm.zip" property="build_arm.sha" algorithm="SHA-256" />
-		<length file="${preName}-${VERSION}-arm.zip" property="length_arm"/>
+		<checksum file="${preName}-${VERSION}-linux-arm.zip" property="build_arm.sha" algorithm="SHA-256" />
+		<length file="${preName}-${VERSION}-linux-arm.zip" property="length_arm"/>
 		<script language="javascript">
 			<![CDATA[
 			var length_arm_bytes = project.getProperty("length_arm");
@@ -92,10 +92,10 @@
 			"linux": {
 			"system": "linux",
 			"name": "o2server-linux-${VERSION}",
-			"fileName": "o2server-${VERSION}-linux.zip",
+			"fileName": "o2server-${VERSION}-linux-x86.zip",
 			"fileSize": "${length_linux_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-${VERSION}-linux.zip",
+			"url": "/download/o2server-${VERSION}-linux-x86.zip",
 			"sha256": "${build_linux.sha}"
 			},
 			"macos": {
@@ -118,29 +118,29 @@
 			},
 			"raspberrypi": {
 			"system": "raspberrypi",
-			"name": "o2server-${VERSION}-raspberrypi.zip",
-			"fileName": "o2server-${VERSION}-raspberrypi.zip",
+			"name": "o2server-${VERSION}-raspi.zip",
+			"fileName": "o2server-${VERSION}-raspi.zip",
 			"fileSize": "${length_raspberrypi_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-${VERSION}-raspberrypi.zip",
+			"url": "/download/o2server-${VERSION}-raspi.zip",
 			"sha256": "${build_raspberrypi.sha}"
 			},
-			"risc": {
-			"system": "risc",
-			"name": "o2server-${VERSION}-risc",
-			"fileName": "o2server-${VERSION}-risc.zip",
-			"fileSize": "${length_risc_mb}MB",
+			"mips": {
+			"system": "mips",
+			"name": "o2server-${VERSION}-mips",
+			"fileName": "o2server-${VERSION}-linux-mips.zip",
+			"fileSize": "${length_mips_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-${VERSION}-risc.zip",
-			"sha256": "${build_risc.sha}"
+			"url": "/download/o2server-${VERSION}-linux-mips.zip",
+			"sha256": "${build_mips.sha}"
 			},
 			"arm": {
 			"system": "arm",
 			"name": "o2server-${VERSION}-arm",
-			"fileName": "o2server-${VERSION}-arm.zip",
+			"fileName": "o2server-${VERSION}-linux-arm.zip",
 			"fileSize": "${length_arm_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-${VERSION}-arm.zip",
+			"url": "/download/o2server-${VERSION}-linux-arm.zip",
 			"sha256": "${build_arm.sha}"
 			},
 			"jvm_windows": {}
@@ -161,10 +161,10 @@
 			"linux": {
 			"system": "linux",
 			"name": "o2server-linux-${VERSION}",
-			"fileName": "o2server-${VERSION}-linux.zip",
+			"fileName": "o2server-${VERSION}-linux-x86.zip",
 			"fileSize": "${length_linux_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-${VERSION}-linux.zip",
+			"url": "/download/o2server-${VERSION}-linux-x86.zip",
 			"sha256": "${build_linux.sha}"
 			},
 			"macos": {
@@ -187,29 +187,29 @@
 			},
 			"raspberrypi": {
 			"system": "raspberrypi",
-			"name": "o2server-${VERSION}-raspberrypi.zip",
-			"fileName": "o2server-${VERSION}-raspberrypi.zip",
+			"name": "o2server-${VERSION}-raspi.zip",
+			"fileName": "o2server-${VERSION}-raspi.zip",
 			"fileSize": "${length_raspberrypi_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-${VERSION}-raspberrypi.zip",
+			"url": "/download/o2server-${VERSION}-raspi.zip",
 			"sha256": "${build_raspberrypi.sha}"
 			},
-			"risc": {
-			"system": "risc",
-			"name": "o2server-${VERSION}-risc",
-			"fileName": "o2server-${VERSION}-risc.zip",
-			"fileSize": "${length_risc_mb}MB",
+			"mips": {
+			"system": "mips",
+			"name": "o2server-${VERSION}-mips",
+			"fileName": "o2server-${VERSION}-linux-mips.zip",
+			"fileSize": "${length_mips_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-${VERSION}-risc.zip",
-			"sha256": "${build_risc.sha}"
+			"url": "/download/o2server-${VERSION}-linux-mips.zip",
+			"sha256": "${build_mips.sha}"
 			},
 			"arm": {
 			"system": "arm",
 			"name": "o2server-${VERSION}-arm",
-			"fileName": "o2server-${VERSION}-arm.zip",
+			"fileName": "o2server-${VERSION}-linux-arm.zip",
 			"fileSize": "${length_arm_mb}MB",
 			"updateTime": "${TODAY}",
-			"url": "/download/o2server-${VERSION}-arm.zip",
+			"url": "/download/o2server-${VERSION}-linux-arm.zip",
 			"sha256": "${build_arm.sha}"
 			},
 			"source":{
@@ -220,7 +220,7 @@
 			}
 			}</echo>
 	</target>
-	<target name="default_zip" depends="version_o2,zip_windows,zip_linux,zip_macos,zip_aix,zip_raspberrypi,zip_risc,zip_arm" />
+	<target name="default_zip" depends="version_o2,zip_windows,zip_linux,zip_macos,zip_aix,zip_raspberrypi,zip_mips,zip_arm" />
 	<target name="version_o2">
 		<tstamp>
 			<format property="TODAY" pattern="yyyy-MM-dd HH:mm:ss"/>
@@ -249,7 +249,7 @@
 		</zip>
 	</target>
 	<target name="zip_linux">
-		<zip encoding="utf-8" destfile="${preName}-${VERSION}-linux.zip" update="false">
+		<zip encoding="utf-8" destfile="${preName}-${VERSION}-linux-x86.zip" update="false">
 			<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
 				<include name="commons/"/>
 				<include name="configSample/"/>
@@ -309,7 +309,7 @@
 		</zip>
 	</target>
 	<target name="zip_raspberrypi">
-		<zip encoding="utf-8" destfile="${preName}-${VERSION}-raspberrypi.zip" update="false">
+		<zip encoding="utf-8" destfile="${preName}-${VERSION}-raspi.zip" update="false">
 			<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
 				<include name="commons/"/>
 				<include name="configSample/"/>
@@ -321,15 +321,15 @@
 				<include name="version.o2"/>
 				<include name="console.jar"/>
 				<include name="jvm/raspberrypi/"/>
-				<include name="start_raspberrypi.sh"/>
-				<include name="start_raspberrypi_debug.sh"/>
-				<include name="console_raspberrypi.sh"/>
-				<include name="stop_raspberrypi.sh"/>
+				<include name="start_raspi.sh"/>
+				<include name="start_raspi_debug.sh"/>
+				<include name="console_raspi.sh"/>
+				<include name="stop_raspi.sh"/>
 			</zipfileset>
 		</zip>
 	</target>
-	<target name="zip_risc">
-		<zip encoding="utf-8" destfile="${preName}-${VERSION}-risc.zip" update="false">
+	<target name="zip_mips">
+		<zip encoding="utf-8" destfile="${preName}-${VERSION}-linux-mips.zip" update="false">
 			<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
 				<include name="commons/"/>
 				<include name="configSample/"/>
@@ -340,16 +340,16 @@
 				<include name="index.html"/>
 				<include name="version.o2"/>
 				<include name="console.jar"/>
-				<include name="jvm/risc/"/>
-				<include name="start_risc.sh"/>
-				<include name="start_risc_debug.sh"/>
-				<include name="console_risc.sh"/>
-				<include name="stop_risc.sh"/>
+				<include name="jvm/mips/"/>
+				<include name="start_mips.sh"/>
+				<include name="start_mips_debug.sh"/>
+				<include name="console_mips.sh"/>
+				<include name="stop_mips.sh"/>
 			</zipfileset>
 		</zip>
 	</target>
 	<target name="zip_arm">
-		<zip encoding="utf-8" destfile="${preName}-${VERSION}-arm.zip" update="false">
+		<zip encoding="utf-8" destfile="${preName}-${VERSION}-linux-arm.zip" update="false">
 			<zipfileset dir="${targetdir}/o2server" filemode="777" dirmode="777" encoding="utf-8" prefix="o2server">
 				<include name="commons/"/>
 				<include name="configSample/"/>

--- a/o2server/console_mips.sh
+++ b/o2server/console_mips.sh
-$(cd "$(dirname "$0")"; pwd)/jvm/risc/bin/java -javaagent:$(cd "$(dirname "$0")"; pwd)/console.jar -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.Shadow
\ No newline at end of file
+$(cd "$(dirname "$0")"; pwd)/jvm/mips/bin/java -javaagent:$(cd "$(dirname "$0")"; pwd)/console.jar -cp $(cd "$(dirname "$0")"; pwd)/console.jar com.x.server.console.Shadow
\ No newline at end of file
--- a/o2server/start_mips.sh
+++ b/o2server/start_mips.sh
@@ -120,17 +120,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_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/console_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_mips.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_arm.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/
@@ -148,4 +148,4 @@ if [ -d ${current_dir}/local/update ]; then
 		rm -Rf ${current_dir}/local/update
 	fi
 fi
-setsid ${current_dir}/jvm/risc/bin/java -javaagent:${current_dir}/console.jar -server -Djava.awt.headless=true -Xms2g -Xmx4g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
+setsid ${current_dir}/jvm/mips/bin/java -javaagent:${current_dir}/console.jar -server -Djava.awt.headless=true -Xms2g -Xmx4g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
--- a/o2server/start_mips_debug.sh
+++ b/o2server/start_mips_debug.sh
@@ -120,17 +120,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_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_risc_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_risc_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_mips_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_mips_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_mips.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_risc.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_risc.sh ${current_dir}/
+		if [ -f ${current_dir}/console_mips.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_mips.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_arm.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/start_arm.sh ${current_dir}/
@@ -148,4 +148,4 @@ if [ -d ${current_dir}/local/update ]; then
 		rm -Rf ${current_dir}/local/update
 	fi
 fi
-setsid ${current_dir}/jvm/risc/bin/java -javaagent:${current_dir}/console.jar -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms2g -Xmx4g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
+setsid ${current_dir}/jvm/mips/bin/java -javaagent:${current_dir}/console.jar -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=20000 -Djava.awt.headless=true -Xms2g -Xmx4g -XX:+UseG1GC -XX:+HeapDumpOnOutOfMemoryError -jar ${current_dir}/console.jar
\ No newline at end of file
--- a/o2server/start_raspi.sh
+++ b/o2server/start_raspi.sh
@@ -108,17 +108,17 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			sudo cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/console_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/console_raspi.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_risc.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/

--- a/o2server/start_raspi_debug.sh
+++ b/o2server/start_raspi_debug.sh
@@ -108,17 +108,17 @@ if [ -d ${current_dir}/local/update ]; then
 		if [ -f ${current_dir}/console_aix.sh ]; then
 			sudo cp -f ${current_dir}/local/update/o2server/console_aix.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/start_raspberrypi_debug.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/start_raspberrypi_debug.sh ${current_dir}/
+		if [ -f ${current_dir}/start_raspi_debug.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/start_raspi_debug.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/stop_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/stop_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/stop_raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/stop_raspi.sh ${current_dir}/
 		fi
-		if [ -f ${current_dir}/console_raspberrypi.sh ]; then
-			cp -f ${current_dir}/local/update/o2server/console_raspberrypi.sh ${current_dir}/
+		if [ -f ${current_dir}/raspi.sh ]; then
+			cp -f ${current_dir}/local/update/o2server/raspi.sh ${current_dir}/
 		fi
 		if [ -f ${current_dir}/start_risc.sh ]; then
 			cp -f ${current_dir}/local/update/o2server/start_risc.sh ${current_dir}/