Proper JDK bundles for macos

This fixes several issues:
- exlcludes dSYM directory (previous patter was for files)
- exlcludes `man` and `demo` properly
- don't add jdk-xxx.jdk top level directory into jdk.zip

Change-Id: Ia5797e77196af0311217cb7de2df8db4686c61c2

build-jetbrainsruntime-darwin-aarch64.sh

diff --git a/build-jetbrainsruntime-darwin-aarch64.sh b/build-jetbrainsruntime-darwin-aarch64.sh
index ec81dd0..abe45fb 100755
--- a/build-jetbrainsruntime-darwin-aarch64.sh
+++ b/build-jetbrainsruntime-darwin-aarch64.sh
@@ -97,8 +97,8 @@
   # Rewrite absolute references to rpath-relative one
   install_name_tool -change @rpath/JavaNativeFoundation.framework/Versions/A/JavaNativeFoundation @loader_path/../Frameworks/JavaNativeFoundation.framework/JavaNativeFoundation ${bundle_dir}/Contents/Home/lib/libawt.dylib
 
-  zip -9rDy${quiet:+q} "$dist_dir"/jdk-bundle.zip . -x'*.dSYM/*' -x'*/man/*' -x'*/demo/*'
-  zip -9rDy${quiet:+q} "$dist_dir"/jdk-debuginfo.zip . -i'*.dSYM/*'
+  zip -9rDy${quiet:+q} "$dist_dir"/jdk.zip . --exclude 'Contents/Home/demo/*' --exclude 'Contents/Home/man/*' --exclude '*.dSYM*'
+  zip -9rDy${quiet:+q} "$dist_dir"/jdk-debuginfo.zip . --include '*.dSYM*'
 
   echo $'\n\n===================================='
   echo "JDK Bundle $dist_dir/jdk-bundle.zip"
