[adonthell-wastesedge-commits] master 73a131a 16/21: ADDED script to create .msi installer using the WIX toolset

[Kai Sterker]

branch: master
commit 73a131a77c3070072d75ae192da3b1203cf00742
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>

    ADDED script to create .msi installer using the WIX toolset
    REMOVED nsis installer related files
    REMOVED BeOS related files
---
 Makefile.am              |    4 +-
 beos/INSTALL             |   36 -----------
 beos/README              |  155 ----------------------------------------------
 beos/install-adonthell   |   54 ----------------
 beos/uninstall-adonthell |   25 --------
 beos/wastesedge.rsrc     |  Bin 4222 -> 0 bytes
 win32/make_msi.sh        |   52 ++++++++++++++++
 win32/prepare.bat        |   43 -------------
 win32/site.py            |   24 -------
 win32/wastesedge-x64.wxs |   71 +++++++++++++++++++++
 win32/wastesedge.nsi     |  139 -----------------------------------------
 11 files changed, 125 insertions(+), 478 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 39de8a9..d2af018 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,8 +11,8 @@ EXTRA_DIST = config.rpath mkinstalldirs  config.rpath  
$(pkgdata_DATA) PLAYING a
        debian/README.debian debian/adonthell-wastesedge.6 debian/changelog \
        debian/control debian/copyright debian/dirs debian/rules debian/menu \
        debian/compat debian/docs wastesedge.spec.in wastesedge.spec 
wastesedge.desktop.in \
-       win32/COPYING win32/PLAYING.txt win32/prepare.bat win32/README.txt \
-       win32/wastesedge.ico win32/wastesedge.nsi \
+       win32/COPYING win32/PLAYING.txt win32/make_msi.sh win32/README.txt \
+       win32/wastesedge.ico win32/wastesedge-x64.wxs \
        osx/Copying.html osx/Install.html osx/Playing.html osx/ReadMe.html \
        osx/adonthell.icns make_bundle.sh make_windows_pkg.sh
 
