Changeset 2ffa346 in OpenSC

Timestamp:

06/14/11 12:56:49 (11 months ago)

Author:

Viktor Tarasov <viktor.tarasov@…>

Branches:

master, staging

Children:

a3f0433, b2ba54e, 819bd82, d505a55

Parents:

c2abd9f

git-author:

Viktor Tarasov <viktor.tarasov@…> (06/14/11 12:56:49)

git-committer:

Viktor Tarasov <viktor.tarasov@…> (06/14/11 12:56:49)

Message:

OpenSC.msi: install opensc.dll into the 'tools' directory

Now the DLLs installed into the 'system' directory are static.
Only opensc tools depend on opensc.dll.

File:

• win32/OpenSC.wxs.in (modified) (2 diffs)

win32/OpenSC.wxs.in

@@ -53 +53 @@
           <File Source="$(var.SOURCE_DIR)\src\pkcs11\opensc-pkcs11.dll" Vital="yes"/>
         </Component>
-        <Component Id="opensc.dll" Guid="*" Win64="$(var.Win64YesNo)">
-          <File Source="$(var.SOURCE_DIR)\src\libopensc\opensc.dll" Vital="yes"/>
-        </Component>
         <Component Id="opensc_minidriver.dll" Guid="*" Win64="$(var.Win64YesNo)">
           <File Source="$(var.SOURCE_DIR)\src\minidriver\opensc-minidriver.dll" Vital="yes"/>
@@ -76 +73 @@
             <!-- Tools have their own folder -->
             <Directory Id="INSTALLDIR_TOOLS" Name="tools">
+              <Component Id="opensc.dll" Guid="*" Win64="$(var.Win64YesNo)">
+                <File Source="$(var.SOURCE_DIR)\src\libopensc\opensc.dll" Vital="yes"/>
+              </Component>
               <Component Id="opensc_explorer.exe" Guid="*" Win64="$(var.Win64YesNo)">
                 <File Source="$(var.SOURCE_DIR)\src\tools\opensc-explorer.exe" Vital="yes"/>