argh

git-svn-id: http://svn.voria.com/code@61 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-studio/trunk/Makefile.am b/synfig-studio/trunk/Makefile.am
index b7c541b..d0e25d0 100644 (file)
--- a/synfig-studio/trunk/Makefile.am
+++ b/synfig-studio/trunk/Makefile.am
@@ -6,7 +6,7 @@ MAINTAINERCLEANFILES=config/ltmain.sh config/config.guess config/config.sub conf
 
 SUBDIRS=src images
 
-EXTRA_DIST=COPYING TODO config/subs.m4 macosxbuild.sh win32build.sh win32inst.nsi.in bootstrap config/package config/depcomp config/cxx_macros.m4 @PACKAGE_TARNAME@-@VERSION@.spec config/project.spec.in config/build.cfg config/ETL.m4
+EXTRA_DIST=COPYING TODO pkg-info/macosx/studio-resources/InstallationCheck config/subs.m4 macosxbuild.sh win32build.sh win32inst.nsi.in bootstrap config/package config/depcomp config/cxx_macros.m4 @PACKAGE_TARNAME@-@VERSION@.spec config/project.spec.in config/build.cfg config/ETL.m4
 
 # Desktop entry
 #desktopdir              = $(datadir)/gnome/apps/Graphics
@@ -80,6 +80,7 @@ package-win32: all win32inst.nsi
 
 package-osx: all pkg-info/macosx/synfig-studio.info
        [ -d pkg_root ] && $(RMDIR) pkg_root || true
+       convert images/installer_logo_osx.png $(srcdir)/pkg-info/macosx/studio-resources/background.tif
        make install prefix="`pwd`/pkg_root"
        $(srcdir)/config/package pkg_root pkg-info/macosx/synfig-studio.info -r $(srcdir)/pkg-info/macosx/studio-resources
 if WIN32_PKG   

diff --git a/synfig-studio/trunk/config/package b/synfig-studio/trunk/config/package
index ae31c14..28b7896 100755 (executable)
--- a/synfig-studio/trunk/config/package
+++ b/synfig-studio/trunk/config/package
@@ -217,13 +217,14 @@ if ( $?resDir ) then
     pushd $resDir > /dev/null
        # get lists of resources. We'll want to change
        # permissions on just these things later.
-        set directoriesInResDir = `find . -type d | grep -v -e .svn -e CVS`
-        set filesInResDir = `find . -type f`
+        set directoriesInResDir = `find . -type d | grep -v -e svn -e CVS`
+        set filesInResDir = `find . -type f | grep -v -e svn -e CVS`
     popd > /dev/null
 
     # copy the resource directory contents into the package directory
-    foreach resFile (`cd $resDir && find . | grep -v -e .svn -e CVS`)
-       cp -r "$resDir/$resFile" "$pkg/Contents/Resources"
+    foreach resFile (`cd $resDir && find . | grep -v svn`)
+
+       cp -fr "$resDir/$resFile" "$pkg/Contents/Resources"
     end
 
     pushd $pkg/Contents/Resources > /dev/null

diff --git a/synfig-studio/trunk/images/Makefile.am b/synfig-studio/trunk/images/Makefile.am
index a3aad18..7ad5eb8 100644 (file)
--- a/synfig-studio/trunk/images/Makefile.am
+++ b/synfig-studio/trunk/images/Makefile.am
@@ -3,7 +3,7 @@ SYNFIG=synfig
 EXT=@imageext@
 
 EXTRA_DIST=installer_logo.sif installer_logo_osx.sif about_dialog.sif about_icon.sif angle_icon.sif bline_icon.sif blinepoint_icon.sif bool_icon.sif canvas_icon.sif canvas_pointer_icon.sif children_icon.sif circle_icon.sif clear_redo_icon.sif clear_undo_icon.sif color_icon.sif draw_icon.sif duplicate_icon.sif eyedrop_icon.sif fill_icon.sif gradient_icon.sif group_icon.sif info_icon.sif integer_icon.sif keyframe_icon.sif keyframe_lock_icon.sif layer_icon.sif list_icon.sif logo.sif meta_data_icon.sif mirror_icon.sif navigator_icon.sif normal_icon.sif pastecanvas_icon.sif polygon_icon.sif real_icon.sif rectangle_icon.sif rotate_icon.sif saveall_icon.sif scale_icon.sif segment_icon.sif sif_icon.sif sketch_icon.sif smooth_move_icon.sif string_icon.sif swap_colors_icon.sif synfig_icon.sif time_track_icon.sif valuenode_icon.sif vector_icon.sif wallpaper.sif width_icon.sif zoom_icon.sif
