From d07a951b5a41e5f1f32226b38dfe912690b7ee1b Mon Sep 17 00:00:00 2001 From: dooglus Date: Fri, 6 Apr 2007 13:13:19 +0000 Subject: [PATCH] Apply 1695491: uninstall all pixmaps on Win32. Patch by Dmitriy Pomerantsev (Atrus) git-svn-id: http://svn.voria.com/code@437 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/Makefile.am | 5 ++++- synfig-studio/trunk/images/Makefile.am | 6 +++++- synfig-studio/trunk/win32inst.nsi.in | 12 +++++++++--- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/synfig-studio/trunk/Makefile.am b/synfig-studio/trunk/Makefile.am index 2e00b75..fa29cd2 100644 --- a/synfig-studio/trunk/Makefile.am +++ b/synfig-studio/trunk/Makefile.am @@ -87,8 +87,11 @@ win32inst.nsi: $(srcdir)/win32inst.nsi.in package-win32: all win32inst.nsi convert images/installer_logo.png bmp3:images/installer_logo.bmp - rm images/installer_logo*.png make -C images sif_icon.ico synfig_icon.ico + grep -v -e 'installer_logo' -e 'sif_icon' images/images.nsh >images/images.nsh.tmp + grep -v -e 'installer_logo' -e 'sif_icon' images/unimages.nsh >images/unimages.nsh.tmp + mv -f images/images.nsh.tmp images/images.nsh + mv -f images/unimages.nsh.tmp images/unimages.nsh makensis win32inst.nsi package-osx: all pkg-info/macosx/synfig-studio.info diff --git a/synfig-studio/trunk/images/Makefile.am b/synfig-studio/trunk/images/Makefile.am index 1fa8a9d..e78e5a7 100644 --- a/synfig-studio/trunk/images/Makefile.am +++ b/synfig-studio/trunk/images/Makefile.am @@ -5,7 +5,7 @@ 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 curves_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=installer_logo.$(EXT) installer_logo_osx.$(EXT) mirror_icon.$(EXT) time_track_icon.$(EXT) curves_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) +CLEANFILES=$(IMAGES) images.nsh unimages.nsh installer_logo.bmp sif_icon.ico synfig_icon.ico icons.nsh unicons.nsh imagedir=@imagedir@ @@ -25,6 +25,8 @@ PNGTOICO=png2ico cp -f `which $(PNGTOICO)`.* ./ $(PNGTOICO) $@ $*-16x16.png $*-32x32.png $*-48x48.png $*-64x64.png rm -f ./$(PNGTOICO).* $*-16x16.png $*-32x32.png $*-48x48.png $*-64x64.png + echo " File \"images\\$@\"" >>./icons.nsh + echo " Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unicons.nsh clean: $(RM) $(CLEANFILES) @@ -34,6 +36,8 @@ clean: .sif.$(EXT): $(SYNFIG) -q $< -o $@ --time 0 + echo " File \"images\\$@\"" >>./images.nsh + echo " Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh keyframe_lock_all.$(EXT): $(srcdir)/keyframe_lock_icon.sif $(SYNFIG) -q $< -o $@ --time 0 diff --git a/synfig-studio/trunk/win32inst.nsi.in b/synfig-studio/trunk/win32inst.nsi.in index bf90172..e8e1e0d 100644 --- a/synfig-studio/trunk/win32inst.nsi.in +++ b/synfig-studio/trunk/win32inst.nsi.in @@ -57,10 +57,10 @@ Section "Synfig Studio" SectionIn RO SetOutPath "$INSTDIR\share\pixmaps" - File "images\*.png" + !include "images\images.nsh" SetOutPath "$INSTDIR\share\pixmaps" - File "images\*.ico" + !include "images\icons.nsh" SetOutPath "$INSTDIR\bin" File "src\synfigapp\.libs\libsynfigapp-0.dll" @@ -131,11 +131,17 @@ Section "Uninstall" DeleteRegKey HKLM "${PRODUCT_REG_KEY}" DeleteRegKey HKLM "${PRODUCT_UNINSTALL_KEY}" + ; Remove images and icons + !include "images\unimages.nsh" + !include "images\unicons.nsh" + RMDir "$INSTDIR\share\pixmaps" + RMDir "$INSTDIR\share" + ; Remove files and uninstaller Delete "$INSTDIR\${PRODUCT_UNINSTALL_EXE}" Delete $INSTDIR\bin\synfigstudio.exe Delete $INSTDIR\bin\libsynfigapp-0.dll - RMDir $INSTDIR\bin + RMDir "$INSTDIR\bin" ; Remove shortcuts, if any Delete "$SMPROGRAMS\Voria\Uninstall Synfig Studio.lnk" -- 2.7.4