Merge branch 'develop' into fix-dist

# Conflicts:
#	scripts/dist.py

Author: man-zhang

.gitignore

@@ -245,3 +245,7 @@ dotnet_3/em/embedded/rest/ScsDriver/generated-tests/
 /jdk_8_maven/em/embedded/rest/genome-nexus/target/
 /jdk_8_maven/em/external/rest/genome-nexus/target/
 /jdk_8_maven/em/external/rest/genome-nexus/src/test/
+/jdk_8_maven/em/embedded/thrift/ncs/target/
+/jdk_8_maven/em/embedded/thrift/scs/target/
+/jdk_8_maven/em/external/thrift/ncs/target/
+/jdk_8_maven/em/external/thrift/scs/target/

scripts/dist.py

@@ -156,11 +156,12 @@ def build_jdk_11_gradle() :
     env_vars["JAVA_HOME"] = JAVA_HOME_11
     folder = "jdk_11_gradle"
 
-    GRADLEW_CMD = "gradlew"
-    if not SHELL:
-        GRADLEW_CMD = "./gradlew"
+    command = "gradlew"
 
-    gradleres = run([GRADLEW_CMD, "build", "-x", "test"], shell=SHELL, cwd=os.path.join(PROJ_LOCATION,folder), env=env_vars)
+    if platform.system() == "Darwin":
+        command = "./gradlew"
+
+    gradleres = run([command, "build", "-x", "test"], shell=SHELL, cwd=os.path.join(PROJ_LOCATION,folder), env=env_vars)
     gradleres = gradleres.returncode
 
     if gradleres != 0: