JBR-2324 address new layout in mac jcef 80.0.4+g74f7b0c+chromium-80.0.3987.122

(cherry picked from commit 6f45378ed9)
This commit is contained in:
Vitaly Provodin
2020-04-25 08:39:02 +07:00
committed by jbrbot
parent e2062e4e37
commit c2d03972c8
2 changed files with 1 additions and 5 deletions

View File

@@ -61,9 +61,7 @@ function create_jbr {
if [[ "${bundle_type}" == *jcef* ]]; then
rm -rf ${JRE_CONTENTS}/Frameworks || exit $?
rm -rf ${JRE_CONTENTS}/Helpers || exit $?
cp -a jcef_mac/Frameworks ${JRE_CONTENTS} || exit $?
cp -a jcef_mac/Helpers ${JRE_CONTENTS} || exit $?
fi
echo Creating ${JBR}.tar.gz ...
@@ -110,7 +108,6 @@ cp -a $JSDK/jdk-$JBSDK_VERSION_WITH_DOTS.jdk $BASE_DIR/$JBRSDK_BUNDLE || exit $?
if [[ "$bundle_type" == *jcef* ]]; then
cp -a jcef_mac/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
cp -a jcef_mac/Helpers $BASE_DIR/$JBRSDK_BUNDLE/Contents/
fi
if [ "$bundle_type" == "jfx_jcef" ]; then
echo Creating $JBSDK.tar.gz ...

View File

@@ -27,8 +27,7 @@ log "Signing libraries and executables..."
for f in \
"Contents/Home/bin" \
"Contents/Home/lib" \
"Contents/Frameworks" \
"Contents/Helpers"; do
"Contents/Frameworks"; do
if [ -d "$APP_DIRECTORY/$f" ]; then
find "$APP_DIRECTORY/$f" \
-type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -perm +111 \) \