pkg: remove non-related tools

Author: viktorTarasov

src/tools/Makefile.mak

@@ -4,9 +4,8 @@ default: all
 
 !INCLUDE $(TOPDIR)\win32\Make.rules.mak
 
-TARGETS = opensc-tool.exe opensc-explorer.exe pkcs15-tool.exe pkcs15-crypt.exe \
-		pkcs11-tool.exe cardos-tool.exe eidenv.exe openpgp-tool.exe iasecc-tool.exe safenet-tool.exe \
-		opensc-notify.exe egk-tool.exe goid-tool.exe dtrust-tool.exe \
+TARGETS = opensc-tool.exe opensc-explorer.exe pkcs15-tool.exe \
+		pkcs11-tool.exe iasecc-tool.exe safenet-tool.exe \
 		opensc-asn1.exe pkcs11-register.exe $(PROGRAMS_OPENSSL) $(PROGRAMS_OPENPACE)
 
 OBJECTS = util.obj versioninfo-tools.res

win32/Make.rules.mak

@@ -60,8 +60,7 @@ OPENSSL_LIB = $(OPENSSL_DIR)\lib\VC\$(PLATFORM)\$(BUILD_TYPE)\libcrypto_static.l
 !ENDIF
 OPENSSL_LIB = $(OPENSSL_LIB) user32.lib advapi32.lib crypt32.lib ws2_32.lib
 
-PROGRAMS_OPENSSL = cryptoflex-tool.exe pkcs15-init.exe netkey-tool.exe piv-tool.exe \
-	westcos-tool.exe sc-hsm-tool.exe dnie-tool.exe gids-tool.exe
+PROGRAMS_OPENSSL = pkcs15-init.exe  
 OPENSC_FEATURES = $(OPENSC_FEATURES) openssl
 WIXFLAGS = -d OpenSSL="$(OPENSSL_DIR)" $(WIXFLAGS)
 !ENDIF
@@ -94,26 +93,6 @@ WIXFLAGS = -d zlib="C:\zlib-dll" $(WIXFLAGS)
 !ENDIF
 
 
-# If you want support for EAC:
-# - Download OpenPACE and
-# - uncomment the line starting with OPENPACE_DEF 
-# - set the OPENPACE_INCL_DIR below to the OpenPACE include directory preceded by "/I"
-# - set the OPENPACE_LIB  below to your OpenPACE lib file
-#OPENPACE_DEF= /DENABLE_OPENPACE
-!IF "$(OPENPACE_DEF)" == "/DENABLE_OPENPACE"
-!IF "$(OPENPACE_DIR)" == ""
-OPENPACE_DIR = C:\openpace
-!ENDIF
-OPENPACE_INCL_DIR = /I$(OPENPACE_DIR)\src
-OPENPACE_LIB = $(OPENPACE_DIR)\src\libeac.lib
-!IF "$(OPENSSL_DEF)" == "/DENABLE_OPENSSL"
-# Build only when OpenPACE and OpenSSL are available
-PROGRAMS_OPENPACE = npa-tool.exe
-!ENDIF
-WIXFLAGS = -d OpenPACE="$(OPENPACE_DIR)" $(WIXFLAGS)
-!ENDIF
-
-
 # Used for MiniDriver
 CPDK_INCL_DIR = "/IC:\Program Files (x86)\Windows Kits\10\Cryptographic Provider Development Kit\Include"
 

win32/OpenSC.wxs.in

@@ -107,9 +107,6 @@
         <?ifdef zlib ?>
           <ComponentRef Id="zlib1.dll" />
         <?endif?>
-        <?ifdef OpenSSL ?>
-          <ComponentRef Id="smm_local.dll" />
-        <?endif?>
         <?ifdef OpenPACE ?>
           <File Directory="INSTALLDIR_CVC" Source="$(var.SOURCE_DIR)\etc\DESRCACC100001" />
           <File Directory="INSTALLDIR_CVC" Source="$(var.SOURCE_DIR)\etc\DESCHSMCVCA00001" />
@@ -167,19 +164,6 @@
         <?endif?>
         <File Id="opensc.dll" Directory="INSTALLDIR_TOOLS" Source="$(var.SOURCE_DIR)\src\libopensc\opensc.dll" />
         <Files Directory="INSTALLDIR_TOOLS" Include="$(var.SOURCE_DIR)\src\tools\*.exe" />
-
-        <?ifdef OpenSSL ?>
-          <File Directory="INSTALLDIR_TOOLS" Id="smm_local.dll" Source="$(var.SOURCE_DIR)\src\smm\smm-local.dll" />
-          <Files Directory="INSTALLDIR_PROFILES" Include="$(var.SOURCE_DIR)\src\pkcs15init\*.profile" />
-        <?endif?>
-
-        <Feature Id="OpenSC_autostart" Level="1" Title="Autostart entries"
-            Description="After login, start smart card notifications.">
-          <Component Condition="BUILD_ARCH = NATIVE_ARCH">
-            <RegistryValue Root="HKMU" Key="Software\Microsoft\Windows\CurrentVersion\Run"
-              Type="string" Name="opensc-notify.exe" Value="[INSTALLDIR_TOOLS]\opensc-notify.exe" />
-          </Component>
-        </Feature>
       </Feature>
 
       <Feature Id="OpenSC_menu" Level="1" Title="Start menu entries"