[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] master 3c1e5bc: ADDED user manual to wind
|
From: |
Kai Sterker |
|
Subject: |
[adonthell-wastesedge-commits] master 3c1e5bc: ADDED user manual to windows installer |
|
Date: |
Sat, 24 Sep 2016 19:29:09 +0000 (UTC) |
branch: master
commit 3c1e5bc91bd65fa90e092336fee5e7c02b0bb9b8
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>
ADDED user manual to windows installer
---
.gitignore | 1 +
win32/make_msi.sh | 17 +++--
win32/wastesedge.wxs | 188 +++++++++++++++++++++++++++-----------------------
3 files changed, 116 insertions(+), 90 deletions(-)
diff --git a/.gitignore b/.gitignore
index 0a50aae..a2a14d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
Makefile.in
Makefile
POTFILES
+User\ Manual.pdf
aclocal.m4
config.cache
config.log
diff --git a/win32/make_msi.sh b/win32/make_msi.sh
index 4349f61..14b60ab 100755
--- a/win32/make_msi.sh
+++ b/win32/make_msi.sh
@@ -1,6 +1,5 @@
#!/bin/sh
-# -- determine installer architecture (x64 or x86)
adonthell_exe="adonthell-0.3.exe"
# -- check arg
@@ -14,7 +13,7 @@ if test ! -f $1"/bin/$adonthell_exe" ; then
exit 1
fi
-# -- get platform
+# -- determine installer architecture (x64 or x86)
arch=`file $1"/bin/$adonthell_exe" | grep -o -e x86-64 -e 80386`
case $arch in
x86-64)
@@ -53,9 +52,17 @@ fi
echo "Creating wastesedge-$adonthell_ver-$arch.msi"
+# -- check if the User Manual.pdf is present
+if [ ! -f "../User\ Manual.pdf" ]; then
+ manual=1
+else
+ echo "PDF Manual not present. Will not be included in installer."
+ manual=0
+fi
+
# -- clean up any __pycache__ directories before collecting package contents
find $1 -name __pycache__ -execdir rm -rf __pycache__ \;
-
+
# -- collect package contents
heat dir "$1" -cg WastesedgePackage -dr INSTALLDIR -gg -sfrag -srd -sw5150
-template fragment -out package.wxs
if [ $? -ne 0 ]; then
@@ -63,7 +70,7 @@ if [ $? -ne 0 ]; then
fi
# -- compile
-candle -arch $arch -dVersion="$adonthell_ver" -dArch="$arch" wastesedge.wxs
package.wxs
+candle -arch $arch -dVersion="$adonthell_ver" -dArch="$arch"
-dHaveManual="$manual" wastesedge.wxs package.wxs
if [ $? -ne 0 ]; then
exit 1
fi
@@ -77,7 +84,7 @@ fi
# -- codesign installer
if [ -x "$(command -v signtool)" ]; then
echo "Codesigning wastesedge-$adonthell_ver-$arch.msi"
- MSYS2_ARG_CONV_EXCL=/t signtool.exe sign /t
http://timestamp.comodoca.com/authenticode wastesedge-$adonthell_ver-$arch.msi
+ MSYS2_ARG_CONV_EXCL="/d;/t" signtool.exe sign /t
http://timestamp.comodoca.com/authenticode /d "Adonthell - Waste's Edge
v$adonthell_ver ($arch)" wastesedge-$adonthell_ver-$arch.msi
fi
# -- cleanup
diff --git a/win32/wastesedge.wxs b/win32/wastesedge.wxs
index a25c8aa..cfe6911 100644
--- a/win32/wastesedge.wxs
+++ b/win32/wastesedge.wxs
@@ -1,109 +1,127 @@
<?xml version='1.0' encoding='windows-1252'?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
- <?if $(var.Arch) = x64 ?>
- <?define ProgramFiles = "ProgramFiles64Folder" ?>
- <?else ?>
- <?define ProgramFiles = "ProgramFilesFolder" ?>
- <?endif ?>
- <Product Name="Adonthell - Waste's Edge"
- Manufacturer='The Adonthell Team'
- Id='*'
+ <?if $(var.Arch) = x64 ?>
+ <?define ProgramFiles = "ProgramFiles64Folder" ?>
+ <?else ?>
+ <?define ProgramFiles = "ProgramFilesFolder" ?>
+ <?endif ?>
+ <Product Name="Adonthell - Waste's Edge"
+ Manufacturer='The Adonthell Team'
+ Id='*'
UpgradeCode='9EC3DA40-20DB-4892-8EE9-0B04207B0EE5'
- Language='1033'
- Codepage='1252'
+ Language='1033'
+ Codepage='1252'
Version='$(var.Version)'>
- <Package
- Id='*'
- Keywords='Installer'
- Platform="$(var.Arch)"
- Description="Adonthell Waste's Edge $(var.Version) Installer"
- Comments='� 2016 The Adonthell Team'
+ <Package
+ Id='*'
+ Keywords='Installer'
+ Platform="$(var.Arch)"
+ Description="Adonthell Waste's Edge $(var.Version) Installer"
+ Comments='� 2016 The Adonthell Team'
Manufacturer='The Adonthell Team'
- InstallerVersion='200'
- Languages='1033'
- Compressed='yes'
+ InstallerVersion='200'
+ Languages='1033'
+ Compressed='yes'
SummaryCodepage='1252' />
- <MajorUpgrade
- AllowSameVersionUpgrades="yes"
+ <MajorUpgrade
+ AllowSameVersionUpgrades="yes"
DowngradeErrorMessage="A newer version of [ProductName] is already
installed. If you are sure you want to downgrade, remove the existing
installation via Programs and Features." />
<Media Id='1' Cabinet='Wastesedge.cab' EmbedCab='yes' />
- <Icon Id="wastesedge.ico" SourceFile="SourceDir\bin\wastesedge.ico"/>
- <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch
Adonthell - Waste's Edge." />
- <Property Id="ARPPRODUCTICON" Value="wastesedge.ico" />
+ <Icon Id="wastesedge.ico" SourceFile="SourceDir\bin\wastesedge.ico"/>
+ <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch
Adonthell - Waste's Edge." />
+ <Property Id="ARPPRODUCTICON" Value="wastesedge.ico" />
<Directory Id='TARGETDIR' Name='SourceDir'>
- <Directory Id='$(var.ProgramFiles)' Name='PFiles'>
- <Directory Id='Adonthell' Name='Adonthell'>
- <Directory Id='INSTALLDIR' Name='Wastesedge' />
+ <Directory Id='$(var.ProgramFiles)' Name='PFiles'>
+ <Directory Id='Adonthell' Name='Adonthell'>
+ <Directory Id='INSTALLDIR' Name='Wastesedge' >
+ <?if $(var.HaveManual) = 1 ?>
+ <Component Id='Manual' Guid='*'>
+ <File Id='Manual' Name='User Manual.pdf'
DiskId='1' Source='..\User Manual.pdf' KeyPath='yes'>
+ <Shortcut Id="startmenuManual"
Directory="ProgramMenuDir" Name="User Manual" Advertise="yes" />
+ </File>
+ </Component>
+ <?endif ?>
+ </Directory>
</Directory>
</Directory>
<Directory Id="ProgramMenuFolder" Name="Programs">
<Directory Id="ProgramMenuDir" Name="Adonthell">
<Component Id="ProgramMenuIcon" Guid="*">
- <Shortcut Id="startmenuShortcut"
- Directory="ProgramMenuDir"
- Name="Waste's Edge"
-
Target="[INSTALLDIR]bin\adonthell-0.3.exe"
- Arguments="wastesedge"
- WorkingDirectory='INSTALLDIR'
- Icon="wastesedge.ico"
- IconIndex="0"
- Advertise="no" />
+ <Shortcut Id="startmenuShortcut"
+ Directory="ProgramMenuDir"
+ Name="Waste's Edge"
+ Target="[INSTALLDIR]bin\adonthell-0.3.exe"
+ Arguments="wastesedge"
+ WorkingDirectory='INSTALLDIR'
+ Icon="wastesedge.ico"
+ IconIndex="0"
+ Advertise="no" />
<RemoveFolder Id='ProgramMenuDir' On='uninstall' />
<RegistryValue Root='HKCU'
Key='Software\[Manufacturer]\[ProductName]' Name='startmenuShortcut'
Type='string' Value='' KeyPath='yes' />
</Component>
</Directory>
- </Directory>
+ </Directory>
<Directory Id="DesktopFolder" Name="Desktop">
- <Component Id='DesktopIcon' Guid='*'>
- <Shortcut Id="desktopShortcut"
- Directory="DesktopFolder"
- Name="Adonthell - Waste's Edge"
-
Target="[INSTALLDIR]bin\adonthell-0.3.exe"
- Arguments="wastesedge"
- WorkingDirectory='INSTALLDIR'
- Icon="wastesedge.ico"
- IconIndex="0"
- Advertise="no" />
+ <Component Id='DesktopIcon' Guid='*'>
+ <Shortcut Id="desktopShortcut"
+ Directory="DesktopFolder"
+ Name="Adonthell - Waste's Edge"
+ Target="[INSTALLDIR]bin\adonthell-0.3.exe"
+ Arguments="wastesedge"
+ WorkingDirectory='INSTALLDIR'
+ Icon="wastesedge.ico"
+ IconIndex="0"
+ Advertise="no" />
<RegistryValue Root='HKCU'
Key='Software\[Manufacturer]\[ProductName]' Name='desktopShortcut'
Type='string' Value='' KeyPath='yes' />
</Component>
</Directory>
</Directory>
- <Feature Id='Program'
- Level='1'
- Title="Adonthell - Waste's Edge"
- Description='Install program and data files'
- Absent='disallow'
- AllowAdvertise='no'
- ConfigurableDirectory='INSTALLDIR'>
- <ComponentGroupRef Id='WastesedgePackage' />
- <ComponentRef Id='ProgramMenuIcon' />
- </Feature>
- <Feature Id='DesktopIcon'
- Level='2'
- Title='Desktop Shortcut'
- Description='Create desktop shortcut'
- Absent='allow'
- AllowAdvertise='no'>
- <ComponentRef Id='DesktopIcon' />
- </Feature>
- <UI>
- <UIRef Id="WixUI_FeatureTree" />
- <Publish Dialog="WelcomeDlg"
- Control="Next"
- Event="NewDialog"
- Value="CustomizeDlg"
- Order="2">1</Publish>
- <Publish Dialog="CustomizeDlg"
- Control="Back"
- Event="NewDialog"
- Value="WelcomeDlg"
- Order="3">NOT Installed</Publish>
- <Publish Dialog="ExitDialog"
- Control="Finish"
- Order="1"
- Event="DoAction"
-
Value="StartAppOnExit">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT
Installed</Publish>
- </UI>
- <CustomAction Id="StartAppOnExit" Directory="INSTALLDIR"
ExeCommand="[INSTALLDIR]bin\adonthell-0.3.exe wastesedge" Execute="immediate"
Impersonate="yes" Return="asyncNoWait" />
- </Product>
+ <Feature Id='Program'
+ Level='1'
+ Title="Adonthell - Waste's Edge"
+ Description='Install program and data files'
+ Absent='disallow'
+ AllowAdvertise='no'
+ ConfigurableDirectory='INSTALLDIR'>
+ <ComponentGroupRef Id='WastesedgePackage' />
+ <ComponentRef Id='ProgramMenuIcon' />
+ <?if $(var.HaveManual) = 1 ?>
+ <Feature Id='UserManual'
+ Level='1'
+ Title='User Manual'
+ Description='Install the documentation'
+ Absent='allow'
+ AllowAdvertise='no'>
+ <ComponentRef Id='Manual' />
+ </Feature>
+ <?endif ?>
+ </Feature>
+ <Feature Id='DesktopIcon'
+ Level='2'
+ Title='Desktop Shortcut'
+ Description='Create desktop shortcut'
+ Absent='allow'
+ AllowAdvertise='no'>
+ <ComponentRef Id='DesktopIcon' />
+ </Feature>
+ <UI>
+ <UIRef Id="WixUI_FeatureTree" />
+ <Publish Dialog="WelcomeDlg"
+ Control="Next"
+ Event="NewDialog"
+ Value="CustomizeDlg"
+ Order="2">1</Publish>
+ <Publish Dialog="CustomizeDlg"
+ Control="Back"
+ Event="NewDialog"
+ Value="WelcomeDlg"
+ Order="3">NOT Installed</Publish>
+ <Publish Dialog="ExitDialog"
+ Control="Finish"
+ Order="1"
+ Event="DoAction"
+ Value="StartAppOnExit">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT
AND NOT Installed</Publish>
+ </UI>
+ <CustomAction Id="StartAppOnExit" Directory="INSTALLDIR"
ExeCommand="[INSTALLDIR]bin\adonthell-0.3.exe wastesedge" Execute="immediate"
Impersonate="yes" Return="asyncNoWait" />
+ </Product>
</Wix>
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [adonthell-wastesedge-commits] master 3c1e5bc: ADDED user manual to windows installer,
Kai Sterker <=