@@ -112,6 +112,7 @@
 
 # Java Runtime
 (
+  rm -rf "${build_dir}/java-runtime"
   mkdir -p  "${build_dir}/java-runtime"
   cd  "${build_dir}/java-runtime"
 
@@ -128,6 +129,7 @@
     --no-header-files \
     --no-man-pages \
     --compress=2 \
+    --strip-debug \
     --module-path="${build_dir}/images/jdk/jmods" \
     --add-modules $(xargs < ${build_dir}/aarch64-modules.list | sed s/" "/,/g) \
     --output "${build_dir}/java-runtime/Contents/Home"
@@ -138,7 +140,7 @@
   ditto ${bundle_dir}/Contents/MacOS ./Contents/MacOS
   ditto ${bundle_dir}/Contents/Info.plist ./Contents/Info.plist
 
-  zip -9rDy${quiet:+q} "${dist_dir}/jdk-runtime.zip" . -x'*.dSYM/*' -x'*/man/*' -x'*/demo/*'
+  zip -9rDy${quiet:+q} "${dist_dir}/jdk-runtime.zip" .
 
   echo $'\n\n===================================='
   echo "JDK Runtime $dist_dir/jdk-runtime.zip"

build-jetbrainsruntime-darwin.sh

diff --git a/build-jetbrainsruntime-darwin.sh b/build-jetbrainsruntime-darwin.sh
index 303b2b0..48f754f 100755
--- a/build-jetbrainsruntime-darwin.sh
+++ b/build-jetbrainsruntime-darwin.sh
@@ -65,9 +65,10 @@
 
 rm -rf "$dist_dir"/{jdk.zip,jdk-debuginfo.zip,jdk-runtime.zip,build.log,configure.log}
 declare -r bundle_dir=$(find $build_dir/images/jdk-bundle/ -type d -depth 1 -name 'jdk-*.jdk')
-(cd "$build_dir/images/jdk" &&
-  zip -9rDy${quiet:+q} "$dist_dir"/jdk.zip . -x 'demo/*' -x'man/*' -x'*.dSYM' &&
-  zip -9rDy${quiet:+q} "$dist_dir"/jdk-debuginfo.zip . -i'*.dSYM'
+(
+  cd "$bundle_dir"
+  zip -9rDy${quiet:+q} "$dist_dir"/jdk.zip . --exclude 'Contents/Home/demo/*' --exclude 'Contents/Home/man/*' --exclude '*.dSYM*'
+  zip -9rDy${quiet:+q} "$dist_dir"/jdk-debuginfo.zip . --include '*.dSYM*'
 )
 cp "$build_dir"/build.log "$dist_dir"
 cp "$build_dir"/configure-support/config.log "$dist_dir"/configure.log
@@ -75,6 +76,7 @@
 
 # Java Runtime
 (
+  rm -rf "${build_dir}/java-runtime"
   mkdir -p  "${build_dir}/java-runtime"
   cd  "${build_dir}/java-runtime"
 
@@ -82,6 +84,7 @@
     --no-header-files \
     --no-man-pages \
     --compress=2 \
+    --strip-debug \
     --module-path="${build_dir}/images/jdk/jmods" \
     --add-modules $(xargs < ${top}/toolchain/jdk/build/jetbrainsruntime-modules.list | sed s/" "/,/g) \
     --output "${build_dir}/java-runtime/Contents/Home"

build-jetbrainsruntime17-darwin-aarch64.sh

diff --git a/build-jetbrainsruntime17-darwin-aarch64.sh b/build-jetbrainsruntime17-darwin-aarch64.sh
index 4af2814..2584958 100755
--- a/build-jetbrainsruntime17-darwin-aarch64.sh
+++ b/build-jetbrainsruntime17-darwin-aarch64.sh
@@ -68,9 +68,10 @@
 
 rm -rf "$dist_dir"/{jdk.zip,jdk-debuginfo.zip,jdk-runtime.zip,build.log,configure.log}
 declare -r bundle_dir=$(find $build_dir/images/jdk-bundle/ -type d -depth 1 -name 'jdk-*.jdk')
-(cd "$build_dir/images/jdk-bundle" &&
-  zip -9rDy${quiet:+q} "$dist_dir"/jdk.zip . -x 'demo/*' -x'man/*' -x'*.dSYM/*' &&
-  zip -9rDy${quiet:+q} "$dist_dir"/jdk-debuginfo.zip . -i'*.dSYM/*'
+(
+  cd "$bundle_dir"
+  zip -9rDy${quiet:+q} "$dist_dir"/jdk.zip . --exclude 'Contents/Home/demo/*' --exclude 'Contents/Home/man/*' --exclude '*.dSYM*'
+  zip -9rDy${quiet:+q} "$dist_dir"/jdk-debuginfo.zip . --include '*.dSYM*'
 )
 cp "$build_dir"/build.log "$dist_dir"
 cp "$build_dir"/configure-support/config.log "$dist_dir"/configure.log
@@ -79,6 +80,7 @@
 
 # Java Runtime
 (
+  rm -rf "${build_dir}/java-runtime"
   mkdir -p  "${build_dir}/java-runtime"
   cd  "${build_dir}/java-runtime"
 
@@ -87,6 +89,7 @@
     --no-header-files \
     --no-man-pages \
     --compress=2 \
+    --strip-debug \
     --module-path="${build_dir}/images/jdk/jmods" \
     --add-modules $(xargs < ${top}/external/jetbrains/JetBrainsRuntime17/jb/project/tools/common/modules.list | sed s/" "//g) \
     --output "${build_dir}/java-runtime/Contents/Home"
@@ -95,5 +98,5 @@
   ditto ${bundle_dir}/Contents/MacOS ./Contents/MacOS
   ditto ${bundle_dir}/Contents/Info.plist ./Contents/Info.plist
 
-  zip -9rDy${quiet:+q} "${dist_dir}/jdk-runtime.zip" . -x'*.dSYM/*' -x'*/man/*' -x'*/demo/*'
+  zip -9rDy${quiet:+q} "${dist_dir}/jdk-runtime.zip" .
 )
\ No newline at end of file

build-jetbrainsruntime17-darwin.sh

diff --git a/build-jetbrainsruntime17-darwin.sh b/build-jetbrainsruntime17-darwin.sh
index de89236..26afb0e 100755
--- a/build-jetbrainsruntime17-darwin.sh
+++ b/build-jetbrainsruntime17-darwin.sh
@@ -65,9 +65,10 @@
 
 rm -rf "$dist_dir"/{jdk.zip,jdk-debuginfo.zip,jdk-runtime.zip,build.log,configure.log}
 declare -r bundle_dir=$(find $build_dir/images/jdk-bundle/ -type d -depth 1 -name 'jdk-*.jdk')
-(cd "$build_dir/images/jdk" &&
-  zip -9rDy${quiet:+q} "$dist_dir"/jdk.zip . -x 'demo/*' -x'man/*' -x'*.dSYM/*' &&
-  zip -9rDy${quiet:+q} "$dist_dir"/jdk-debuginfo.zip . -i'*.dSYM/*'
+(
+  cd "$bundle_dir"
+  zip -9rDy${quiet:+q} "$dist_dir"/jdk.zip . --exclude 'Contents/Home/demo/*' --exclude 'Contents/Home/man/*' --exclude '*.dSYM*'
+  zip -9rDy${quiet:+q} "$dist_dir"/jdk-debuginfo.zip . --include '*.dSYM*'
 )
 cp "$build_dir"/build.log "$dist_dir"
 cp "$build_dir"/configure-support/config.log "$dist_dir"/configure.log
@@ -75,12 +76,14 @@
 
 # Java Runtime
 (
+  rm -rf "${build_dir}/java-runtime"
   mkdir -p  "${build_dir}/java-runtime"
   cd  "${build_dir}/java-runtime"
 
   "${build_dir}/images/jdk/bin/jlink" \
     --no-header-files \
     --no-man-pages \
+    --strip-debug \
     --compress=2 \
     --module-path="${build_dir}/images/jdk/jmods" \
     --add-modules $(xargs < ${top}/external/jetbrains/JetBrainsRuntime17/jb/project/tools/common/modules.list | sed s/" "//g) \