Remove dirmngr and libksba
authorAndre Heinecke <aheinecke@intevation.de>
Mon, 31 Aug 2015 10:09:53 +0000 (12:09 +0200)
committerAndre Heinecke <aheinecke@intevation.de>
Mon, 31 Aug 2015 10:09:53 +0000 (12:09 +0200)
* patches/dirmngr-1.1.1/dirmngr-pth.patch,
 src/inst-dirmngr.nsi,
 src/inst-libksba.nsi,
 src/uninst-dirmngr.nsi,
 src/uninst-libksba.nsi: Removed.
* src/inst-sections.nsi,
 src/Makefile.am,
 src/config.nsi.in,
 Makefile.am,
 configure.ac,
 packages/packages.current: Update accordingly.

Makefile.am
configure.ac
packages/packages.current
patches/dirmngr-1.1.1/dirmngr-pth.patch [deleted file]
src/Makefile.am
src/config.nsi.in
src/inst-dirmngr.nsi [deleted file]
src/inst-libksba.nsi [deleted file]
src/inst-sections.nsi
src/uninst-dirmngr.nsi [deleted file]
src/uninst-libksba.nsi [deleted file]

index ab93d2e..e1b541a 100644 (file)
@@ -27,7 +27,6 @@ SUBDIRS = po packages doc src
 EXTRA_DIST = autogen.sh README.GIT ONEWS \
         doc/license-page doc/GPLv3 \
         build-aux/git-log-footer build-aux/git-log-fix \
-        patches/dirmngr-1.1.1/dirmngr-pth.patch \
         patches/glib-2.41.5/01-socket.patch \
         patches/gpgme-1.5.5/0001-Add-offline-mode-support-for-CMS-keylisting.patch \
                patches/w32pth-2.0.5/workaround-broken-libtool.patch \
index 91c5967..88c1008 100644 (file)
@@ -356,9 +356,7 @@ GPG4WIN_SPKG([bzip2])
 GPG4WIN_SPKG([adns])
 GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
 GPG4WIN_SPKG([libgcrypt], [libgpg-error])
-GPG4WIN_SPKG([libksba], [libgpg-error])
 GPG4WIN_SPKG([libassuan], [libgpg-error w32pth])
-GPG4WIN_SPKG([dirmngr], [libgpg-error libgcrypt libassuan libksba w32pth])
 GPG4WIN_SPKG([pinentry], [libiconv gtk+])
 GPG4WIN_SPKG([gpgme], [libgpg-error glib])
 GPG4WIN_SPKG([gpgol], [gpgme libassuan])
index da7b43a..c032812 100644 (file)
@@ -288,11 +288,6 @@ chk  9456e7b64db9df8360a1407a38c8c958da80bbf1
 
 # last-changed: 2015-06-05
 # by: ah
-file libksba/libksba-1.3.3.tar.bz2
-chk  86fe0436f3c8c394d32e142ee410a9f9560173fb
-
-# last-changed: 2015-06-05
-# by: ah
 file libassuan/libassuan-2.2.1.tar.bz2
 chk  c21b86482f6a3624c2b46b91e20f8415f244233a
 
@@ -306,10 +301,6 @@ name gnupg-w32-2.1.7-20150811-src.tar.xz
 file binary/gnupg-w32-2.1.7_20150811.tar.xz
 chk  20439f65b8d94ec79523c45ad72418670ca9d5eb
 
-# checked: 2014-07-16 ah
-file dirmngr/dirmngr-1.1.1.tar.bz2
-chk  e708d4aa5ce852f4de3f4b58f4e4f221f5e5c690
-
 # last changed: 2015-06-23
 # by: ah
 file pinentry/pinentry-0.9.4.tar.bz2
