From a524b4a0e370f5c84f1af18d6299254f7e93d48a Mon Sep 17 00:00:00 2001
From: Frank Morgner <morgner@informatik.hu-berlin.de>
Date: Mon, 14 Sep 2015 22:18:17 +0200
Subject: [PATCH] Removes obsolete windows installer files

---
 win32/Makefile.am             |  6 +----
 win32/OpenSC.iss.in           |  2 +-
 win32/README.rtf              |  1 -
 win32/installer_from_build.sh | 30 ------------------------
 win32/opensc-install.bat      | 44 -----------------------------------
 5 files changed, 2 insertions(+), 81 deletions(-)
 delete mode 100644 win32/README.rtf
 delete mode 100755 win32/installer_from_build.sh
 delete mode 100755 win32/opensc-install.bat

diff --git a/win32/Makefile.am b/win32/Makefile.am
index 8bdb1df1..8a1573b6 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -3,14 +3,10 @@ include $(top_srcdir)/win32/ltrc.inc
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/versioninfo.rc $(srcdir)/winconfig.h \
 		$(srcdir)/OpenSC.iss $(srcdir)/OpenSC.wxs $(srcdir)/OpenSC.ico $(srcdir)/license.rtf \
                 $(srcdir)/dlgbmp.bmp $(srcdir)/bannrbmp.bmp $(srcdir)/versioninfo-customactions.rc
-EXTRA_DIST = ltrc.inc Makefile.mak Make.rules.mak opensc-install.bat \
+EXTRA_DIST = ltrc.inc Makefile.mak Make.rules.mak \
 		versioninfo.rc.in winconfig.h.in OpenSC.iss.in OpenSC.wxs.in versioninfo-customactions.rc.in
 dist_noinst_HEADERS = versioninfo.rc winconfig.h OpenSC.iss OpenSC.wxs license.rtf OpenSC.ico dlgbmp.bmp bannrbmp.bmp
 
-if WIN32
-sbin_SCRIPTS = opensc-install.bat
-endif
-
 if ENABLE_MINIDRIVER
 lib_LTLIBRARIES = customactions@LIBRARY_BITNESS@.la
 
diff --git a/win32/OpenSC.iss.in b/win32/OpenSC.iss.in
index d4ea6a1f..6bb6e3ba 100644
--- a/win32/OpenSC.iss.in
+++ b/win32/OpenSC.iss.in
@@ -32,7 +32,7 @@ ShowComponentSizes=false
 FlatComponentsList=false
 WizardImageBackColor=clWhite
 DisableFinishedPage=false
-InfoBeforeFile=README.rtf
+InfoBeforeFile=license.rtf
 VersionInfoProductName=OpenSC
 VersionInfoProductVersion=@OPENSC_VERSION_MAJOR@.@OPENSC_VERSION_MINOR@.@OPENSC_VERSION_FIX@
 AllowRootDirectory=true
diff --git a/win32/README.rtf b/win32/README.rtf
deleted file mode 100644
index 61ba3be5..00000000
--- a/win32/README.rtf
+++ /dev/null
@@ -1 +0,0 @@
-README for OpenSC win32 installer.
diff --git a/win32/installer_from_build.sh b/win32/installer_from_build.sh
deleted file mode 100755
index 3a82d4af..00000000
--- a/win32/installer_from_build.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-set -ex
-build_dir=${1:-win32/build}
-
-if ! [ -d ${build_dir} ]; then
-	svn co http://www.opensc-project.org/svn/build/trunk ${build_dir}
-	mkdir -p ${build_dir}/sources
-fi
-
-# build a fresh targzip
-rm -f opensc-*.tar.gz
-make dist
-rm -f ${build_dir}/sources/opensc*.tar.gz
-cp opensc-0.12.*.tar.gz ${build_dir}/sources/
-
-# use mingw to generate binaries
-(cd ${build_dir}; CHOST=i586-mingw32msvc CBUILD=i686-pc-linux-gnu ./build)
-
-# Copy files
-cp ${build_dir}/image/opensc/etc/opensc.conf win32
-
-mkdir -p win32/opensc
-cp ${build_dir}/image/opensc/bin/*.dll ${build_dir}/image/opensc/bin/*.exe win32/opensc
-cp ${build_dir}/image/opensc/share/opensc/*.profile win32/opensc
-
-mkdir -p win32/engine_pkcs11
-cp ${build_dir}/image/engine_pkcs11/bin/libp11-1.dll ${build_dir}/image/engine_pkcs11/lib/engines/engine_pkcs11.dll win32/engine_pkcs11
-
-# Build installer
-wine ~/.wine/drive_c/Program\ Files/Inno\ Setup\ 5/ISCC.exe win32/OpenSC.iss
diff --git a/win32/opensc-install.bat b/win32/opensc-install.bat
deleted file mode 100755
index 8c16139e..00000000
--- a/win32/opensc-install.bat
+++ /dev/null
@@ -1,44 +0,0 @@
-@echo off
-
-rem This script installs OpenSC
-rem Parameters:
-rem     user - Install for this user only.
-
-setlocal
-
-set MODE=%1
-
-set KEY=HKEY_LOCAL_MACHINE
-if "%MODE%" == "user" set KEY=HKEY_CURRENT_USER
-
-cd %0\..\..
-
-if not exist bin\opensc-tool.exe goto error
-
-for /f %%f in (".") do set OPENSC_HOME=%%~ff
-
-set OPENSC_HOME_ESCAPED=%OPENSC_HOME:\=\\%
-set REG_FILE=%TEMP%\opensc-install.reg
-
-echo Windows Registry Editor Version 5.00 > %REG_FILE%
-echo [%KEY%\SOFTWARE\OpenSC Project\OpenSC] >> %REG_FILE%
-echo "ConfigFile"="%OPENSC_HOME_ESCAPED%\\etc\\opensc.conf" >> %REG_FILE%
-echo [%KEY%\SOFTWARE\PKCS11-Spy] >> %REG_FILE%
-echo "Module"="%OPENSC_HOME_ESCAPED%\\bin\\opensc-pkcs11.dll" >> %REG_FILE%
-
-regedit /s %REG_FILE%
-del /q %REG_FILE%
-
-"%OPENSC_HOME%\bin\opensc-tool" -S "app:default:profile_dir:%OPENSC_HOME%\share\opensc"
-
-echo You may also want to add "%OPENSC_HOME%\bin" to your PATH, for use by other applications.
-
-goto end
-
-:error
-echo Invalid installation
-goto end
-
-:end
-
-endlocal