Windows installer: Detect Inkscape when installing

diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh
index b520c46d5d068445f00e3300ab8dad801a371791..0cb055f33bfd11dd398034d5b350d956b78efa31 100644 (file)
--- a/development/Win32/packaging/installer/include/detection.nsh
+++ b/development/Win32/packaging/installer/include/detection.nsh
@@ -10,6 +10,7 @@ Function SearchExternal
   Call SearchLaTeX
   Call SearchBibTeXEditor
   Call SearchGnumeric
+  Call SearchInkscape
 FunctionEnd
 
 #--------------------------------
@@ -135,3 +136,13 @@ Function SearchGnumeric
 
 FunctionEnd
 
+
+#--------------------------------
+# Inkscape
+
+Function SearchInkscape
+
+  ReadRegStr $PathInkscape HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Inkscape" "InstallLocation"
+  
+FunctionEnd
+

diff --git a/development/Win32/packaging/installer/include/variables.nsh b/development/Win32/packaging/installer/include/variables.nsh
index 821473b63bfa3629b55b1786e519c8d52f264ac4..51402c70ef4381c3003b71629dfdae47f676fdce 100644 (file)
--- a/development/Win32/packaging/installer/include/variables.nsh
+++ b/development/Win32/packaging/installer/include/variables.nsh
@@ -10,6 +10,7 @@ Var PathLaTeX
 Var PathLaTeXLocal
 Var PathBibTeXEditor
 Var PathGnumeric
+Var PathInkscape
 
 Var SetupLaTeX
 Var SizeLaTeX

diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index a134b1a73613bdadad264268c7db97f7b2239a94..bd1c439659a43aba67f90eec5732a32797d9088a 100644 (file)
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -97,6 +97,9 @@ Section -Configure
   ${If} $PathGnumeric != ""
     StrCpy $PathPrefix "$PathPrefix;$PathGnumeric"
   ${EndIf}
+  ${If} $PathInkscape != ""
+    StrCpy $PathPrefix "$PathPrefix;$PathInkscape"
+  ${EndIf}
 
   FileWrite $DistFile '\path_prefix "$PathPrefix"$\r$\n'
 

diff --git a/status.20x b/status.20x
index e9f97c6985e2ef121bff6913050fbc7a35840e1a..cdfee5128fc5874cc3238ef5620c9bed084957fd 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -245,3 +245,5 @@ What's new
 - Windows installer now detects Gnumeric which is needed for the
   spreadsheet external inset template (bug 7870).
 
+- Windows installer now detects Inkscape on installation.
+