From a2572ae7bec8817f1e8e4752a555d6cc2e1617ef Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 10 Nov 2002 17:47:35 +0000
Subject: [PATCH] Add some Apple-specific stuff. Thanks to Greg Ercolano
<erco@3dsite.com> for hints on how to do the new XML-based packaging. No more
resource forks!
---
Makefile | 48 +++++++++++++++++++++++++-----
doc/README.mac | 28 ++++++++++++++++++
utils/make-dmg.sh | 75 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 144 insertions(+), 7 deletions(-)
create mode 100644 doc/README.mac
create mode 100644 utils/make-dmg.sh
diff --git a/Makefile b/Makefile
index 20415afbc9..1d6bf509a9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.237 2002-11-03 16:49:55 geuzaine Exp $
+# $Id: Makefile,v 1.238 2002-11-10 17:47:35 geuzaine Exp $
GMSH_MAJOR_VERSION = 1
GMSH_MINOR_VERSION = 35
@@ -475,11 +475,7 @@ link-solaris-scorec:
solaris-scorec: compile-solaris-scorec link-solaris-scorec
#
-# MacOS X. To distribute:
-# 1) compile
-# 2) copy all the stuff you want to distribute (using the finder! copying in
-# a shell will destroy the resources!) to a distribution folder
-# 3) use the DiskCopy utility to create a disk image (.dmg)
+# MacOS X
#
compile-macosx: initialtag
@for i in $(GMSH_FLTK_DIR); do (cd $$i && $(MAKE) \
@@ -495,8 +491,14 @@ compile-macosx: initialtag
link-macosx:
$(CXX) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_FLTK_LIB) -L$(FLTK_DIR)/lib -lfltk_gl -lfltk \
-framework AGL -framework OpenGL -framework Carbon -framework ApplicationServices
- /Developer/Tools/Rez -t APPL -o $(GMSH_BIN_DIR)/gmsh $(FLTK_DIR)/FL/mac.r
+# We don't use resources anymore...
+# /Developer/Tools/Rez -t APPL -o $(GMSH_BIN_DIR)/gmsh $(FLTK_DIR)/FL/mac.r
macosx: compile-macosx link-macosx
+distrib-macosx:
+ make tag
+ make clean
+ make macosx
+ make distrib-mac
# ----------------------------------------------------------------------
# Rules for developers
@@ -643,6 +645,38 @@ distrib-win:
rm -rf ../gmsh-distrib/tutorial
rm -rf ../gmsh-distrib/demos
+distrib-mac:
+ rm -rf Gmsh.app
+ mkdir Gmsh.app
+ mkdir Gmsh.app/Contents
+ mkdir Gmsh.app/Contents/Resources
+ mkdir Gmsh.app/Contents/MacOS
+ echo "APPLnone" > Gmsh.app/Contents/PkgInfo
+ echo -e "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"\
+ "<!DOCTYPE plist SYSTEM \"file://localhost/System/Library/DTDs/PropertyList.dtd\">\n"\
+ "<plist version=\"0.9\">\n"\
+ " <dict>\n"\
+ " <key>CFBundleName</key><string>Gmsh</string>\n"\
+ " <key>CFBundlePackageType</key><string>APPL</string>\n"\
+ " <key>CFBundleVersion</key><string>$(GMSH_RELEASE)</string>\n"\
+ " <key>CFBundleShortVersionString</key><string>$(GMSH_RELEASE)</string>\n"\
+ " <key>CFBundleIconFile</key><string>gmsh.icns</string>\n"\
+ " <key>CFBundleSignature</key><string>none</string>\n"\
+ " <key>CFBundleGetInfoString</key><string>$(GMSH_RELEASE), "\
+ "(c) C. Geuzaine and J.-F. Remacle, 1997-2002</string>\n"\
+ " <key>CFAppleHelpAnchor</key><string>tutorial/tutorial</string>\n"\
+ " </dict>\n"\
+ "</plist>" > Gmsh.app/Contents/Info.plist
+ strip $(GMSH_BIN_DIR)/gmsh
+ cp $(GMSH_BIN_DIR)/gmsh Gmsh.app/Contents/MacOS
+ cp Fltk/MacIcons.icns Gmsh.app/Contents/Resources/gmsh.icns
+ cp -R doc/FORMATS doc/VERSIONS doc/FAQ doc/CONTRIBUTORS doc/gmsh.1\
+ tutorial demos Gmsh.app/Contents/Resources
+ rm -rf Gmsh.app/Contents/Resources/*/CVS\
+ Gmsh.app/Contents/Resources/*/*~\
+ Gmsh.app/Contents/Resources/*/*.msh
+ tar zcvf gmsh-$(GMSH_RELEASE)-$(GMSH_UNAME).tgz Gmsh.app
+
dem:
gtar zcvf gmsh-demos.tgz $(GMSH_DEMO_DIR)
gtar zcvf gmsh-tutorial.tgz $(GMSH_TUTORIAL_DIR)
diff --git a/doc/README.mac b/doc/README.mac
new file mode 100644
index 0000000000..2bb0c3e50e
--- /dev/null
+++ b/doc/README.mac
@@ -0,0 +1,28 @@
+
+HOWTO distribute the Mac version...
+====================================
+
+The old way (using resource forks)
+
+- compile
+
+- append the resources to the executable:
+
+ /Developer/Tools/Rez -t APPL -o $(GMSH_BIN_DIR)/gmsh $(FLTK_DIR)/FL/mac.r
+
+- copy all the stuff you want to distribute (using the finder or
+ 'ditto'! copying with 'cp' in a shell will destroy the resources!)
+ to a distribution folder
+
+- a) use the DiskCopy utility to create a disk image (.dmg)
+
+ b) you can also create the disk image on the command line, using
+ utils/make-dmg.sh (WARNING: modify the script to suit your needs)
+
+
+The new way:
+
+- use the new XML-based scheme: see 'make distrib-mac'
+
+- and just 'tar zcvf' the directory! No more resources!
+
diff --git a/utils/make-dmg.sh b/utils/make-dmg.sh
new file mode 100644
index 0000000000..9fe446ca15
--- /dev/null
+++ b/utils/make-dmg.sh
@@ -0,0 +1,75 @@
+
+SRCDIR=gmsh-distrib
+DMGNAME=gmsh.dmg
+VOLNAME=gmsh
+
+####################################################################
+###### 1. create a disk image and format it
+####################################################################
+
+# compute total size of disk image (5% percent more than the
+# total data size; this allows for the partition tables overhead:
+# 64 sectors, 512 bytes each + some spare)
+#
+SIZE=`du -sk ${SRCDIR} | awk '{printf "%.3gn",($1*10.5)/(10240)}'`
+
+# create the disk image
+#
+hdiutil create tmp.dmg -megabytes ${SIZE} -ov -type UDIF
+
+# create /dev entries but do not mount it, else the Finder will prompt
+# to initialize the disk (since the disk is not formatted yet)
+#
+# The output of hdid looks like
+#
+# /dev/disk2 Apple_partition_scheme
+# /dev/disk2s1 Apple_partition_map
+# /dev/disk2s2 Apple_HFS
+#
+# MYDISK contains only the disk name, i.e. "disk2"
+#
+# To check to currently handled disks images, type
+#
+# hdiutils info
+#
+MYDISK=`hdid -nomount tmp.dmg |awk '/scheme/ {print substr ($1, 6, length)}'`
+
+# make a new filesystem on the device
+#
+sudo newfs_hfs -v "$VOLNAME" /dev/r${MYDISK}s2
+
+# eject the device
+#
+hdiutil eject $MYDISK
+
+####################################################################
+###### 2. mount the disk image and copy files to it
+####################################################################
+
+# mount the image
+#
+hdid tmp.dmg
+
+# make sure that there are no locked files before running ditto
+# (ditto is the same as 'cp', except that it preserves resource
+# forks)
+#
+chflags -R nouchg,noschg "${SRCDIR}"
+ditto -rsrcFork -v "${SRCDIR}" "/Volumes/${VOLNAME}"
+
+# eject the device
+#
+hdiutil eject $MYDISK
+
+####################################################################
+###### 3. Convert to compressed image, delete temp image
+####################################################################
+
+# convert to compressed image
+#
+hdiutil convert tmp.dmg -format UDZO -o "${DMGNAME}"
+
+# remove temp image
+#
+rm -f tmp.dmg
+
--
GitLab