Skip to content

Commit

Permalink
Resolve bloated builds for macOS (and possibly Linux) due to symblic …
Browse files Browse the repository at this point in the history 
…links not being preserved.
  • Loading branch information
@digason
digason committed May 24, 2019
1 parent 318d77f commit ec64473
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
18 changes: 9 additions & 9 deletions nwjs-build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ mk_linux() {
cat ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/nwjs/nw ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/${PKG_NAME}.nw > ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/${PKG_NAME}
rm ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/${PKG_NAME}.nw
chmod +x ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/${PKG_NAME}
cp -r ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/nwjs/* ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/
cp -R ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/nwjs/* ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/
cd ${WORKING_DIR}/${TMP}/${1}/latest-git

if [[ ${LIBUDEV_HANDLER} = "true" ]];then
Expand Down Expand Up @@ -328,7 +328,7 @@ gisto_libudev_helper
chmod +x ./${PKG_NAME}
fi

zip -qq -r ${PKG_NAME}-${DATE}-${1}.zip *;
zip -qq -ry ${PKG_NAME}-${DATE}-${1}.zip *;
mv ${PKG_NAME}-${DATE}-${1}.zip ${RELEASE_DIR};
cd ${WORKING_DIR};
}
Expand All @@ -340,7 +340,7 @@ mk_windows() {
if [[ -f "${WIN_RESOURCE_ICO}" ]];then
cp ${WIN_RESOURCE_ICO} ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/
fi
cp -r ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/nwjs/* ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/
cp -R ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/nwjs/* ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/

cd ${WORKING_DIR}/${TMP}/${1}/latest-git
zip -qq -r ${PKG_NAME}-${DATE}-${1}.zip *;
Expand All @@ -349,8 +349,8 @@ mk_windows() {
}

mk_osx() {
cp -r ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/nwjs/*.app ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/${PKG_NAME}.app;
cp -r ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/${PKG_NAME}.nw ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/${PKG_NAME}.app/Contents/Resources/app.nw;
cp -R ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/nwjs/*.app ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/${PKG_NAME}.app;
cp -R ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/${PKG_NAME}.nw ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/${PKG_NAME}.app/Contents/Resources/app.nw;
rm -r ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/${PKG_NAME}.nw

# check if it is nwjs or node-webkit
Expand All @@ -361,7 +361,7 @@ mk_osx() {
fi

if [[ -f "${OSX_RESOURCE_ICNS}" ]];then
cp -r ${OSX_RESOURCE_ICNS} ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/${PKG_NAME}.app/Contents/Resources/
cp -R ${OSX_RESOURCE_ICNS} ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/${PKG_NAME}.app/Contents/Resources/
else
OSX_RESOURCE_ICNS="${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/nwjs/node-webkit.app/Contents/Resources/nw.icns"
fi
Expand Down Expand Up @@ -411,7 +411,7 @@ cat << gisto_plist_helper >> ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/${PK
</plist>
gisto_plist_helper
cd ${WORKING_DIR}/${TMP}/${1}/latest-git
zip -qq -r ${PKG_NAME}-${DATE}-${1}.zip *;
zip -qq -ry ${PKG_NAME}-${DATE}-${1}.zip *;

This comment has been minimized.

Sign in to view

Copy link
@sanusart

sanusart May 24, 2019

Collaborator

@digason Thanks for looking into this, do you mind to elaborate on y flag of zip? I am not familiar with it.

This comment has been minimized.

Sign in to view

Copy link
@digason

digason May 24, 2019

Author Contributor

From the zip man page:

-y
--symlinks
For UNIX and VMS (V8.3 and later), store symbolic links as such in the zip archive, instead of compressing and storing the file referred to by the link. This can avoid multiple copies of files being included in the archive as zip recurses the directory trees and accesses files directly and by links.

This comment has been minimized.

Sign in to view

Copy link
@digason

digason May 24, 2019

Author Contributor

As for cp -r vs cp -R, the behavior is identical on Linux, where links are preserved. However, on macOS the lowercase flag dereferences links, while uppercase flag preserves links.
mv ${PKG_NAME}-${DATE}-${1}.zip ${RELEASE_DIR};
cd ${WORKING_DIR};
}
Expand All @@ -434,10 +434,10 @@ build() {
mv ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/*-v${NW_VERSION}-${ARR_OS[$i]} ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/nwjs;

if [[ `split_string "${ARR_OS[$i]}" "-"` = "osx" ]]; then
cp -r ${PKG_SRC} ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/${PKG_NAME}.nw;
cp -R ${PKG_SRC} ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/${PKG_NAME}.nw;
else
cd ${PKG_SRC};
zip -qq -r ${PKG_NAME}.zip *;
zip -qq -ry ${PKG_NAME}.zip *;
mv ${PKG_NAME}.zip ${WORKING_DIR}/${TMP}/${ARR_OS[$i]}/latest-git/${PKG_NAME}.nw;
cd ${WORKING_DIR};
fi
Expand Down
8 changes: 4 additions & 4 deletions pack.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ check_dependencies() {
pack_linux () {
for arch in ${architechture[@]}; do
cd ${WORKING_DIR}
cp -r ${BUILD_DIR}/resources/linux/PKGNAME-VERSION-Linux ${BUILD_DIR}/TMP/$(get_value_by_key name)-$(get_value_by_key version)-Linux-${arch}
cp -R ${BUILD_DIR}/resources/linux/PKGNAME-VERSION-Linux ${BUILD_DIR}/TMP/$(get_value_by_key name)-$(get_value_by_key version)-Linux-${arch}
PKG_MK_DIR=${BUILD_DIR}/TMP/$(get_value_by_key name)-$(get_value_by_key version)-Linux-${arch}
mv ${PKG_MK_DIR}/PKGNAME ${PKG_MK_DIR}/$(get_value_by_key name)
mv ${PKG_MK_DIR}/$(get_value_by_key name)/PKGNAME ${PKG_MK_DIR}/$(get_value_by_key name)/$(get_value_by_key name)
Expand All @@ -133,7 +133,7 @@ pack_linux () {
mkdir ${PKG_MK_DIR}/share/pixmaps
cp $(get_value_by_key iconPath) ${PKG_MK_DIR}/share/pixmaps/$(get_value_by_key name).png
convert ${PKG_MK_DIR}/share/pixmaps/$(get_value_by_key name).png ${PKG_MK_DIR}/share/pixmaps/$(get_value_by_key name).xpm
cp -r ${BUILD_DIR}/TMP/linux-${arch}/latest-git/* ${PKG_MK_DIR}/$(get_value_by_key name)/
cp -R ${BUILD_DIR}/TMP/linux-${arch}/latest-git/* ${PKG_MK_DIR}/$(get_value_by_key name)/
mv ${PKG_MK_DIR}/$(get_value_by_key name)/$(get_value_by_key name) ${PKG_MK_DIR}/$(get_value_by_key name)/$(get_value_by_key name)-bin
# application
mv ${PKG_MK_DIR}/share/applications/PKGNAME.desktop ${PKG_MK_DIR}/share/applications/$(get_value_by_key name).desktop
Expand Down Expand Up @@ -225,8 +225,8 @@ osx_distribution_helper
pack_windows() {
for arch in ${architechture[@]}; do
cd ${WORKING_DIR}
cp -r ${BUILD_DIR}/resources/windows/app.nsi ${WORKING_DIR}
cp -r $(get_value_by_key windowsIconPath) ${BUILD_DIR}/TMP/win-${arch}/latest-git/
cp -R ${BUILD_DIR}/resources/windows/app.nsi ${WORKING_DIR}
cp -R $(get_value_by_key windowsIconPath) ${BUILD_DIR}/TMP/win-${arch}/latest-git/
# Replce paths and vars in nsi script
replace \
NWJS_APP_REPLACE_APPNAME "$(get_value_by_key name)" \
Expand Down

0 comments on commit ec64473

Please sign in to comment.