diff --git a/patches/dirmngr-1.1.1/dirmngr-pth.patch b/patches/dirmngr-1.1.1/dirmngr-pth.patch
deleted file mode 100755 (executable)
index 11c0fcd..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-patch -p0 -l -f $* < $0
-exit $?
-
---- src/dirmngr.c.orig 2014-08-13 13:29:03.609026165 +0000
-+++ src/dirmngr.c      2014-08-13 13:30:19.328411198 +0000
-@@ -668,12 +668,14 @@
-      Note that this will also do the pth_init. */
-
-   /* Init Libgcrypt. */
-+#if GCRYPT_VERSION_NUMBER < 0x010600
-   rc = gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pth);
-   if (rc)
-     {
-       log_fatal ("can't register GNU Pth with Libgcrypt: %s\n",
-                  gpg_strerror (rc));
-     }
-+#endif
-   gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
-   if (!gcry_check_version (NEED_LIBGCRYPT_VERSION) )
-     {
index a01e14b..efc4191 100644 (file)
@@ -24,14 +24,13 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
         inst-sections.nsi installer.nsi installer-finish.nsi  \
        QtCore.pc QtGui.pc zlib.pc sha1sum.c mkportable.c     \
        mkportable-vanilla.h mkportable-light.h mkportable-full.h \
-        qt.conf kleowrap.c potomo Memento.nsh dirmngr.conf    \
+        qt.conf kleowrap.c potomo Memento.nsh \
         inst-gpg4win.nsi          uninst-gpg4win.nsi         \
         inst-atk.nsi               uninst-atk.nsi            \
         inst-expat.nsi            uninst-expat.nsi           \
         inst-freetype.nsi         uninst-freetype.nsi        \
         inst-fontconfig.nsi       uninst-fontconfig.nsi      \
         inst-cairo.nsi            uninst-cairo.nsi           \
-        inst-dirmngr.nsi          uninst-dirmngr.nsi         \
         inst-gettext.nsi          uninst-gettext.nsi         \
         inst-libffi.nsi                   uninst-libffi.nsi          \
         inst-glib.nsi             uninst-glib.nsi            \
@@ -48,7 +47,6 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
         inst-libgcrypt.nsi        uninst-libgcrypt.nsi       \
         inst-libgpg-error.nsi     uninst-libgpg-error.nsi    \
         inst-libiconv.nsi         uninst-libiconv.nsi        \
-        inst-libksba.nsi          uninst-libksba.nsi         \
         inst-adns.nsi             uninst-adns.nsi            \
         inst-libpng.nsi                   uninst-libpng.nsi          \
         inst-compendium.nsi       uninst-compendium.nsi   \
@@ -92,8 +90,8 @@ CLEANFILES = g4wihelp.dll versioninfo.txt $(README_files) $(HOWTO_files) \
 gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
                 libgpg-error gpgme gpgol gpgex libpng \
                gpa opencdk \
-               pinentry libassuan libksba libgcrypt \
-               adns dirmngr w32pth scute paperkey regex libiconv gettext
+               pinentry libassuan libgcrypt \
+               adns w32pth scute paperkey regex libiconv gettext
 
 # Supported source packages to build in an additional architecture
 gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex
@@ -194,9 +192,6 @@ gpg4win_pkg_libassuan_configure =  --silent --enable-static
 
 gpg4win_pkg_libassuan_ex_configure =  --silent --enable-static
 
-gpg4win_pkg_libksba_configure = --silent \
-  --with-gpg-error-prefix=$(idir)
-
 # Using gpgsm with VirtualBox on AES-NI hardware crashes gpg-agent.
 # However, the Libgcrypt's regression tests work just fine.  I don't
 # have a windows instance on AES-NI, thus I can't currently debug
@@ -209,26 +204,6 @@ gpg4win_pkg_adns_configure = --silent
 
 gpg4win_pkg_libpng_configure = HAVE_SOLARIS_LD_FALSE=yes CPPFLAGS=\"-I$(idir)/include -DPNG_BUILD_DLL\" LDFLAGS=\"-L$(idir)/lib\" LIBPNG_DEFINES=\"-DPNG_BUILD_DLL\"
 
-gpg4win_pkg_dirmngr_configure = \
-  --with-gpg-error-prefix=$(idir) \
-  --with-ksba-prefix=$(idir) \
-  --with-libgcrypt-prefix=$(idir) \
-  --with-libassuan-prefix=$(idir) \
-  --with-pth-prefix=$(idir)
-
-gpg4win_pkg_gnupg2_configure = \
-  --with-gpg-error-prefix=$(idir) \
-  --with-ksba-prefix=$(idir) \
-  --with-libgcrypt-prefix=$(idir) \
-  --with-libassuan-prefix=$(idir) \
-  --with-zlib=$(idir) \
-  --with-bzip2=$(idir) \
-  --with-pth-prefix=$(idir) \
-  --with-adns=$(idir) \
-  --without-included-gettext \
-  --enable-gpgtar \
-  --disable-regex
-
 # We would like to use --with-libiconv-prefix and
 # --with-libintl-prefix, but these don't work with the cheesy
 # non-"libfoo.la" versions of iconv and gettext that we are using.
index 4f2ea1c..ddafac4 100644 (file)
 !define gpg4win_pkg_libgcrypt @gpg4win_pkg_libgcrypt@
 !define gpg4win_pkg_libgcrypt_version @gpg4win_pkg_libgcrypt_version@
 
-@HAVE_PKG_LIBKSBA@
-!define gpg4win_pkg_libksba @gpg4win_pkg_libksba@
-!define gpg4win_pkg_libksba_version @gpg4win_pkg_libksba_version@
-
-@HAVE_PKG_DIRMNGR@
-!define gpg4win_pkg_dirmngr @gpg4win_pkg_dirmngr@
-!define gpg4win_pkg_dirmngr_version @gpg4win_pkg_dirmngr_version@
-
 @HAVE_PKG_GPGME@
 !define gpg4win_pkg_gpgme @gpg4win_pkg_gpgme@
 !define gpg4win_pkg_gpgme_version @gpg4win_pkg_gpgme_version@
diff --git a/src/inst-dirmngr.nsi b/src/inst-dirmngr.nsi
deleted file mode 100644 (file)
index 01abd6f..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-# inst-dirmngr.nsi - Installer snippet.            -*- coding: latin-1; -*-
-# Copyright (C) 2007 g10 Code GmbH
-# 
-# This file is part of Gpg4win.
-# 
-# Gpg4win 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; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# Gpg4win 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
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/dirmngr-${gpg4win_pkg_dirmngr_version}
-
-!ifdef DEBUG
-Section "dirmngr" SEC_dirmngr
-!else
-Section "-dirmngr" SEC_dirmngr
-!endif
-  SetOutPath "$INSTDIR"
-!ifdef SOURCES
-  File "${gpg4win_pkg_dirmngr}"
-!else
-  Var /GLOBAL DirMngrStatus
-  g4wihelp::service_query "DirMngr"
-  StrCpy $DirMngrStatus $R0
-
-  File "${prefix}/bin/dirmngr.exe"
-  File "${prefix}/bin/dirmngr-client.exe"
-  File "${prefix}/libexec/dirmngr_ldap.exe"
-
-  # Create a directory for extra certs for documentation reasons.
-  SetShellVarContext all
-  SetOutPath "$APPDATA\GNU\lib\dirmngr\extra-certs"
-
-  # Note: The make-msi.pl script ignores the following line, which is
-  # ok, because the Windows installer does not override locally
-  # modified files.
-  ifFileExists "$APPDATA\GNU\etc\dirmngr\dirmngr.conf" dirmngr_no_conf 0
-   SetOutPath "$APPDATA\GNU\etc\dirmngr"
-
-   File "${SRCDIR}/dirmngr.conf"
-   File "${prefix}/share/doc/dirmngr/examples/bnetza-10r-ocsp.signer"
-
-   SetOutPath "$APPDATA\GNU\etc\dirmngr\trusted-certs"
-   File "${prefix}/share/doc/dirmngr/examples/trusted-certs/README"
-   File "${prefix}/share/doc/dirmngr/examples/trusted-certs/bnetza-10r-ca.crt"
-  dirmngr_no_conf:
-  SetShellVarContext current
-
-  SetOutPath "$INSTDIR"
-
-  StrCmp $DirMngrStatus "MISSING" 0 dirmngr_created
-    # Create the service.
-    g4wihelp::service_create "DirMngr" "DirMngr" \
-                             '"$INSTDIR\dirmngr.exe" --service'
-  dirmngr_created:
-
-  # Start the service.
-  # FIXME: This does not work.  Luckily, it is also not needed.
-  # g4wihelp::service_start "DirMngr" "2" '"$INSTDIR\dirmngr.exe"' "--service"
-  # This works.
-  g4wihelp::service_start "DirMngr" 0
-
-  # If requested, install the configuration files.
-  # Fixme:  I don't think that is right (wk)!
-  ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" AppData
-  StrCmp $0 "" no_config_dirmngr_files
-  CreateDirectory "$0\gnupg"
-
-  g4wihelp::config_fetch "dirmngr.conf"
-  StrCmp $R0 "" no_config_dirmngr_conf
-    CopyFiles $R0 "$0\gnupg\dirmngr.conf"
-  no_config_dirmngr_conf:
-
-  g4wihelp::config_fetch "dirmngr_ldapservers.conf"
-  StrCmp $R0 "" no_config_dirmngr_ldapservers_conf
-    CopyFiles $R0 "$0\gnupg\dirmngr_ldapservers.conf"
-  no_config_dirmngr_ldapservers_conf:
-
-  no_config_dirmngr_files:
-
-!endif
-SectionEnd
diff --git a/src/inst-libksba.nsi b/src/inst-libksba.nsi
deleted file mode 100644 (file)
index f517394..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-# inst-libksba.nsi - snippet for libksba.   -*- coding: latin-1; -*-
-# Copyright (C) 2007 g10 Code GmbH
-#
-# This file is part of Gpg4win.
-#
-# Gpg4win 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; either version 2 of the License, or
-# (at your option) any later version.
-#
-# Gpg4win 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
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/libksba-${gpg4win_pkg_libksba_version}
-
-
-!ifdef DEBUG
-Section "libksba" SEC_libksba
-!else
-Section "-libksba" SEC_libksba
-!endif
-  SetOutPath "$INSTDIR"
-!ifdef SOURCES
-  File "${gpg4win_pkg_libksba}"
-!else
-  File ${prefix}/bin/libksba-8.dll
-
-  SetOutPath "$INSTDIR\lib"
-  File /oname=libksba.imp "${prefix}/lib/libksba.dll.a"
-
-  SetOutPath "$INSTDIR\include"
-  File "${prefix}/include/ksba.h"
-
-!endif
-SectionEnd
index e7979af..0ddc54b 100644 (file)
@@ -74,9 +74,6 @@
 !ifdef HAVE_PKG_GLIB
 !include "inst-glib.nsi"
 !endif
-!ifdef HAVE_PKG_LIBKSBA
-!include "inst-libksba.nsi"
-!endif
 !ifdef HAVE_PKG_LIBGCRYPT
 !include "inst-libgcrypt.nsi"
 !endif
@@ -98,9 +95,6 @@
 !ifdef HAVE_PKG_ATK
 !include "inst-atk.nsi"
 !endif
-!ifdef HAVE_PKG_DIRMNGR
-!include "inst-dirmngr.nsi"
-!endif
 !ifdef HAVE_PKG_GDK_PIXBUF
 !include "inst-gdk-pixbuf.nsi"
 !endif
 !ifdef HAVE_PKG_GDK_PIXBUF
 !include "uninst-gdk-pixbuf.nsi"
 !endif
-!ifdef HAVE_PKG_DIRMNGR
-!include "uninst-dirmngr.nsi"
-!endif
 !ifdef HAVE_PKG_ATK
 !include "uninst-atk.nsi"
 !endif
 !ifdef HAVE_PKG_LIBGCRYPT
 !include "uninst-libgcrypt.nsi"
 !endif
-!ifdef HAVE_PKG_LIBKSBA
-!include "uninst-libksba.nsi"
-!endif
 !ifdef HAVE_PKG_GLIB
 !include "uninst-glib.nsi"
 !endif
@@ -507,18 +495,12 @@ Function CalcDepends
 !ifdef HAVE_PKG_LIBGCRYPT
   !insertmacro UnselectSection ${SEC_libgcrypt}
 !endif
-!ifdef HAVE_PKG_LIBKSBA
-  !insertmacro UnselectSection ${SEC_libksba}
-!endif
 !ifdef HAVE_PKG_W32PTH
   !insertmacro UnselectSection ${SEC_w32pth}
 !endif
 !ifdef HAVE_PKG_LIBASSUAN
   !insertmacro UnselectSection ${SEC_libassuan}
 !endif
-!ifdef HAVE_PKG_DIRMNGR
-  !insertmacro UnselectSection ${SEC_dirmngr}
-!endif
 !ifdef HAVE_PKG_PINENTRY
   !insertmacro UnselectSection ${SEC_pinentry}
 !endif
@@ -684,17 +666,6 @@ Function CalcDepends
    skip_pinentry:
 !endif
 
-!ifdef HAVE_PKG_DIRMNGR
-  !insertmacro SectionFlagIsSet ${SEC_dirmngr} ${SF_SELECTED} have_dirmngr skip_dirmngr
-  have_dirmngr:
-  !insertmacro SelectSection ${SEC_libgpg_error}
-  !insertmacro SelectSection ${SEC_libgcrypt}
-  !insertmacro SelectSection ${SEC_libassuan}
-  !insertmacro SelectSection ${SEC_libksba}
-  !insertmacro SelectSection ${SEC_w32pth}
-  skip_dirmngr:
-!endif
-
 !ifdef HAVE_PKG_LIBASSUAN
   !insertmacro SectionFlagIsSet ${SEC_libassuan} ${SF_SELECTED} have_libassuan skip_libassuan
   have_libassuan:
@@ -705,13 +676,6 @@ Function CalcDepends
 
   # Package "w32pth" has no dependencies.
 
-!ifdef HAVE_PKG_LIBKSBA
-  !insertmacro SectionFlagIsSet ${SEC_libksba} ${SF_SELECTED} have_libksba skip_libksba
-  have_libksba:
-  !insertmacro SelectSection ${SEC_libgpg_error}
-  skip_libksba:
-!endif
-
 !ifdef HAVE_PKG_LIBGPG_ERROR
   !insertmacro SectionFlagIsSet ${SEC_libgpg_error} ${SF_SELECTED} have_libgpg_error skip_libgpg_error
   have_libgpg_error:
diff --git a/src/uninst-dirmngr.nsi b/src/uninst-dirmngr.nsi
deleted file mode 100644 (file)
index 3cb2e3f..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
- # uninst-dirmngr.nsi - Uninstaller snippet.        -*- coding: latin-1; -*-
-# Copyright (C) 2007 g10 Code GmbH
-# 
-# This file is part of Gpg4win.
-# 
-# Gpg4win 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; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# Gpg4win 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
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/dirmngr-${gpg4win_pkg_dirmngr_version}
-
-
-# Uninstaller section.
-Section "-un.dirmngr"
-!ifdef SOURCES
-  Push "${gpg4win_pkg_dirmngr}"
-  Call un.SourceDelete
-!else
-  # Try to stop the daemon in case it is running.
-  g4wihelp::service_stop "DirMngr"
-
-  g4wihelp::service_delete "DirMngr"
-
-  Delete "$INSTDIR\dirmngr.exe"
-  Delete "$INSTDIR\dirmngr-client.exe"
-  Delete "$INSTDIR\dirmngr_ldap.exe"
-  RMDir "$INSTDIR\cache"
-
-  # The next thing is only to cleanup cruft from versions < 1.9.3.
-  # Newer versions install them into COMMON_APPDATA and they are not
-  # removed on purpose.  Remove the extra-certs directory.  Obviously
-  # this works only if the user has not populated it.
-  RMDir "$INSTDIR\lib\dirmngr\extra-certs"
-  RMDir "$INSTDIR\lib\dirmngr"
-
-  # Remove etc files.  This is only useful for installer < 1.9.3.
-
-  Delete "$INSTDIR\etc\dirmngr\dirmngr.conf"
-  Delete "$INSTDIR\etc\dirmngr\bnetza-10r-ocsp.signer"
-
-  Delete "$INSTDIR\etc\dirmngr\trusted-certs\README"
-  Delete "$INSTDIR\etc\dirmngr\trusted-certs\bnetza-10r-ca.crt"
-
-  RMDir "$INSTDIR\etc\dirmngr\trusted-certs"
-  RMDir "$INSTDIR\etc\dirmngr"
-  RMDir "$INSTDIR\etc"
-  RMDir "$INSTDIR"
-!endif
-SectionEnd
diff --git a/src/uninst-libksba.nsi b/src/uninst-libksba.nsi
deleted file mode 100644 (file)
index a776ede..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-# uninst-libksba.nsi - Uninstaller f. libksba.  -*- coding: latin-1; -*-
-# Copyright (C) 2007 g10 Code GmbH
-#
-# This file is part of Gpg4win.
-#
-# Gpg4win 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; either version 2 of the License, or
-# (at your option) any later version.
-#
-# Gpg4win 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
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA 02110-1301, USA.
-
-
-!ifdef prefix
-!undef prefix
-!endif
-!define prefix ${ipdir}/libksba-${gpg4win_pkg_libksba_version}
-
-
-; Uninstaller section.
-Section "-un.libksba"
-!ifdef SOURCES
-  Push "${gpg4win_pkg_libksba}"
-  Call un.SourceDelete
-!else
-  Delete "$INSTDIR\libksba-8.dll"
-  Delete "$INSTDIR\lib\libksba.imp"
-  Delete "$INSTDIR\include\ksba.h"
-
-  RMDir "$INSTDIR"
-!endif
-SectionEnd
-