Attachment 211468 Details for Bug 243578 – diff between the old and new tar.

diff between the old and new tar.

diff.txt (text/plain), 4.27 KB, created by Jack on 2020-02-08 06:16:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jack

Created: 2020-02-08 06:16:51 UTC

Size: 4.27 KB

patch

obsolete

>diff -urN old/audacity-Audacity-2.3.3/mac/scripts/build_dist2.sh new/audacity-Audacity-2.3.3/mac/scripts/build_dist2.sh
>--- old/audacity-Audacity-2.3.3/mac/scripts/build_dist2.sh	1969-12-31 16:00:00.000000000 -0800
>+++ new/audacity-Audacity-2.3.3/mac/scripts/build_dist2.sh	2019-11-15 03:14:55.000000000 -0800
>@@ -0,0 +1,105 @@
>+set -x
>+
>+# Setup
>+VERSION=`awk '/^#define+ AUDACITY_VERSION / {print $3}' build/Info.plist.h`
>+RELEASE=`awk '/^#define+ AUDACITY_RELEASE / {print $3}' build/Info.plist.h`
>+REVISION=`awk '/^#define+ AUDACITY_REVISION / {print $3}' build/Info.plist.h`
>+VERSION=$VERSION.$RELEASE.$REVISION
>+
>+cd "${DSTROOT}"
>+chmod -RH "${INSTALL_MODE_FLAG}" "${TARGET_BUILD_DIR}"
>+chown -RH "${INSTALL_OWNER}:${INSTALL_GROUP}" "${TARGET_BUILD_DIR}"
>+
>+echo "Audacity has been installed to: ${DSTROOT}"
>+
>+cd ..
>+
>+VOL="Audacity $VERSION"
>+DMG="audacity-macos-$VERSION"
>+
>+# Preclean
>+rm -rf "$DMG" "$DMG.dmg" TMP.dmg
>+
>+# Create structure
>+mkdir "$DMG"
>+cp -pR "${DSTROOT}/" "${DMG}"
>+
>+#Add a custom icon for the DMG
>+#cp -p mac/Resources/Audacity.icns "${DMG}"/.VolumeIcon.icns
>+
>+# Make sure it's not already attached
>+ATTACHED=$(hdiutil info | awk "/\/Volumes\/${VOL}/{print \$1}")
>+if [ -n "${ATTACHED}" ]
>+then
>+   hdiutil detach "${ATTACHED}"
>+fi
>+
>+# Create and mount the image
>+hdiutil create -ov -format UDRW -srcdir "$DMG" -fs HFS+ -volname "$VOL" TMP.dmg
>+if [ $? -ne 0 ]
>+then
>+   echo "Create failed"
>+   exit 1
>+fi
>+
>+#Mount the DMG and store the name it was mounted with
>+TITLE=$(hdiutil attach TMP.dmg | grep \/Volumes | sed "s/^.*\/Volumes\///")
>+if [ $? -ne 0 ]
>+then
>+   echo "Attach failed"
>+   exit 1
>+fi
>+
>+# And wait for it to show up in Finder
>+osascript <<EOF
>+   tell application "Finder"
>+      repeat until exists disk "${TITLE}"
>+         log "Waiting for ${TITLE} to appear"
>+         delay 0.2
>+      end repeat
>+   end tell
>+EOF
>+
>+#Set the custom icon flag
>+#SetFile -a C /Volumes/"$TITLE"
>+
>+#Make our DMG look pretty and install the custom background image
>+echo '
>+   tell application "Finder"
>+     tell disk "'$TITLE'"
>+           open
>+           set current view of container window to icon view
>+           set toolbar visible of container window to false
>+           set statusbar visible of container window to false
>+           set the bounds of container window to {400, 100, 1000, 550}
>+           set theViewOptions to the icon view options of container window
>+           set arrangement of theViewOptions to not arranged
>+           set icon size of theViewOptions to 72
>+           set background picture of theViewOptions to file ".background:Audacity-DMG-background.png" 
>+           make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"}
>+           set position of item "Audacity" of container window to {170, 350}
>+           set position of item "Applications" of container window to {430, 350}
>+           close
>+           open
>+           update without registering applications
>+           delay 5
>+           eject
>+     end tell
>+   end tell
>+' | osascript
>+
>+# Compress and prepare for Internet delivery
>+hdiutil convert TMP.dmg -format UDZO -imagekey zlib-level=9 -o "$DMG.dmg"
>+
>+# Create zip version
>+rm -rf "${DMG}/.background"
>+rm -rf "${DMG}/Audacity.app/help/"
>+zip -r9 "${DMG}.zip" "${DMG}"
>+
>+# Cleanup
>+#rm -rf ${DMG} TMP.dmg
>+echo 'resizing and openning dmg'
>+hdiutil resize -size 200m TMP.dmg
>+hdiutil mount TMP.dmg
>+echo 'declutter the dmg, sign, compress and sign it'
>+
>File old/audacity-Audacity-2.3.3/nyq-po/LINGUAS is not a regular file or directory and was skipped
>diff -urN old/audacity-Audacity-2.3.3/src/Audacity.h new/audacity-Audacity-2.3.3/src/Audacity.h
>--- old/audacity-Audacity-2.3.3/src/Audacity.h	2019-11-14 15:28:15.000000000 -0800
>+++ new/audacity-Audacity-2.3.3/src/Audacity.h	2019-11-15 03:14:55.000000000 -0800
>@@ -39,7 +39,7 @@
> // Its value may be more than 0 for pre-release "Beta" builds that differ only
> // in the welcome screen, and hiding of some development menu commands, but
> // still link to the alpha manual online.
>-#define AUDACITY_BUILD_LEVEL 0
>+#define AUDACITY_BUILD_LEVEL 2
> 
> // used #ifdef not #if for IS_ALPHA, IS_BETA, IS_RELEASE, USE_ALPHA_MANUAL
> #undef IS_ALPHA
>Binary files old/audacity-audacity-Audacity-2.3.3_GH0.tar.gz and new/audacity-audacity-Audacity-2.3.3_GH0.tar.gz differ

Actions: View

Attachments on bug 243578: 211023 | 211024 | 211468