From: Carlos Lopez <genetita@gmail.com>
Date: Mon, 31 Aug 2009 16:06:35 +0000 (+0200)
Subject: Merge branch 'pixelgeek_windows_script_update'
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=dd99cad772872f5653d755c20d47d624a1f2450b;hp=e062ea8b06415d37bbd3bb2b663a46f924e062f4;p=synfig.git

Merge branch 'pixelgeek_windows_script_update'
---

diff --git a/synfig-core/win32inst.nsi.in b/synfig-core/win32inst.nsi.in
index 172cfbb..e22ae0b 100644
--- a/synfig-core/win32inst.nsi.in
+++ b/synfig-core/win32inst.nsi.in
@@ -90,8 +90,8 @@ SectionEnd
 Section "Start Menu Shortcuts"
 
   SetShellVarContext All
-  CreateDirectory "$SMPROGRAMS\Voria"
-  CreateShortCut "$SMPROGRAMS\Voria\Uninstall Synfig Core.lnk" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" "" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" 0
+  CreateDirectory "$SMPROGRAMS\Synfig"
+  CreateShortCut "$SMPROGRAMS\Synfig\Uninstall Synfig Core.lnk" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" "" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" 0
   
 SectionEnd
 
@@ -119,8 +119,8 @@ Section "un.Start Menu Shortcuts"
 
   ; Remove shortcuts, if any
   SetShellVarContext All
-  Delete "$SMPROGRAMS\Voria\Uninstall Synfig Core.lnk"
-  RMDir "$SMPROGRAMS\Voria"
+  Delete "$SMPROGRAMS\Synfig\Uninstall Synfig Core.lnk"
+  RMDir "$SMPROGRAMS\Synfig"
 
 SectionEnd
 
@@ -132,8 +132,8 @@ Section "Examples"
 	File "@srcdir@\examples\*.sifz"
 
 	SetShellVarContext All
-	CreateDirectory "$SMPROGRAMS\Voria"
-	CreateShortCut "$SMPROGRAMS\Voria\Examples.lnk" "$INSTDIR\examples" "" "$INSTDIR\examples" 0
+	CreateDirectory "$SMPROGRAMS\Synfig"
+	CreateShortCut "$SMPROGRAMS\Synfig\Examples.lnk" "$INSTDIR\examples" "" "$INSTDIR\examples" 0
 SectionEnd
 
 Section "un.Examples"
@@ -141,8 +141,8 @@ Section "un.Examples"
 	RMDir "$INSTDIR\examples"
 
 	SetShellVarContext All
-	Delete "$SMPROGRAMS\Voria\Examples.lnk"
-	RMDir "$SMPROGRAMS\Voria"
+	Delete "$SMPROGRAMS\Synfig\Examples.lnk"
+	RMDir "$SMPROGRAMS\Synfig"
 SectionEnd
 
 SectionGroup "PlugIns"
@@ -153,6 +153,7 @@ SectionGroup "Layers"
 !include "@srcdir@\src\modules\mod_noise\mod_noise.nsh"
 !include "@srcdir@\src\modules\mod_particle\mod_particle.nsh"
 !include "@srcdir@\src\modules\mod_geometry\mod_geometry.nsh"
+!include "@srcdir@\src\modules\mod_svg\mod_svg.nsh"
 !include "@srcdir@\src\modules\lyr_freetype\lyr_freetype.nsh"
 SectionGroupEnd
 SectionGroup "Render Targets"
@@ -178,6 +179,7 @@ SectionGroup "un.Layers"
 !include "@srcdir@\src\modules\mod_noise\unmod_noise.nsh"
 !include "@srcdir@\src\modules\mod_particle\unmod_particle.nsh"
 !include "@srcdir@\src\modules\mod_geometry\unmod_geometry.nsh"
+!include "@srcdir@\src\modules\mod_svg\unmod_svg.nsh"
 SectionGroupEnd
 SectionGroup "un.Render Targets"
 !include "@srcdir@\src\modules\mod_bmp\unmod_bmp.nsh"
diff --git a/synfig-studio/win32inst.nsi.in b/synfig-studio/win32inst.nsi.in
index e13fda1..a2aa784 100644
--- a/synfig-studio/win32inst.nsi.in
+++ b/synfig-studio/win32inst.nsi.in
@@ -105,9 +105,9 @@ SectionEnd
 Section "Start Menu Shortcuts"
 
   SetShellVarContext All
-  CreateDirectory "$SMPROGRAMS\Voria"
-  CreateShortCut "$SMPROGRAMS\Voria\Uninstall Synfig Studio.lnk" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" "" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" 0
-  CreateShortCut "$SMPROGRAMS\Voria\Synfig Studio.lnk" "$INSTDIR\bin\synfigstudio.exe" "" "$INSTDIR\share\pixmaps\synfig_icon.ico" 0
+  CreateDirectory "$SMPROGRAMS\Synfig"
+  CreateShortCut "$SMPROGRAMS\Synfig\Uninstall Synfig Studio.lnk" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" "" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" 0
+  CreateShortCut "$SMPROGRAMS\Synfig\Synfig Studio.lnk" "$INSTDIR\bin\synfigstudio.exe" "" "$INSTDIR\share\pixmaps\synfig_icon.ico" 0
   
 SectionEnd
 
@@ -142,11 +142,11 @@ Section "Uninstall"
 
   ; Remove shortcuts, if any
   SetShellVarContext All
-  Delete "$SMPROGRAMS\Voria\Uninstall Synfig Studio.lnk"
-  Delete "$SMPROGRAMS\Voria\Synfig Studio.lnk"
+  Delete "$SMPROGRAMS\Synfig\Uninstall Synfig Studio.lnk"
+  Delete "$SMPROGRAMS\Synfig\Synfig Studio.lnk"
 
   ; Remove directories used
-  RMDir "$SMPROGRAMS\Voria"
+  RMDir "$SMPROGRAMS\Synfig"
   RMDir "$INSTDIR"
 
 	System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'