diff options
| author | Adib Taraben <theadib@gmail.com> | 2015-02-08 20:49:49 +0000 |
|---|---|---|
| committer | theAdib <theadib@gmail.com> | 2015-02-08 20:49:49 +0000 |
| commit | 8b45c167dd0dfcdd29e01cec37b59501836519d9 (patch) | |
| tree | 8c9ed5f2f3e667d6526237560407eea40881edd2 /packaging | |
| parent | Commenting dead assignments. (diff) | |
| download | inkscape-8b45c167dd0dfcdd29e01cec37b59501836519d9.tar.gz inkscape-8b45c167dd0dfcdd29e01cec37b59501836519d9.zip | |
win packaging, fix for 1418598, writing to wrong registry key, update .bat to current version of wix 3.9
(bzr r13910)
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/wix/inkscape.wxs | 4 | ||||
| -rw-r--r-- | packaging/wix/wixenv.bat | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packaging/wix/inkscape.wxs b/packaging/wix/inkscape.wxs index 6dbb6cdfc..fb5122cbd 100644 --- a/packaging/wix/inkscape.wxs +++ b/packaging/wix/inkscape.wxs @@ -22,7 +22,7 @@ Name="Inkscape Homepage"
Target="http://www.inkscape.org/"/>
<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
- <RegistryValue Root="HKCU" Key="Software\Microsoft\MyApplicationName" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+ <RegistryValue Root="HKCU" Key="Software\inkscape.org\Inkscape" Name="startmenu_installed" Type="integer" Value="1" KeyPath="yes"/>
</Component>
</DirectoryRef>
@@ -31,7 +31,7 @@ <!-- Shortcut Id="desktopFoobar10" Directory="DesktopFolder" Target="[INSTALLDIR]inkscape.exe" Name="$(var.FullProductName)" WorkingDirectory='INSTALLDIR' Icon="file_inkscape_exe" IconIndex="0" / -->
<Shortcut Id="desktopFoobar10" Directory="DesktopFolder" Target="[INSTALLDIR]inkscape.exe" Name="$(var.FullProductName)" WorkingDirectory='INSTALLDIR' />
<RemoveFolder Id="DesktopFolder" On="uninstall"/>
- <RegistryValue Root="HKCU" Key="Software\Microsoft\MyApplicationName" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+ <RegistryValue Root="HKCU" Key="Software\inkscape.org\Inkscape" Name="desktop_installed" Type="integer" Value="1" KeyPath="yes"/>
</Component>
</DirectoryRef>
diff --git a/packaging/wix/wixenv.bat b/packaging/wix/wixenv.bat index c798a9ce1..2cddd7146 100644 --- a/packaging/wix/wixenv.bat +++ b/packaging/wix/wixenv.bat @@ -5,12 +5,12 @@ ver | findstr /i "6\.1\." > nul IF %ERRORLEVEL% EQU 0 goto win7
@rem all other cases
-IF "%WIX_PATH%"=="" set WIX_PATH=C:\Programme\WiX Toolset v3.8\bin
+IF "%WIX_PATH%"=="" set WIX_PATH=C:\Programme\WiX Toolset v3.9\bin
IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs
goto setpath
:win7
-IF "%WIX_PATH%"=="" set WIX_PATH=C:\Program Files (x86)\WiX Toolset v3.8\bin
+IF "%WIX_PATH%"=="" set WIX_PATH=C:\Program Files (x86)\WiX Toolset v3.9\bin
IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs
:setpath
|