Skip to content

Commit 0724852

Browse files
marceltaeumelmarceltaeumel
committed
clean up AIO templates; re-use squeak.sh for both Linux and AIO bundles
1 parent 346e786 commit 0724852

16 files changed

+104
-165
lines changed

‎helpers.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,7 @@ download_and_extract_vm() {
9797
local volume=$(hdiutil attach "${filepath}" | tail -1 | awk '{print $3}')
9898
mkdir -p "${target}"
9999
cp -R "${volume}/"* "${target}/"
100-
echo "Extracted into ${target}/ from ${volume}/"
101-
pushd ${volume}
102-
ls -lisa
103-
popd
104-
pushd ${target}
105-
ls -lisa
106-
popd
107-
108100
diskutil unmount "${volume}"
109-
110101
else
111102
echo "Unknown archive format." && exit 77
112103
fi

‎helpers_bundles.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ download_and_extract_all_vms_rc() {
5656
readonly BUNDLE_NAME_LIN_ARM_SUFFIX="Linux-ARMv8"
5757
readonly BUNDLE_NAME_MAC_X86_SUFFIX="macOS-x64"
5858
readonly BUNDLE_NAME_MAC_ARM_SUFFIX="macOS-ARMv8"
59-
readonly BUNDLE_NAME_WIN_X86_SUFFIX="Windows"
59+
readonly BUNDLE_NAME_WIN_X86_SUFFIX="Windows-x64"
6060
readonly BUNDLE_NAME_WIN_ARM_SUFFIX="" # n/a
6161

6262
else # 32-bit
@@ -75,7 +75,7 @@ download_and_extract_all_vms_rc() {
7575
readonly BUNDLE_NAME_LIN_ARM_SUFFIX="Linux-ARMv6"
7676
readonly BUNDLE_NAME_MAC_X86_SUFFIX="" # n/a for 32-bit
7777
readonly BUNDLE_NAME_MAC_ARM_SUFFIX="" # n/a for 32-bit
78-
readonly BUNDLE_NAME_WIN_X86_SUFFIX="Windows"
78+
readonly BUNDLE_NAME_WIN_X86_SUFFIX="Windows-x86"
7979
readonly BUNDLE_NAME_WIN_ARM_SUFFIX="" # n/a
8080
fi
8181

‎prepare_bundle_aio.sh

Lines changed: 57 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,45 +17,83 @@ APP_PATH="${BUILD_PATH}/${APP_NAME}"
1717
CONTENTS_PATH="${APP_PATH}/Contents"
1818
RESOURCES_PATH="${CONTENTS_PATH}/Resources"
1919

20-
VM_ARM_TARGET="${CONTENTS_PATH}/Linux-ARM"
2120
if [[ "${IMAGE_BITS}" == "64" ]]; then
22-
VM_LIN_TARGET="${CONTENTS_PATH}/Linux-x86_64"
21+
VM_MAC_TARGET_NAME="MacOS" # unified binary
22+
23+
VM_LIN_TARGET_NAME="Linux-x86_64"
24+
VM_LIN_ARM_TARGET_NAME="Linux-arm64"
25+
26+
VM_WIN_TARGET_NAME="Windows-x86_64"
27+
# VM_WIN_ARM_TARGET_NAME="Win32-arm64"
2328
else
24-
VM_LIN_TARGET="${CONTENTS_PATH}/Linux-i686"
29+
VM_LIN_TARGET_NAME="Linux-i686"
30+
VM_LIN_ARM_TARGET_NAME="Linux-arm"
31+
VM_WIN_TARGET_NAME="Windows-x86"
32+
# VM_WIN_ARM_TARGET_NAME="Win32-arm"
2533
fi
26-
VM_MAC_TARGET="${CONTENTS_PATH}/MacOS"
27-
VM_WIN_TARGET="${CONTENTS_PATH}/Win32"
34+
35+
VM_MAC_TARGET="${CONTENTS_PATH}/${VM_MAC_TARGET_NAME}"
36+
VM_LIN_TARGET="${CONTENTS_PATH}/${VM_LIN_TARGET_NAME}"
37+
VM_LIN_ARM_TARGET="${CONTENTS_PATH}/${VM_LIN_ARM_TARGET_NAME}"
38+
VM_WIN_TARGET="${CONTENTS_PATH}/${VM_WIN_TARGET_NAME}"
39+
# VM_WIN_ARM_TARGET="${CONTENTS_PATH}/${VM_WIN_ARM_TARGET_NAME}"
2840

2941
echo "...copying VMs into bundle..."
30-
cp -R "${TMP_PATH}/${VM_MAC}/Squeak.app" "${APP_PATH}"
31-
if is_32bit; then
32-
cp -R "${TMP_PATH}/${VM_ARM6}" "${VM_ARM_TARGET}"
42+
if [[ "${IMAGE_BITS}" == "64" ]]; then
43+
cp -R "${TMP_PATH}/${VM_MAC}/Squeak.app" "${APP_PATH}" # unified binary
44+
cp -R "${TMP_PATH}/${VM_LIN_X86}" "${VM_LIN_TARGET}"
45+
cp -R "${TMP_PATH}/${VM_LIN_ARM}" "${VM_LIN_ARM_TARGET}"
46+
cp -R "${TMP_PATH}/${VM_WIN_X86}" "${VM_WIN_TARGET}"
47+
# cp -R "${TMP_PATH}/${VM_WIN_ARM}" "${VM_WIN_ARM_TARGET}"
48+
else # 32-bit
49+
mkdir -p "${APP_PATH}" # no 32-bit macOS .app anymore
50+
mkdir -p "${CONTENTS_PATH}" # no 32-bit macOS .app anymore
51+
mkdir -p "${RESOURCES_PATH}" # no 32-bit macOS .app anymore
52+
cp -R "${TMP_PATH}/${VM_LIN_X86}" "${VM_LIN_TARGET}"
53+
cp -R "${TMP_PATH}/${VM_LIN_ARM}" "${VM_LIN_ARM_TARGET}"
54+
cp -R "${TMP_PATH}/${VM_WIN_X86}" "${VM_WIN_TARGET}"
55+
# cp -R "${TMP_PATH}/${VM_WIN_ARM}" "${VM_WIN_ARM_TARGET}"
3356
fi
34-
cp -R "${TMP_PATH}/${VM_LIN}" "${VM_LIN_TARGET}"
35-
cp -R "${TMP_PATH}/${VM_WIN}" "${VM_WIN_TARGET}"
3657

3758
copy_resources "${RESOURCES_PATH}"
3859

3960
echo "...merging template..."
40-
cp "${AIO_TEMPLATE_PATH}/squeak.bat" "${BUILD_PATH}/"
41-
cp "${AIO_TEMPLATE_PATH}/squeak.sh" "${BUILD_PATH}/"
42-
cp "${AIO_TEMPLATE_PATH}/Squeak.app/Contents/Info.plist" "${CONTENTS_PATH}/"
61+
cp "${WIN_TEMPLATE_PATH}/squeak.bat" "${BUILD_PATH}/"
62+
cp "${LIN_TEMPLATE_PATH}/squeak.sh" "${BUILD_PATH}/"
63+
cp "${MAC_TEMPLATE_PATH}/Squeak.app/Contents/Info.plist" "${CONTENTS_PATH}/"
4364
cp "${ICONS_PATH}/${SMALLTALK_NAME}"*.icns "${RESOURCES_PATH}/"
44-
ENGLISH_PATH="${AIO_TEMPLATE_PATH}/Squeak.app/Contents/Resources/English.lproj"
65+
ENGLISH_PATH="${MAC_TEMPLATE_PATH}/Squeak.app/Contents/Resources/English.lproj"
4566
cp "${ENGLISH_PATH}/Credits.rtf" "${RESOURCES_PATH}/English.lproj/"
46-
cp "${AIO_TEMPLATE_PATH}/Squeak.app/Contents/Win32/Squeak.ini" "${VM_WIN_TARGET}/"
67+
cp "${WIN_TEMPLATE_PATH}/Squeak.ini" "${VM_WIN_TARGET}/"
4768

4869
echo "...setting permissions..."
49-
chmod +x "${VM_LIN_TARGET}/squeak" "${VM_MAC_TARGET}/Squeak" "${VM_WIN_TARGET}/Squeak.exe" \
50-
"${BUILD_PATH}/squeak.sh" "${BUILD_PATH}/squeak.bat"
70+
chmod +x \
71+
"${BUILD_PATH}/squeak.sh" \
72+
"${BUILD_PATH}/squeak.bat"
73+
if [[ "${IMAGE_BITS}" == "64" ]]; then
74+
chmod +x \
75+
"${VM_MAC_TARGET}/Squeak" \
76+
"${VM_LIN_TARGET}/squeak" \
77+
"${VM_LIN_ARM_TARGET}/squeak" \
78+
"${VM_WIN_TARGET}/Squeak.exe"
79+
# "${VM_WIN_ARM_TARGET}/Squeak.exe"
80+
else # 32-bit
81+
chmod +x \
82+
"${VM_LIN_TARGET}/squeak" \
83+
"${VM_LIN_ARM_TARGET}/squeak" \
84+
"${VM_WIN_TARGET}/Squeak.exe"
85+
# "${VM_WIN_ARM_TARGET}/Squeak.exe"
86+
fi
5187

5288
echo "...applying various templates (squeak.sh, Info.plist, etc)..."
5389
# squeak.bat launcher
54-
sed -i".bak" "s/%APP_NAME%/${APP_NAME}/g" "${BUILD_PATH}/squeak.bat"
90+
sed -i".bak" "s/%AIO_APP_NAME%/${APP_NAME}/g" "${BUILD_PATH}/squeak.bat"
91+
sed -i".bak" "s/%AIO_VM_NAME%/${VM_WIN_TARGET_NAME}\\\\Squeak.exe/g" "${BUILD_PATH}/squeak.bat"
5592
sed -i".bak" "s/%SqueakImageName%/${IMAGE_NAME}.image/g" "${BUILD_PATH}/squeak.bat"
5693
rm -f "${BUILD_PATH}/squeak.bat.bak"
5794
# squeak.sh launcher
58-
sed -i".bak" "s/%APP_NAME%/${APP_NAME}/g" "${BUILD_PATH}/squeak.sh"
95+
sed -i".bak" "s/%VM_NAME%/squeak/g" "${BUILD_PATH}/squeak.sh"
96+
sed -i".bak" "s/%AIO_APP_NAME%/${APP_NAME}/g" "${BUILD_PATH}/squeak.sh"
5997
sed -i".bak" "s/%SqueakImageName%/${IMAGE_NAME}.image/g" "${BUILD_PATH}/squeak.sh"
6098
sed -i".bak" "s/%IMAGE_BITS%/${IMAGE_BITS}/g" "${BUILD_PATH}/squeak.sh"
6199
rm -f "${BUILD_PATH}/squeak.sh.bak"

‎prepare_bundle_linux_arm.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ cp "${LIN_TEMPLATE_PATH}/squeak.sh" "${BUNDLE_PATH}/"
3939
echo "...setting permissions..."
4040
chmod +x "${VM_PATH}/squeak"
4141

42+
echo "...applying various templates (squeak.sh)..."
43+
# squeak.sh launcher
44+
sed -i".bak" "s/%VM_NAME%/squeak/g" "${BUNDLE_PATH}/squeak.sh"
45+
rm -f "${BUNDLE_PATH}/squeak.sh.bak"
46+
4247
compress_into_product "${BUNDLE_NAME_LIN_ARM}"
4348
reset_build_dir
4449

‎prepare_bundle_linux_x86.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ cp "${LIN_TEMPLATE_PATH}/squeak.sh" "${BUNDLE_PATH}/"
4040
echo "...setting permissions..."
4141
chmod +x "${VM_PATH}/squeak" "${BUNDLE_PATH}/squeak.sh"
4242

43+
echo "...applying various templates (squeak.sh)..."
44+
# squeak.sh launcher
45+
sed -i".bak" "s/%VM_NAME%/squeak/g" "${BUNDLE_PATH}/squeak.sh"
46+
rm -f "${BUNDLE_PATH}/squeak.sh.bak"
47+
4348
compress_into_product "${BUNDLE_NAME_LIN_X86}"
4449
reset_build_dir
4550

‎prepare_bundle_macos_arm.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ fi
2828
copy_resources "${RESOURCES_PATH}"
2929

3030
echo "...merging template..."
31-
cp "${AIO_TEMPLATE_PATH}/Squeak.app/Contents/Info.plist" "${CONTENTS_PATH}/"
31+
cp "${MAC_TEMPLATE_PATH}/Squeak.app/Contents/Info.plist" "${CONTENTS_PATH}/"
3232
cp "${ICONS_PATH}/${SMALLTALK_NAME}"*.icns "${RESOURCES_PATH}/"
33-
ENGLISH_PATH="${AIO_TEMPLATE_PATH}/Squeak.app/Contents/Resources/English.lproj"
33+
ENGLISH_PATH="${MAC_TEMPLATE_PATH}/Squeak.app/Contents/Resources/English.lproj"
3434
cp "${ENGLISH_PATH}/Credits.rtf" "${RESOURCES_PATH}/English.lproj/"
3535

3636
echo "...setting permissions..."

‎prepare_bundle_macos_x86.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ fi
2828
copy_resources "${RESOURCES_PATH}"
2929

3030
echo "...merging template..."
31-
cp "${AIO_TEMPLATE_PATH}/Squeak.app/Contents/Info.plist" "${CONTENTS_PATH}/"
31+
cp "${MAC_TEMPLATE_PATH}/Squeak.app/Contents/Info.plist" "${CONTENTS_PATH}/"
3232
cp "${ICONS_PATH}/${SMALLTALK_NAME}"*.icns "${RESOURCES_PATH}/"
33-
ENGLISH_PATH="${AIO_TEMPLATE_PATH}/Squeak.app/Contents/Resources/English.lproj"
33+
ENGLISH_PATH="${MAC_TEMPLATE_PATH}/Squeak.app/Contents/Resources/English.lproj"
3434
cp "${ENGLISH_PATH}/Credits.rtf" "${RESOURCES_PATH}/English.lproj/"
3535

3636
echo "...setting permissions..."

‎prepare_bundle_windows_x86.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ cp -R "${TMP_PATH}/${VM_WIN_X86}/"* "${BUNDLE_PATH}"
2222
copy_resources "${BUNDLE_PATH}"
2323

2424
echo "...merging template..."
25-
cp "${AIO_TEMPLATE_PATH}/Squeak.app/Contents/Win32/Squeak.ini" "${BUNDLE_PATH}/"
25+
cp "${WIN_TEMPLATE_PATH}/Squeak.ini" "${BUNDLE_PATH}/"
2626

2727
echo "...setting permissions..."
2828
chmod +x "${BUNDLE_PATH}/Squeak.exe"

‎prepare_bundles.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ readonly TEMPLATE_PATH="${HOME_PATH}/templates"
4646
readonly AIO_TEMPLATE_PATH="${TEMPLATE_PATH}/all-in-one"
4747
readonly LIN_TEMPLATE_PATH="${TEMPLATE_PATH}/linux"
4848
readonly MAC_TEMPLATE_PATH="${TEMPLATE_PATH}/macos"
49-
readonly WIN_TEMPLATE_PATH="${TEMPLATE_PATH}/win"
49+
readonly WIN_TEMPLATE_PATH="${TEMPLATE_PATH}/windows"
5050

5151
readonly LOCALE_PATH="${HOME_PATH}/locale"
5252

‎templates/all-in-one/squeak.bat

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)