suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove "internet-enabled" dmg creation.

Browse Source 
Robby says that they're no longer recommended and rarely used by
browsers, and with a better dmg layout the contents should not be copied
automatically anyway.
This commit is contained in:
Eli Barzilay 2013-01-09 19:05:41 -05:00
parent 2067534431
commit a3a47128de
1 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
collects/meta/build/build
View File

@ -320,15 +320,15 @@ platforms_of_dist_type() {
} }
installer_of_dist_type_platform() { # input: dtype-dplatform installer_of_dist_type_platform() { # input: dtype-dplatform
case "$1" in case "$1" in
( "src-unix" ) echo "tgz" ;; ( "src-unix" ) echo "tgz" ;;
( "src-mac" ) echo "dmg" ;; ( "src-mac" ) echo "dmg" ;;
( "src-win" ) echo "zip" ;; ( "src-win" ) echo "zip" ;;
( "bin-"*"-linux"* ) echo "sh" ;; ( "bin-"*"-linux"* ) echo "sh" ;;
( "bin-"*"-freebsd" ) echo "sh" ;; ( "bin-"*"-freebsd" ) echo "sh" ;;
( "bin-"*"-solaris" ) echo "sh" ;; ( "bin-"*"-solaris" ) echo "sh" ;;
( "bin-"*"-darwin" ) echo "sh" ;; ( "bin-"*"-darwin" ) echo "sh" ;;
( "bin-"*"-osx-mac" ) echo "idmg" ;; ( "bin-"*"-osx-mac" ) echo "dmg" ;;
( "bin-"*"-win32" ) echo "exe" ;; ( "bin-"*"-win32" ) echo "exe" ;;
( * ) exit_error "Unknown dist type+platform for" \ ( * ) exit_error "Unknown dist type+platform for" \
"installer_of_dist_type_platform: \"$1\"" ;; "installer_of_dist_type_platform: \"$1\"" ;;
esac esac
@ -339,9 +339,6 @@ explanation_of_installer_type() {
"\"gunzip <file> | tar xvf -\"." ;; "\"gunzip <file> | tar xvf -\"." ;;
( "dmg" ) echo "Mount this disk image and copy the Racket folder to" \ ( "dmg" ) echo "Mount this disk image and copy the Racket folder to" \
"your disk." ;; "your disk." ;;
( "idmg" ) echo "Some browsers will automatically mount & copy the" \
"\"Racket\" folder to your desktop; if yours does not," \
"mount the disk and copy it yourself." ;;
( "zip" ) echo "Use unzip to extract the Racket folder to your disk." ;; ( "zip" ) echo "Use unzip to extract the Racket folder to your disk." ;;
( "sh" ) echo "Execute this file with \"sh <file>\"," \ ( "sh" ) echo "Execute this file with \"sh <file>\"," \
"and follow the instructions." ;; "and follow the instructions." ;;
@ -1716,8 +1713,8 @@ tgz_to_zip() {
_rm "$tmpdir/tgz-to-zip-$$" _rm "$tmpdir/tgz-to-zip-$$"
} }
#---------------------------------------- #----------------------------------------
make_dmg() { # inputs: dir, dmg, internet-enabled? make_dmg() { # inputs: dir, dmg
local srcdir="$1" tgtdmg="$2" internet_enabled="$3"; shift 3 local srcdir="$1" tgtdmg="$2"; shift 2
local tmpdmg="${tgtdmg%.dmg}-tmp.dmg" local tmpdmg="${tgtdmg%.dmg}-tmp.dmg"
local src="$(basename "$srcdir")" local src="$(basename "$srcdir")"
local myself="$(id -nu):$(id -ng)" local myself="$(id -nu):$(id -ng)"
@ -1744,16 +1741,12 @@ make_dmg() { # inputs: dir, dmg, internet-enabled?
# [4] remove the uncompressed image # [4] remove the uncompressed image
_run sudo chown "$myself" "$tgtdmg" "$tmpdmg" _run sudo chown "$myself" "$tgtdmg" "$tmpdmg"
_rm "$tmpdmg" _rm "$tmpdmg"
# this will make browsers get the dmg, mount, copy contents, unmount
if [[ "$internet_enabled" = "yes" ]]; then
_run hdiutil internet-enable "$tgtdmg"
fi
} }
#---------------------------------------- #----------------------------------------
do_tgz_to_dmg() { do_tgz_to_dmg() {
local internet_enabled="$1" tmptgz="$2" tmpdmg="$3" version="$4" local tmptgz="$1" tmpdmg="$2" version="$3"
local pname="$5" ptype="$6" srcplatform="$7" local pname="$4" ptype="$5" srcplatform="$6"
shift 7 shift 6
local distname="$(name_of_dist_package "$pname")" local distname="$(name_of_dist_package "$pname")"
distname="$distname v$version" distname="$distname v$version"
if [[ "$ptype" != "bin" ]]; then if [[ "$ptype" != "bin" ]]; then
@ -1767,26 +1760,19 @@ do_tgz_to_dmg() {
_rm "$tmptgz" _rm "$tmptgz"
_mv "$installdir" "$distname" _mv "$installdir" "$distname"
_cd "$tmpdir/tgz-to-dmg-$$" _cd "$tmpdir/tgz-to-dmg-$$"
make_dmg "$distname" "$tmpdmg" "$internet_enabled" make_dmg "$distname" "$tmpdmg"
_cd "$savedpwd" _cd "$savedpwd"
_rm "$tmpdir/tgz-to-dmg-$$" _rm "$tmpdir/tgz-to-dmg-$$"
} }
tgz_to_some_dmg() { tgz_to_dmg() {
local internet_enabled="$1"; shift 1
local srctgz="$1" tgt="$2" pname="$3" ptype="$4" srcplatform="$5"; shift 5 local srctgz="$1" tgt="$2" pname="$3" ptype="$4" srcplatform="$5"; shift 5
local tmptgz="$tmpdir/tgz2dmg.tgz" local tmptgz="$tmpdir/tgz2dmg.tgz"
local tmpdmg="$tmpdir/tgz2dmg.dmg" local tmpdmg="$tmpdir/tgz2dmg.dmg"
_scp "$srctgz" "${dmgmachine}:$tmptgz" _scp "$srctgz" "${dmgmachine}:$tmptgz"
run_part "$dmgmachine" "do_tgz_to_dmg" "$internet_enabled" \ run_part "$dmgmachine" "do_tgz_to_dmg" \
"$tmptgz" "$tmpdmg" "$version" "$pname" "$ptype" "$srcplatform" "$tmptgz" "$tmpdmg" "$version" "$pname" "$ptype" "$srcplatform"
_scp "${dmgmachine}:$tmpdmg" "$tgt.dmg" _scp "${dmgmachine}:$tmpdmg" "$tgt.dmg"
} }
tgz_to_dmg() {
tgz_to_some_dmg "no" "$@"
}
tgz_to_idmg() { # same as ..._dmg, but makes it internet-enabled
tgz_to_some_dmg "yes" "$@"
}
#---------------------------------------- #----------------------------------------
do_tgz_to_exe() { do_tgz_to_exe() {
local tmptgz="$1" tmpexe="$2" nsistgz="$3" local tmptgz="$1" tmpexe="$2" nsistgz="$3"