From: mjwybrow Date: Sun, 23 Jul 2006 06:08:58 +0000 (+0000) Subject: * packaging/osx-app.sh, packaging/macosx/inkscape.ds_store X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=408e9460dd70bf3c99f32030e78a901bf959da89;p=inkscape.git * packaging/osx-app.sh, packaging/macosx/inkscape.ds_store packaging/macosx/dmg_background.svg, packaging/macosx/osx-dmg.sh, packaging/macosx/dmg_background.png, packaging/macosx/dmg_set_style.scpt: Improve the disk image layout for Mac OS X releases. This is based on Jean-Olivier Irisson's work and patches, submitted as #1516212. --- diff --git a/ChangeLog b/ChangeLog index 8ba0bfe75..1d70cb1ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,21 +1,32 @@ +2006-07-23 Michael Wybrow + + * packaging/osx-app.sh, packaging/macosx/inkscape.ds_store + packaging/macosx/dmg_background.svg, packaging/macosx/osx-dmg.sh, + packaging/macosx/dmg_background.png, + packaging/macosx/dmg_set_style.scpt: + + Improve the disk image layout for Mac OS X releases. This is + based on Jean-Olivier Irisson's work and patches, submitted as + #1516212. + 2006-07-23 John Bintz - * src/desktop.cpp, src/desktop.h - - added SPDesktop::updateNow() - - * src/event-context.cpp, src/select-context.cpp, src/node-context.cpp - - forced redraw of canvas upon completion of selection or panning - to work around event starvation issue at high zoom levels + * src/desktop.cpp, src/desktop.h + + added SPDesktop::updateNow() + + * src/event-context.cpp, src/select-context.cpp, src/node-context.cpp + + forced redraw of canvas upon completion of selection or panning + to work around event starvation issue at high zoom levels 2006-07-22 John Bintz - * src/desktop.cpp, src/desktop.h, src/document-undo.cpp, - src/document.h, src/document-private.h, src/document.cpp: + * src/desktop.cpp, src/desktop.h, src/document-undo.cpp, + src/document.h, src/document-private.h, src/document.cpp: - forced redraw of canvas upon document commit to work - around event starvation issue at high zoom levels + forced redraw of canvas upon document commit to work + around event starvation issue at high zoom levels 2006-07-21 MenTaLguY @@ -65,6 +76,7 @@ replace two uses of hash_map with standard STL map 2006-07-18 Bryce Harrington + * src/document.h, src/document.cpp: Refactoring from mental & bryce to consolidate document update functionality from sp_document_ensure_is_up_to_date() and @@ -73,8 +85,7 @@ 2006-07-18 Tim Dwyer - * src/graphlayout/graphlayout.cpp, - src/conn-avoid-ref.h: + * src/graphlayout/graphlayout.cpp, src/conn-avoid-ref.h: We now use connector spacing to determine the minimum space required between shape bounding boxes when graph layout with avoid overlap constraints is applied. This means that there should always be enough @@ -83,8 +94,7 @@ 2006-07-17 Tim Dwyer - * src/libcola/cola.h, - src/libcola/connected_components.cpp, + * src/libcola/cola.h, src/libcola/connected_components.cpp, src/graphlayout/graphlayout.cpp: Disconnected graphs are now handled more gracefully, connected components are arranged separated (in place) and diff --git a/packaging/macosx/dmg_background.png b/packaging/macosx/dmg_background.png new file mode 100644 index 000000000..66d532f6d Binary files /dev/null and b/packaging/macosx/dmg_background.png differ diff --git a/packaging/macosx/dmg_background.svg b/packaging/macosx/dmg_background.svg new file mode 100644 index 000000000..6c69e511b --- /dev/null +++ b/packaging/macosx/dmg_background.svg @@ -0,0 +1,911 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This tutorial covers copy/paste, node editing, freehand and bezier drawing, path manipulation, booleans, offsets, simplification, and text tool. + + + diff --git a/packaging/macosx/dmg_set_style.scpt b/packaging/macosx/dmg_set_style.scpt new file mode 100755 index 000000000..e25279d99 Binary files /dev/null and b/packaging/macosx/dmg_set_style.scpt differ diff --git a/packaging/macosx/inkscape.ds_store b/packaging/macosx/inkscape.ds_store new file mode 100644 index 000000000..394b40ec6 Binary files /dev/null and b/packaging/macosx/inkscape.ds_store differ diff --git a/packaging/macosx/osx-dmg.sh b/packaging/macosx/osx-dmg.sh new file mode 100755 index 000000000..7402f6c10 --- /dev/null +++ b/packaging/macosx/osx-dmg.sh @@ -0,0 +1,66 @@ +#!/bin/sh +# +# Inkscape packaging script for Mac OS X +# +# The script creates a read-write disk image, +# copies Inkscape in it, customizes its appearance through +# an applescript and compresses the disk image for distribution +# +# Authors: +# Jean-Olivier Irisson +# Michael Wybrow +# +# Copyright 2006 +# Licensed under GNU General Public License +# + +RWNAME="RWinkscape.dmg" +VOLNAME="Inkscape" +FIRSTTIME="false" +TMPDIR="/tmp/dmg-$$" + +# Create temp directory with desired contents of the release volume. +rm -rf "$TMPDIR" +mkdir "$TMPDIR" + +# Copy Inkscape.app folder. +cp -rf ../Inkscape.app "$TMPDIR"/ + +# link to Applications in order to drag and drop inkscape onto it. +ln -sf /Applications "$TMPDIR"/ + +# Copy a background image inside a hidden directory so the image +# file itself won't be shown. +mkdir "$TMPDIR/.background" +cp dmg_background.png "$TMPDIR/.background/background.png" + +# Copy the .DS_Store file which contains information about window size, +# appearance, etc. Most of this can be set with Apple script but involves +# user intervention so we just keep a copy of the correct settings and +# use that instead. +cp inkscape.ds_store "$TMPDIR/.DS_Store" + +# Create a new RW image from the temp directory. +rm -f "$RWNAME" +/usr/bin/hdiutil create -srcfolder "tmp-dmg" -volname "$VOLNAME" -fs HFS+ -fsargs "-c c=64,a=16,e=16" -format UDRW "$RWNAME" + +# We're finished with the temp directory, remove it. +rm -rf "$TMPDIR" + +# Mount the created image. +MOUNT_DIR="/Volumes/$VOLNAME" +DEV_NAME=`/usr/bin/hdiutil attach -readwrite -noverify -noautoopen "$RWNAME" | egrep '^/dev/' | sed 1q | awk '{print $1}'` + +# /usr/bin/osascript dmg_set_style.scpt + +# Have the disk image window open automatically when mounted. +bless -openfolder /Volumes/$VOLNAME + +# Unmount the disk image. +hdiutil detach "$DEV_NAME" + +# Create the offical release image by compressing the RW one. +DATE=`date "+%Y%m%d"` +/usr/bin/hdiutil convert "$RWNAME" -format UDZO -imagekey zlib-level=9 -o "../Inkscape_$DATE.dmg" +rm -f "$RWNAME" + diff --git a/packaging/osx-app.sh b/packaging/osx-app.sh index 2025c260b..51d970079 100755 --- a/packaging/osx-app.sh +++ b/packaging/osx-app.sh @@ -230,4 +230,5 @@ rsync -av $resdir/Resources/* $package/Contents/Resources/ # Make an image -/usr/bin/hdiutil create -srcfolder "$pkg.app" "$pkg.dmg" +#/usr/bin/hdiutil create -srcfolder "$pkg.app" "$pkg.dmg" +( cd macosx && ./osx-dmg.sh )