[gedit/wip/wix] more stuff
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit/wip/wix] more stuff
- Date: Tue, 22 Dec 2015 11:36:49 +0000 (UTC)
commit 7cf72cd45ec0e2ca56a87928aa2cf2b373db7d87
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Tue Dec 22 12:34:36 2015 +0100
more stuff
win32/installer/gedit.wxs | 14 ++++++++------
win32/make-gedit-installer | 2 +-
2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/win32/installer/gedit.wxs b/win32/installer/gedit.wxs
index 352dfc2..11ed33a 100644
--- a/win32/installer/gedit.wxs
+++ b/win32/installer/gedit.wxs
@@ -10,6 +10,7 @@
<!-- Features -->
<Feature Id="gedit" Title="gedit" Level="1">
<ComponentGroupRef Id="binaries" />
+ <ComponentGroupRef Id="startMenuShortcuts" />
<ComponentGroupRef Id="licenseFiles" />
</Feature>
@@ -18,6 +19,10 @@
<WixVariable Id="WixUILicenseRtf" Value="$(var.LicenseFile)" />
<Condition Message="[ProductName] requires that your computer is running at least Windows
7">VersionNT>=601</Condition>
+ <UI>
+ <UIRef Id="WixUI_InstallDir" />
+ </UI>
+
<!-- Installer actions -->
<CustomAction Id="SetCompileSchemasCommand" Property="CompileSchemas"
Value=""[INSTALLDIR]\bin\glib-compile-schemas.exe"
"[INSTALLDIR]\share\glib-2.0\schemas""/>
<CustomAction Id="CompileSchemas" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="ignore"
Execute="deferred" Impersonate="no" />
@@ -45,7 +50,7 @@
</Directory>
</Directory>
<Directory Id="ProgramMenuFolder">
- <Directory Id="ProgramMenuDir" Name="gedit" />
+ <Directory Id="ProgramMenuDir" Name="gedit Text Editor" />
</Directory>
</Directory>
</Fragment>
@@ -53,12 +58,9 @@
<!-- Components -->
<Fragment>
<ComponentGroup Id="startMenuShortcuts">
- <Component Id="removeShortcut" Guid="{5FB5EA00-0995-49FC-A3E1-6DFBA2FFAA5F}"
Directory="ProgramMenuDir">
- <RegistryValue Key="Software\[Manufacturer]\[ProductName]" Root="HKCU" Type="string" Value="" />
- <RemoveFolder Id="ProgramMenuDir" On="uninstall" />
- </Component>
- <Component Id="programShortcuts" Guid="{A071C7AE-C657-4FAD-B0CC-11A6D794D0D3}"
Directory="ProgramMenuSubDir">
+ <Component Id="programShortcuts" Guid="{A071C7AE-C657-4FAD-B0CC-11A6D794D0D3}"
Directory="ProgramMenuDir">
<RegistryValue Key="Software\[Manufacturer]\[ProductName]" Root="HKCU" Type="string"
Value="[INSTALLDIR]" Name="InstallPath" />
+ <Shortcut Id="geditExec" Name="gedit Text Editor" Description="gedit Text Editor"
Target="[INSTALLDIR]\bin\gedit.exe" />
<Shortcut Id="uninstallProduct" Name="Uninstall gedit Text Editor" Arguments="/x [ProductCode]"
Description="Uninstall gedit Text Editor" Target="[System64Folder]msiexec.exe" />
<RemoveFolder Id="ProgramMenuDir" On="uninstall" />
</Component>
diff --git a/win32/make-gedit-installer b/win32/make-gedit-installer
index 5c4a28d..fdfc9d4 100644
--- a/win32/make-gedit-installer
+++ b/win32/make-gedit-installer
@@ -107,7 +107,7 @@ make_installer() {
pushd "installer" > /dev/null
"${_wixdir}/bin/heat.exe" dir SourceDir -gg -dr INSTALLDIR -cg binaries -sfrag -sreg -srd -suid -template
fragment -out binaries.wxs
"${_wixdir}/bin/candle.exe" gedit.wxs binaries.wxs
- "${_wixdir}/bin/light.exe" -ext WixUtilExtension gedit.wixobj binaries.wixobj -o "/tmp/${_filename}"
+ "${_wixdir}/bin/light.exe" -ext WixUtilExtension -ext WixUIExtension gedit.wixobj binaries.wixobj -o
"/tmp/${_filename}"
popd
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]