diff --git a/beos/INSTALL b/beos/INSTALL
deleted file mode 100644
index c1fbad3..0000000
--- a/beos/INSTALL
+++ /dev/null
@@ -1,36 +0,0 @@
-This file describes how to install the binary release of Adonthell -
-Waste's Edge for Beos 5 (x86).
-
-Requirements:
-=============
-
-Adonthell requires Python 2.2 to be installed. Otherwise it won't run.
-You can get it at BeBits:
-
-       http://www.bebits.com/app/2206
-
-
-Installation:
-=============
-
-Once Python is installed, open a Terminal and change into the 
-wastesedge-0.3.3 directory. In there, execute
-
-       install-adonthell
-       
-That's it. Now you'll find shortcuts to Waste's Edge on your Desktop
-and your Application menu. Use either of them to launch it.
-
-Note that if you move the wastesedge-0.3.3 directory after the 
-installation, you'll have to rerun install-adonthell.
-
-
-If you'd rather run Waste's Edge from a Terminal, enter
-
-       adonthell wastesedge
-
-
-To finally remove Adonthell, run the script called uninstall-adonthell.
-It will remove those shortcuts from Desktop and Application menu. 
-Afterwards you can manually delete the wastesedge-0.3.3 directory.
-
diff --git a/beos/README b/beos/README
deleted file mode 100644
index 6590f0d..0000000
--- a/beos/README
+++ /dev/null
@@ -1,155 +0,0 @@
-
-
-                             Adonthell 0.3 
-                           
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    COPYING file for more details.
-
-
-
-Installation:
-=============
-
-See the INSTALL file for details.
-
-
-Configuring Adonthell:
-======================
-
-The first time you run Adonthell, a configuration file is created 
-inside the wastesedge-0.3.3 directory. Edit it to customise the game 
-to your convenience.
-
-The available options and what they do are:
-
-- Screen-mode
-  Whether Adonthell should run fullscreen or in windowed mode 
-  0 = Windowed mode, 1 = Fullscreen mode
-  
-  Due to a bug in SDL, you'll have to switch manually to 640x480 before
-  starting Adonthell in Fullscreen mode.
-  
-- Double-size
-  Whether resolution should be scaled to 640x480 or not
-  0 = disable, 1 = enable
-
-  You should leave that set to 1 on BeOS.  
-
-- Language [locale]
-  Specifies which language to use. As long as this option is unset,
-  the language is determined by one of the following environment
-  variables: LANG, LC_ALL or LC_MESSAGES. Once the option is set,
-  it overrides any environment variable. For a listing of valid
-  locale strings, run 'locale -a'.
-  
-  Of course, the game you run has to provide the translation you 
-  chose here, otherwise you'll get the default (i.e. English) text.
-
-  Note that NLS support isn't in the BeOS version. This option is
-  therefore useless.
-
-- Quick-load
-  Whether the last saved game should be automatically continued at
-  startup. Only works if at least one saved game exists.
-  0 = disable, 1 = enable
-
-- Audio-channels
-  Whether sound should be mono or stereo
-  0 = Mono, 1 = Stereo
-
-- Audio-resolution
-  Whether audio output should be 8 or 16 bit
-  0 = 8 bit, 1 = 16 bit
-
-- Audio-sample-rate
-  0 = 11025 Hz, 1 = 22050 Hz, 2 = 44100 Hz
-
-- Audio-volume
-  The mixer setting, 0 - 100 %
-  
-  (Note that a value of 0 will turn audio completely off)
-
-
-Running Adonthell:
-==================
-
-Okay, now you're ready to launch the program. If you have chosen to
-install the game, you can start it via the Desktop and Application
-menu shortcuts. Otherwise, you'll have to do it via Terminal. Type:
-
-    adonthell <gamename>
-
-to run the game named <gamename>. To get a list of currently 
-installed games you can play, type:
-
-    adonthell -l
-
-This will print a list of the installed games you can launch
-with above command.
-
-For further information on how to play Adonthell, please refer to the
-PLAYING file that comes with the game data.
-
-
-Release Notes:
-==============
-
-The main purpose of this release is to attract new programmers, 
-artists and writers in order to shorten the time until the next 
-version.  So if you have experience in C++ (and optionally Python), 
-or if you are good at computer graphics or writing we would like to
-hear from you.  Please have a look at our development site 
-  
-  http://adonthell.linuxgames.com/development/
-
-for further details.
-
-Adonthell - Waste's Edge -, or v0.3 for short is no complete RPG.
-As the v0.3 implies, the engine is far from being finished, although
-it should be free of severe bugs.  Missing features include combat, 
-items and magic.  But you can interact with NPC's and the game world, 
-and the internals enable us to create a basic plot, so v0.3 is actually
-playable!
-
-You're greatly invited to report us bugs, problems, or anything you
-think we should know. Any feedback is appreciated, so don't hesitate!
-
-
-Contact:
-========
-
-You can reach us in various ways:
-
-Email:         address@hidden
-Mailing list:  address@hidden
-Web site:      http://adonthell.linuxgames.com
-Tech support:  http://savannah.nongnu.org/support/?group_id=702
-
-There is a Message Board for user to user discussion at
-    http://www.3dforums.com/?action=forumpage&loc=49&forum_id=158
-
-If you want to rate or comment on Adonthell, feel free to do so at
-    http://www.happypenguin.org/show?Adonthell
-    http://www.freshmeat.net/projects/adonthell
-
-
-Reporting Bugs:
-===============
-
-We hope you'll never have to, but if you discover a problem, we
-would like to hear about it. Please use the Development mailing list
-(address@hidden) for that. You can find informations on
-this and other mailing lists at 
-
-    http://adonthell.linuxgames.com/contact/mailinglist.shtml
-
-
-Thank you for trying this software.
-- The Adonthell team.
diff --git a/beos/install-adonthell b/beos/install-adonthell
deleted file mode 100755
index 8fcdde7..0000000
--- a/beos/install-adonthell
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-if test -t 0
-then :
-else
-       alert 'Please run install-adonthell from Terminal!'
-       exit 1
-fi
-
-echo
-
-if test -e 'adonthell' 
-then :
-else
-       echo '*** Please run install-adonthell from within the wastesedge-0.3.3 
directory!'
-       echo
-       exit 1
-fi
-
-mydir=`pwd`
-myapp="${mydir}/adonthell-wastesedge"
-
-echo "Creating start script ..."
-
-rm -f $myapp
-echo -e "#!/bin/sh\n\ncd ${mydir}\n./adonthell wastesedge" > $myapp
-settype -t application/x-vnd.Adonthell-Wastesedge $myapp
-xres -o adonthell ${mydir}/wastesedge.rsrc
-mimeset -f adonthell
-chmod 755 $myapp
-
-echo "Creating Desktop shortcut ..."
-
-rm -f "/boot/home/Desktop/Waste's Edge" 
-ln -s $myapp "/boot/home/Desktop/Waste's Edge" 
-
-echo "Creating Application menu entry ..."
-
-rm -f "/boot/apps/Waste's Edge"
-ln -s $myapp "/boot/apps/Waste's Edge" 
-
-rm -f "/boot/beos/apps/Waste's Edge"
-ln -s $myapp "/boot/beos/apps/Waste's Edge" 
-
-echo
-echo "Okay, now you are ready to launch Adonthell - Waste's Edge."
-echo "To change the program settings, please edit the config file"
-echo
-echo "    $mydir/adonthellrc"
-echo
-echo "with your favourite text editor."
-echo
-echo "Have Fun!"
-echo
diff --git a/beos/uninstall-adonthell b/beos/uninstall-adonthell
deleted file mode 100755
index 70d05c8..0000000
--- a/beos/uninstall-adonthell
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-if test -t 0
-then :
-else
-       alert 'Please run uninstall-adonthell from Terminal!'
-       exit 1
-fi
-
-echo
-echo "Removing Desktop shortcut ..."
-
-rm -f "/boot/home/Desktop/Waste's Edge" 
-
-echo "Removing Application menu entry ..."
-
-rm -f "/boot/apps/Waste's Edge"
-rm -f "/boot/beos/apps/Waste's Edge"
-
-echo
-echo "Done. You can now delete this directory to remove Adonthell -"
-echo "Waste's Edge entirely from your system."
-echo
-echo "We hope you enjoyed it! See you with version 0.4!"
-echo
diff --git a/beos/wastesedge.rsrc b/beos/wastesedge.rsrc
deleted file mode 100644
index 98528a1..0000000
Binary files a/beos/wastesedge.rsrc and /dev/null differ
diff --git a/win32/make_msi.sh b/win32/make_msi.sh
new file mode 100755
index 0000000..64b2e38
--- /dev/null
+++ b/win32/make_msi.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+# -- specify installer architecture (x64 or x86)
+arch="x64"
+adonthell_exe="adonthell-0.3.exe"
+
+# -- check arg
+if test "x$1" = "x" ; then
+  echo "Usage: $0 <path/to/Adonthell>"
+  exit 1
+fi
+
+if test ! -f $1"/bin/$adonthell_exe" ; then
+  echo "Error: $1 is not the expected adonthell package"
+  exit 1
+fi
+
+# -- check working directory
+if [ ! -f "wastesedge.wxs" ]; then
+  echo "This script must be run in the wastesedge-0.3.x/win32 directory"
+  exit 1
+fi
+
+# -- get adonthell version
+adonthell_ver=`$1/bin/$adonthell_exe -v`
+
+# -- clean up any __pycache__ directories before collecting package contents
+find ../../adonthell-0.3/Adonthell/ -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
+   exit 1
+fi
+
+# -- compile
+candle -arch $arch -dVersion="$adonthell_ver" wastesedge-$arch.wxs package.wxs
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+# -- linl
+light -b $1 -sw1076 wastesedge-$arch.wixobj package.wixobj -o 
wastesedge-$adonthell_ver-$arch.msi
+if [ $? -ne 0 ]; then
+   exit 1
+fi
+
+# -- cleanup
+rm wastesedge-$adonthell_ver-$arch.wixpdb
+rm wastesedge-$arch.wixobj
+rm package.wixobj
+rm package.wxs
\ No newline at end of file
diff --git a/win32/prepare.bat b/win32/prepare.bat
deleted file mode 100644
index 6afd14f..0000000
--- a/win32/prepare.bat
+++ /dev/null
@@ -1,43 +0,0 @@
-adonthell.exe -c
-
-cd modules
-..\adonthell.exe -c
-del adonthell.ini
-
-cd ..\games\wastesedge\scripts
-..\..\..\adonthell.exe -c
-del adonthell.ini
-
-cd actions
-..\..\..\..\adonthell.exe -c
-del adonthell.ini
-
-cd ..\dialogues
-..\..\..\..\adonthell.exe -c
-del adonthell.ini
-
-cd ..\game_events
-..\..\..\..\adonthell.exe -c
-del adonthell.ini
-
-cd ..\modules
-..\..\..\..\adonthell.exe -c
-del adonthell.ini
-
-cd ..\schedules
-..\..\..\..\adonthell.exe -c
-del adonthell.ini
-
-cd audio
-..\..\..\..\..\adonthell.exe -c
-del adonthell.ini
-
-cd ..\mapcharacters
-..\..\..\..\..\adonthell.exe -c
-del adonthell.ini
-
-cd ..\mapviews
-..\..\..\..\..\adonthell.exe -c
-del adonthell.ini
-
-exit
\ No newline at end of file
diff --git a/win32/site.py b/win32/site.py
deleted file mode 100644
index 17d6175..0000000
--- a/win32/site.py
+++ /dev/null
@@ -1,24 +0,0 @@
-"""Append module search paths for third-party packages to sys.path.
-
-****************************************************************
-* This module is automatically imported during initialization. *
-****************************************************************
-
-Minimum site.py for Python embedded in Adonthell.
-"""
-
-import sys
-
-def main():
-       pass
-
-main()
-
-def _test():
-    print "sys.path = ["
-    for dir in sys.path:
-        print "    %r," % (dir,)
-    print "]"
-
-if __name__ == '__main__':
-    _test()
diff --git a/win32/wastesedge-x64.wxs b/win32/wastesedge-x64.wxs
new file mode 100644
index 0000000..00ca277
--- /dev/null
+++ b/win32/wastesedge-x64.wxs
@@ -0,0 +1,71 @@
+<?xml version='1.0' encoding='windows-1252'?>
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+    <Product Name="Adonthell - Waste's Edge" 
+       Manufacturer='The Adonthell Team'
+        Id='*' 
+        UpgradeCode='9EC3DA40-20DB-4892-8EE9-0B04207B0EE5'
+        Language='1033' 
+        Codepage='1252' 
+        Version='$(var.Version)'>
+        <Package 
+               Id='*' 
+               Keywords='Installer' 
+               Platform="x64"
+               Description="Adonthell Waste's Edge $(var.Version) Installer"
+            Comments='� 2016 The Adonthell Team' 
+            Manufacturer='The Adonthell Team'
+            InstallerVersion='200' 
+            Languages='1033' 
+            Compressed='yes' 
+            SummaryCodepage='1252' />
+        <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="ARPPRODUCTICON" Value="wastesedge.ico" />    
+        <Directory Id='TARGETDIR' Name='SourceDir'>
+           <Directory Id='ProgramFiles64Folder' Name='PFiles'>
+                       <Directory Id='Adonthell' Name='Adonthell'>
+                       <Directory Id='INSTALLDIR' Name='Wastesedge' />
+                </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" />
+                        <RemoveFolder Id='ProgramMenuDir' On='uninstall' />
+                        <RegistryValue Root='HKCU' 
Key='Software\[Manufacturer]\[ProductName]' Name='startmenuShortcut' 
Type='string' Value='' KeyPath='yes' />
+                    </Component>
+                </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" />
+                    <RegistryValue Root='HKCU' 
Key='Software\[Manufacturer]\[ProductName]' Name='desktopShortcut' 
Type='string' Value='' KeyPath='yes' />
+                </Component>
+            </Directory>
+        </Directory>
+        <Feature Id='Complete' Level='1'>
+                       <ComponentRef Id='ProgramMenuIcon' />
+                       <ComponentRef Id='DesktopIcon' />
+                   <ComponentGroupRef Id='WastesedgePackage' />
+               </Feature>        
+       </Product>    
+</Wix>
\ No newline at end of file
diff --git a/win32/wastesedge.nsi b/win32/wastesedge.nsi
deleted file mode 100644
index b3892c5..0000000
--- a/win32/wastesedge.nsi
+++ /dev/null
@@ -1,139 +0,0 @@
-# Auto-generated by EclipseNSIS Script Wizard
-# 04.09.2006 02:05:16
-
-Name "Adonthell Waste's Edge"
-SetCompressor lzma
-
-# Defines
-!define REGKEY "SOFTWARE\$(^Name)"
-!define VERSION 0.3.4
-!define COMPANY "Adonthell Team"
-!define URL http://adonthell.linuxgames.com
-
-# MUI defines
-!define MUI_ICON ..\wastesedge\win32\wastesedge.ico
-!define MUI_FINISHPAGE_NOAUTOCLOSE
-!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM
-!define MUI_STARTMENUPAGE_NODISABLE
-!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Adonthell Waste's Edge"
-!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup
-!define MUI_STARTMENUPAGE_DEFAULT_FOLDER "Waste's Edge"
-!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\classic-uninstall.ico"
-!define MUI_UNFINISHPAGE_NOAUTOCLOSE
-
-# Included files
-!include Sections.nsh
-!include MUI.nsh
-
-# Reserved Files
-
-# Variables
-Var StartMenuGroup
-
-# Installer pages
-!insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE ..\wastesedge\win32\Copying.rtf
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_STARTMENU Application $StartMenuGroup
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_PAGE_FINISH
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-# Installer languages
-!insertmacro MUI_LANGUAGE English
-!insertmacro MUI_LANGUAGE Italian
-!insertmacro MUI_LANGUAGE Dutch
-
-# Installer attributes
-OutFile wastesesge-win32-0.3.4.exe
-InstallDir $PROGRAMFILES\wastesedge
-CRCCheck on
-XPStyle on
-ShowInstDetails show
-VIProductVersion 0.3.4.0
-VIAddVersionKey /LANG=${LANG_ENGLISH} ProductName "Adonthell Waste's Edge"
-VIAddVersionKey ProductVersion "${VERSION}"
-VIAddVersionKey /LANG=${LANG_ENGLISH} CompanyName "${COMPANY}"
-VIAddVersionKey /LANG=${LANG_ENGLISH} CompanyWebsite "${URL}"
-VIAddVersionKey /LANG=${LANG_ENGLISH} FileVersion ""
-VIAddVersionKey /LANG=${LANG_ENGLISH} FileDescription ""
-VIAddVersionKey /LANG=${LANG_ENGLISH} LegalCopyright ""
-InstallDirRegKey HKLM "${REGKEY}" Path
-ShowUninstDetails show
-
-# Installer sections
-Section -Main SEC0000
-    SetOutPath $INSTDIR\wastesedge
-    SetOverwrite on
-    File /r C:\Programme\wastesedge\*
-    WriteRegStr HKLM "${REGKEY}\Components" Main 1
-SectionEnd
-
-Section -post SEC0001
-    WriteRegStr HKLM "${REGKEY}" Path $INSTDIR
-    WriteUninstaller $INSTDIR\uninstall.exe
-    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-    SetOutPath $SMPROGRAMS\$StartMenuGroup
-    CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^UninstallLink).lnk" 
$INSTDIR\uninstall.exe
-    !insertmacro MUI_STARTMENU_WRITE_END
-    WriteRegStr HKLM 
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName 
"$(^Name)"
-    WriteRegStr HKLM 
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion 
"${VERSION}"
-    WriteRegStr HKLM 
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" Publisher 
"${COMPANY}"
-    WriteRegStr HKLM 
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" URLInfoAbout 
"${URL}"
-    WriteRegStr HKLM 
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayIcon 
$INSTDIR\uninstall.exe
-    WriteRegStr HKLM 
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" UninstallString 
$INSTDIR\uninstall.exe
-    WriteRegDWORD HKLM 
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoModify 1
-    WriteRegDWORD HKLM 
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" NoRepair 1
-SectionEnd
-
-# Macro for selecting uninstaller sections
-!macro SELECT_UNSECTION SECTION_NAME UNSECTION_ID
-    Push $R0
-    ReadRegStr $R0 HKLM "${REGKEY}\Components" "${SECTION_NAME}"
-    StrCmp $R0 1 0 next${UNSECTION_ID}
-    !insertmacro SelectSection "${UNSECTION_ID}"
-    GoTo done${UNSECTION_ID}
-next${UNSECTION_ID}:
-    !insertmacro UnselectSection "${UNSECTION_ID}"
-done${UNSECTION_ID}:
-    Pop $R0
-!macroend
-
-# Uninstaller sections
-Section /o un.Main UNSEC0000
-    RmDir /r /REBOOTOK $INSTDIR\wastesedge
-    DeleteRegValue HKLM "${REGKEY}\Components" Main
-SectionEnd
-
-Section un.post UNSEC0001
-    DeleteRegKey HKLM 
"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
-    Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^UninstallLink).lnk"
-    Delete /REBOOTOK $INSTDIR\uninstall.exe
-    DeleteRegValue HKLM "${REGKEY}" StartMenuGroup
-    DeleteRegValue HKLM "${REGKEY}" Path
-    DeleteRegKey /IfEmpty HKLM "${REGKEY}\Components"
-    DeleteRegKey /IfEmpty HKLM "${REGKEY}"
-    RmDir /REBOOTOK $SMPROGRAMS\$StartMenuGroup
-    RmDir /REBOOTOK $INSTDIR
-SectionEnd
-
-# Installer functions
-Function .onInit
-    InitPluginsDir
-FunctionEnd
-
-# Uninstaller functions
-Function un.onInit
-    ReadRegStr $INSTDIR HKLM "${REGKEY}" Path
-    ReadRegStr $StartMenuGroup HKLM "${REGKEY}" StartMenuGroup
-    !insertmacro SELECT_UNSECTION Main ${UNSEC0000}
-FunctionEnd
-
-
-# Installer Language Strings
-# TODO Update the Language Strings with the appropriate translations.
-
-LangString ^UninstallLink ${LANG_ENGLISH} "Uninstall $(^Name)"
-LangString ^UninstallLink ${LANG_ITALIAN} "Uninstall $(^Name)"
-LangString ^UninstallLink ${LANG_DUTCH} "Uninstall $(^Name)"