Merge branch 'fix/wrdp_raspi' into 'wrdp'

Fix/wrdp raspi

See merge request o2oa/o2oa!2109

build.xml

@@ -45,14 +45,14 @@
 			project.setNewProperty("length_aix_mb", length_aix_mbytes);
 		]]>
 		</script>
-		<checksum file="${preName}-${VERSION}-raspi.zip" property="build_raspberrypi.sha" algorithm="SHA-256" />
-		<length file="${preName}-${VERSION}-raspi.zip" property="length_raspberrypi"/>
+		<checksum file="${preName}-${VERSION}-raspi.zip" property="build_raspi.sha" algorithm="SHA-256" />
+		<length file="${preName}-${VERSION}-raspi.zip" property="length_raspi"/>
 		<script language="javascript">
 			<![CDATA[
-			var length_raspberrypi_bytes = project.getProperty("length_raspberrypi");
-			var length_raspberrypi_kbytes = Math.round((length_raspberrypi_bytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
-			var length_raspberrypi_mbytes = Math.round((length_raspberrypi_kbytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
-			project.setNewProperty("length_raspberrypi_mb", length_raspberrypi_mbytes);
+			var length_raspi_bytes = project.getProperty("length_raspi");
+			var length_raspi_kbytes = Math.round((length_raspi_bytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
+			var length_raspi_mbytes = Math.round((length_raspi_kbytes / 1024) * Math.pow(10,2))/ Math.pow(10,2);
+			project.setNewProperty("length_raspi_mb", length_raspi_mbytes);
 		]]>
 		</script>
 		<checksum file="${preName}-${VERSION}-linux-mips.zip" property="build_mips.sha" algorithm="SHA-256" />
@@ -116,14 +116,14 @@
 			"url": "/download/o2server-${VERSION}-aix.zip",
 			"sha256": "${build_aix.sha}"
 			},
-			"raspberrypi": {
+			"raspi": {
 			"system": "raspberrypi",
 			"name": "o2server-${VERSION}-raspi.zip",
 			"fileName": "o2server-${VERSION}-raspi.zip",
 			"fileSize": "${length_raspberrypi_mb}MB",
 			"updateTime": "${TODAY}",
 			"url": "/download/o2server-${VERSION}-raspi.zip",
-			"sha256": "${build_raspberrypi.sha}"
+			"sha256": "${build_raspi.sha}"
 			},
 			"mips": {
 			"system": "mips",
@@ -185,14 +185,14 @@
 			"url": "/download/o2server-${VERSION}-aix.zip",
 			"sha256": "${build_aix.sha}"
 			},
-			"raspberrypi": {
-			"system": "raspberrypi",
+			"raspi": {
+			"system": "raspi",
 			"name": "o2server-${VERSION}-raspi.zip",
 			"fileName": "o2server-${VERSION}-raspi.zip",
-			"fileSize": "${length_raspberrypi_mb}MB",
+			"fileSize": "${length_raspi_mb}MB",
 			"updateTime": "${TODAY}",
 			"url": "/download/o2server-${VERSION}-raspi.zip",
-			"sha256": "${build_raspberrypi.sha}"
+			"sha256": "${build_raspi.sha}"
 			},
 			"mips": {
 			"system": "mips",
@@ -220,7 +220,7 @@
 			}
 			}</echo>
 	</target>
-	<target name="default_zip" depends="version_o2,zip_windows,zip_linux,zip_macos,zip_aix,zip_raspberrypi,zip_mips,zip_arm" />
+	<target name="default_zip" depends="version_o2,zip_windows,zip_linux,zip_macos,zip_aix,zip_raspi,zip_mips,zip_arm" />
 	<target name="version_o2">
 		<tstamp>
 			<format property="TODAY" pattern="yyyy-MM-dd HH:mm:ss"/>
@@ -308,7 +308,7 @@
 			</zipfileset>
 		</zip>
 	</target>
-	<target name="zip_raspberrypi">
+	<target name="zip_raspi">
 		<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/"/>
@@ -320,7 +320,7 @@
 				<include name="index.html"/>
 				<include name="version.o2"/>
 				<include name="console.jar"/>
-				<include name="jvm/raspberrypi/"/>
+				<include name="jvm/raspi/"/>
 				<include name="start_raspi.sh"/>
 				<include name="start_raspi_debug.sh"/>
 				<include name="console_raspi.sh"/>

gulpfile.js

@@ -46,7 +46,7 @@ var jvmUrls = {
     "arm": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/arm",
     "macos": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/macos",
     "risc": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/risc",
-    "raspberrypi": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/raspberrypi",
+    "raspi": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/raspi",
     "windows": "/o2oa/evn-o2server-jvm/-/archive/master/evn-o2server-jvm-master.tar.gz?path=jvm/windows"
 };
 
@@ -57,7 +57,7 @@ var scripts = {
     "arm": ["o2server/*arm*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"],
     "macos": ["o2server/*macos*", "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"],
+    "raspi": ["o2server/*raspi*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"],
     "windows": ["o2server/*windows*", "o2server/*.jar", "o2server/*.html", "o2server/version.o2"]
 };
 

package.json

@@ -11,7 +11,7 @@
                 "preperation:arm": "gulp preperation --e arm",
                 "preperation:macos": "gulp preperation --e macos",
                 "preperation:risc": "gulp preperation --e risc",
-                "preperation:rpi": "gulp preperation --e raspberrypi",
+                "preperation:rpi": "gulp preperation --e raspi",
                 "build_server": "gulp build_server",
                 "build_server_script": "cd o2server && mvn clean && mvn install",
                 "build_web": "gulp build_web",
@@ -23,7 +23,7 @@
                 "deploy:arm": "gulp deploy --e arm",
                 "deploy:macos": "gulp deploy --e macos",
                 "deploy:risc": "gulp deploy --e risc",
-                "deploy:rpi": "gulp deploy --e raspberrypi",
+                "deploy:rpi": "gulp deploy --e raspi",
                 "typeInfor": "type welcome && echo Your server is build success: target/o2server/",
                 "clear": "gulp clear_build",
                 "clear_deploy": "gulp clear_deploy",