-IMAGES=mirror_icon.$(EXT) time_track_icon.$(EXT) pastecanvas_icon.$(EXT) group_icon.$(EXT) clear_redo_icon.$(EXT) clear_undo_icon.$(EXT) navigator_icon.$(EXT) info_icon.$(EXT) zoom_icon.$(EXT) meta_data_icon.$(EXT) children_icon.$(EXT) keyframe_icon.$(EXT) swap_colors_icon.$(EXT) rotate_icon.$(EXT) scale_icon.$(EXT) smooth_move_icon.$(EXT) width_icon.$(EXT) rectangle_icon.$(EXT) circle_icon.$(EXT) draw_icon.$(EXT) sketch_icon.$(EXT) fill_icon.$(EXT) normal_icon.$(EXT) sif_icon.$(EXT) synfig_icon.$(EXT) saveall_icon.$(EXT) bool_icon.$(EXT) integer_icon.$(EXT) angle_icon.$(EXT) segment_icon.$(EXT) blinepoint_icon.$(EXT) list_icon.$(EXT) canvas_pointer_icon.$(EXT) string_icon.$(EXT) eyedrop_icon.$(EXT) about_icon.$(EXT) about_dialog.$(EXT) canvas_icon.$(EXT) vector_icon.$(EXT) real_icon.$(EXT) color_icon.$(EXT) valuenode_icon.$(EXT) polygon_icon.$(EXT) bline_icon.$(EXT) layer_icon.$(EXT) duplicate_icon.$(EXT) gradient_icon.$(EXT) keyframe_lock_all.$(EXT) keyframe_lock_past.$(EXT) keyframe_lock_future.$(EXT) keyframe_lock_none.$(EXT)
+IMAGES=installer_logo.$(EXT) installer_logo_osx.$(EXT) mirror_icon.$(EXT) time_track_icon.$(EXT) pastecanvas_icon.$(EXT) group_icon.$(EXT) clear_redo_icon.$(EXT) clear_undo_icon.$(EXT) navigator_icon.$(EXT) info_icon.$(EXT) zoom_icon.$(EXT) meta_data_icon.$(EXT) children_icon.$(EXT) keyframe_icon.$(EXT) swap_colors_icon.$(EXT) rotate_icon.$(EXT) scale_icon.$(EXT) smooth_move_icon.$(EXT) width_icon.$(EXT) rectangle_icon.$(EXT) circle_icon.$(EXT) draw_icon.$(EXT) sketch_icon.$(EXT) fill_icon.$(EXT) normal_icon.$(EXT) sif_icon.$(EXT) synfig_icon.$(EXT) saveall_icon.$(EXT) bool_icon.$(EXT) integer_icon.$(EXT) angle_icon.$(EXT) segment_icon.$(EXT) blinepoint_icon.$(EXT) list_icon.$(EXT) canvas_pointer_icon.$(EXT) string_icon.$(EXT) eyedrop_icon.$(EXT) about_icon.$(EXT) about_dialog.$(EXT) canvas_icon.$(EXT) vector_icon.$(EXT) real_icon.$(EXT) color_icon.$(EXT) valuenode_icon.$(EXT) polygon_icon.$(EXT) bline_icon.$(EXT) layer_icon.$(EXT) duplicate_icon.$(EXT) gradient_icon.$(EXT) keyframe_lock_all.$(EXT) keyframe_lock_past.$(EXT) keyframe_lock_future.$(EXT) keyframe_lock_none.$(EXT)
 
 CLEANFILES=$(IMAGES)
 

diff --git a/synfig-studio/trunk/pkg-info/macosx/studio-resources/Description.plist b/synfig-studio/trunk/pkg-info/macosx/studio-resources/Description.plist
new file mode 100644 (file)
index 0000000..2fb0360
--- /dev/null
+++ b/synfig-studio/trunk/pkg-info/macosx/studio-resources/Description.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>IFPkgFlagBackgroundScaling</key>
+    <string>none</string>
+</dict>
+</plist>
\ No newline at end of file

diff --git a/synfig-studio/trunk/pkg-info/macosx/studio-resources/English.lproj/InstallationCheck.strings b/synfig-studio/trunk/pkg-info/macosx/studio-resources/English.lproj/InstallationCheck.strings
new file mode 100644 (file)
index 0000000..1bde3de
--- /dev/null
+++ b/synfig-studio/trunk/pkg-info/macosx/studio-resources/English.lproj/InstallationCheck.strings
@@ -0,0 +1,2 @@
+"16" = "Synfig Studio requires GTKMM 2.4, which was not found on your computer."
+"17" = "Synfig Studio requires Synfig Core, which was not found on your computer."

diff --git a/synfig-studio/trunk/win32inst.nsi.in b/synfig-studio/trunk/win32inst.nsi.in
index fc95173..ab9f423 100644 (file)
--- a/synfig-studio/trunk/win32inst.nsi.in
+++ b/synfig-studio/trunk/win32inst.nsi.in
@@ -33,7 +33,7 @@ InstallDirRegKey HKLM "Software\Voria_@PACKAGE_TARNAME@" "Install_Dir"
 
 ;--------------------------------
 
-!define MUI_WELCOMEFINISHPAGE_BITMAP "images\installer_logo.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP ".\images\installer_logo.bmp"
 
 ; Pages