diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depend.ml | 4 | ||||
| -rwxr-xr-x | tools/make-package-macosx | 24 |
2 files changed, 15 insertions, 13 deletions
diff --git a/tools/depend.ml b/tools/depend.ml index a1a95c63d9..e5a20d248c 100644 --- a/tools/depend.ml +++ b/tools/depend.ml @@ -281,8 +281,8 @@ and add_class_expr bv ce = add bv l; List.iter (add_type bv) tyl | Pcl_structure(pat, fieldl) -> add_pattern bv pat; List.iter (add_class_field bv) fieldl - | Pcl_fun(_, _, pat, ce) -> - add_pattern bv pat; add_class_expr bv ce + | Pcl_fun(_, opte, pat, ce) -> + add_opt add_expr bv opte; add_pattern bv pat; add_class_expr bv ce | Pcl_apply(ce, exprl) -> add_class_expr bv ce; List.iter (fun (_,e) -> add_expr bv e) exprl | Pcl_let(_, pel, ce) -> diff --git a/tools/make-package-macosx b/tools/make-package-macosx index 1839c52c61..d20657d87e 100755 --- a/tools/make-package-macosx +++ b/tools/make-package-macosx @@ -18,8 +18,8 @@ cd package-macosx rm -rf ocaml.pkg ocaml-rw.dmg VERSION=`head -1 ../VERSION` -VERSION_MAJOR=`sed -n -e '1s/^\([0-9]*\)\..*/\1/p' ../VERSION -VERSION_MINOR=`sed -n -e '1s/^[0-9]*\.\([0-9]*\)[.+].*/\1/p' ../VERSION +VERSION_MAJOR=`sed -n -e '1s/^\([0-9]*\)\..*/\1/p' ../VERSION` +VERSION_MINOR=`sed -n -e '1s/^[0-9]*\.\([0-9]*\)[.+].*/\1/p' ../VERSION` # Worked in 10.2: @@ -101,8 +101,8 @@ mkdir -p resources # stop here -> | cat >resources/ReadMe.txt <<EOF This package installs Objective Caml version ${VERSION}. -You need Mac OS X 10.4.x (Tiger), with X11 and the -XCode tools (v2.4) installed. +You need Mac OS X 10.5.x (Leopard), with X11 and the +XCode tools (v3.x) installed. Files will be installed in the following directories: @@ -112,7 +112,7 @@ Files will be installed in the following directories: EOF chmod -R g-w root -sudo chown -R root:admin root +sudo chown -R root:wheel root /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker \ -build -p "`pwd`/ocaml.pkg" -f "`pwd`/root" -i "`pwd`/Info.plist" \ @@ -123,18 +123,20 @@ size=`expr $size + 8192` hdiutil create -sectors $size ocaml-rw.dmg name=`hdid -nomount ocaml-rw.dmg | grep Apple_HFS | cut -d ' ' -f 1` -newfs_hfs -v 'Objective Caml' $name +volname="Objective Caml ${VERSION}" +newfs_hfs -v "$volname" $name hdiutil detach $name name=`hdid ocaml-rw.dmg | grep Apple_HFS | cut -d ' ' -f 1` -if test -d '/Volumes/Objective Caml'; then - ditto -rsrcFork ocaml.pkg "/Volumes/Objective Caml/ocaml.pkg" - cp resources/ReadMe.txt "/Volumes/Objective Caml/" +if test -d "/Volumes/$volname"; then + ditto -rsrcFork ocaml.pkg "/Volumes/$volname/ocaml.pkg" + cp resources/ReadMe.txt "/Volumes/$volname/" else - echo 'Unable to mount the disk image as "/Volumes/Objective Caml"' >&2 + echo "Unable to mount the disk image as \"/Volumes/$volname\"" >&2 exit 3 fi -open "/Volumes/Objective Caml" +open "/Volumes/$volname" +sleep 2 hdiutil detach $name rm -rf "ocaml-${VERSION}.dmg" |