martin
1c244f8644
WindowsInstaller: fix "parallel installs"
...
Before this change, installing a new MSI would create a new OpenSC entry in "Add/Remove programs".
Now correctly a single instance exists and a seamless upgrade can be done.
Make the URL-s for support information more specific and add the OpenSC icon to the programs list.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5358 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-18 09:29:15 +00:00
martin
4072b2bc0d
WindowsInstaller: fix x86 build after r5351
...
error CNDL0150 : Undefined preprocessor variable '$(var.PlatformProgramFilesFolder)'.
NMAKE : fatal error U1077: '"C:\Program Files\Windows Installer XML v3.6\bin\candle.exe"' : return code '0x96'
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5354 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-17 16:58:09 +00:00
martin
b0c200c885
WindowsInstaller: Always use a canonical name for OpenSC related registry entries.
...
This fixes the 64bit build looking for registry keys under "OpenSC (64 bit)" which is the name of the package.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5353 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-17 16:12:03 +00:00
martin
15d6ecddc6
WindowsInstaller: One more fix for x64 installer: opensc.conf
...
c:\jenkins\workspace\OpenSC_win64_nightly\win32\OpenSC.wxs(61) : error LGHT0204 : ICE80: This 32BitComponent opensc.conf uses 64BitDirectory INSTALLDIR
NMAKE : fatal error U1077: '"C:\Program Files (x86)\Windows Installer XML v3.6\bin\light.exe"' : return code '0xcc'
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5352 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-17 13:18:11 +00:00
martin
5ccfeddf46
WindowsInstaller: Add win64 flag even to platform-independent files.
...
* Install to "System64Folder" on x64
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5351 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-17 13:05:47 +00:00
martin
82258b01f7
WindowsInstaller: fix typo, causing the x86 installer to claim to be x64
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5350 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-17 12:50:30 +00:00
martin
e2aac209d2
WindowsInstaller: amend r5345, Win64 is a property of a Component, not File
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5347 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-16 14:25:21 +00:00
martin
3e20fab565
Add back removed product name
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5346 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-16 14:14:56 +00:00
martin
af098605d7
WindowsInstaller: set Win64 flag for binaries when building for win64 and use the right program files folder.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5345 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-16 14:10:07 +00:00
martin
7c17247446
WindowsInstaller: enable zlib by default.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5330 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-12 07:48:53 +00:00
martin
44cf3d06ae
MiniDriver: rename cardmod to minidriver in source.
...
Also change some grammar, whitespace (reported by git) and wording (Opensc->OpenSC) issues.
Add some comments here and there.
See http://www.opensc-project.org/pipermail/opensc-devel/2011-April/016261.html
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5329 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-12 07:40:12 +00:00
martin
639ca655b6
WindowsInstaller: Correct support for x64 builds
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5327 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-11 14:42:48 +00:00
vtarasov
4ec415f605
msi: no need backslash after [INSTALLDIR]
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5307 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-07 17:14:56 +00:00
martin
0961818a8f
WindowsInstaller: remove variable, added too early.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5296 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-06 08:22:15 +00:00
martin
25c2d497b2
WindowsInstaller: reduce the warning level, parsing error output on level 4 takes Jenkins warnings plugin 25 minutes.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5295 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-06 08:10:25 +00:00
martin
dbaad0ab94
WindowsInstaller: Simplify the wix script even further. Thanks to Kalev Lember.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5294 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-06 08:07:57 +00:00
martin
db3ebb1514
WindowsInstaller: set the product version programmatically for MSI
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5293 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-04 10:35:28 +00:00
martin
1f5534323e
WindowsInstaller: display the LGPL license in the installer.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5292 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-04 08:29:30 +00:00
martin
5162ec0634
WindowsInstaller: re-work WiX installer file for OpenSC. Add meaningful components.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5291 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-04 08:04:16 +00:00
martin
2c5583513b
WindowsInstaller: Using /Wall was a bad idea, use /W4 instead.
...
http://stackoverflow.com/questions/4001736/what-with-the-thousands-of-warnings-in-standard-headers-in-msvc-wall
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5290 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-04 08:04:10 +00:00
martin
282f6dc6db
Enable all warnings on MSVC
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5289 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-04 07:44:19 +00:00
martin
ccee81d8a2
WindowsInstaller: create an internet shortcut to start menu. Wix invocation change.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5288 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-04 06:42:34 +00:00
martin
d0639e0776
WindowsInstaller: Separate makefile changes for building for x64 and building on x64.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5287 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-03 07:41:56 +00:00
martin
ea7eb699e5
WindowsInstaller: build for x64 with nmake -f Makefile.mak BUILD_TYPE=WIN64
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5286 c6295689-39f2-0310-b995-f0e70906c6a9
2011-04-01 08:06:25 +00:00
martin
5ab9919610
WindowsInstaller: link against crypt32.lib
...
libeay32MT.lib(e_capi.obj) : error LNK2019: unresolved external symbol __imp__CertFreeCertificateContext@4 referenced in function _capi_free_key
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5285 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-31 12:04:57 +00:00
martin
223a8b90e5
WindowsInstaller: tune for default build
...
* remove opensc-msi folder, everything related to building on/for Windows is in /win32
* OpenSC shall be built in static mode
* set default paths for OpenSSL Win32 installer locations
* build with OpenSSL by default
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5284 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-31 11:28:29 +00:00
martin
b6c606ad91
WindowsInstaller: opensc.conf is (incorrectly) generated with make. This is not run on Windows. Use opensc.conf.in as the template for the *example* config file on Windows.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5283 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-31 10:34:12 +00:00
martin
f6ac8b6f56
WindowsInstaller: fix .ico path. Everything related to building on/for Windows is in win32/
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5282 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-31 10:24:28 +00:00
martin
f2fac5b7b5
WindowsInstaller: Build MSI by default on native Windows build.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5281 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-31 09:18:23 +00:00
vtarasov
d174edf1d2
msi: fix component ID of the rutoken profiles
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5227 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-12 15:17:02 +00:00
vtarasov
dda747f8fc
msi: include 'cardmod.dll' and 'rutoken' PKCS#15 profiles into MSI
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5226 c6295689-39f2-0310-b995-f0e70906c6a9
2011-03-12 14:20:13 +00:00
dengert
c5b2b021be
opensc-cardmod.dll can now by built as "static"
...
using the VS. The dll will contain all of OpenSC,
OpenSSL and zlib in a single dll, and thus can
reside anywere. Without this, winlogin would require
it to reside in system32.
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5212 c6295689-39f2-0310-b995-f0e70906c6a9
2011-02-18 20:48:22 +00:00
vtarasov
47b1c9a86d
opensc-msi: do not install libltdl
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5209 c6295689-39f2-0310-b995-f0e70906c6a9
2011-02-17 17:26:43 +00:00
martin
ffb46d2573
core: reanimate the sc_dlopen API for dynamic loading
...
* shift libpkcs11 from src/pkcs11 to src/common as it is not used to implement the OpenSC PKCS#11 module
* invent a "libscdl" mini library that implements either libltdl based dynamic loading or uses native interfaces
* drop hard requirement for libltl to build OpenSC
* native Windows build does not need libltdl any more
* specify CNGSDK include dir to find cardmod.h. CNGSDK only registers with a handful of compilers
Deals with #323
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5201 c6295689-39f2-0310-b995-f0e70906c6a9
2011-02-16 19:02:11 +00:00
martin
3dce2e08d4
WindowsInstaller: generate OpenSC.iss with autotools
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5008 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-30 15:10:06 +00:00
vtarasov
1a58c429cb
'AuthentIC': basic support of Oberthur's 'COSMO.v7/AuthentIC.v3.2' ...
...
it's the natively PKCS#15 card
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@5006 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-30 14:40:28 +00:00
martin
72c0474dde
Prepare for 0.12.0
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4980 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-22 17:12:11 +00:00
martin
7f32e7a079
Build 0.12.0-rc2
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4961 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-17 10:15:11 +00:00
vtarasov
26df6abcd9
win32: default install dir 'Program Files\OpenSC Project\OpenSC'
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4941 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-12 11:40:42 +00:00
vtarasov
af8e8dc815
win32: path to OpenSC registry keys have been changed
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4936 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-09 09:38:10 +00:00
vtarasov
ad60428d09
win32: build MSI
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4932 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-09 09:16:03 +00:00
martin
f5e21e0ba0
Complete change, SIMCLIST_DUMPRESTORE is by default off.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4925 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-06 18:35:43 +00:00
vtarasov
d775407327
win32: when cleaning delete also manifest files
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4921 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-06 15:49:49 +00:00
vtarasov
04c5cb955b
win32: control from Make.rules.mak the including of 'cardmod'
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4920 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-06 15:47:03 +00:00
vtarasov
e353c1bf2f
win32: 'netkey' and 'westcos' tools are OpenSSL dependents
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4919 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-06 15:20:19 +00:00
vtarasov
31a33d0b1e
win32: _PATH_MAX not defined when compiling with VS ...
...
use instead the standard FILENAME_MAX
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4909 c6295689-39f2-0310-b995-f0e70906c6a9
2010-12-06 08:31:59 +00:00
martin
c4a9ab6732
WindowsInstaller: overwrite files with same version to allow nightly builds; replace and delete blocked files on a reboot.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4887 c6295689-39f2-0310-b995-f0e70906c6a9
2010-11-29 08:51:17 +00:00
martin
2d6e3bd262
EstonianEid: remove the iconv dependency and use the common name from the certificate as the card label.
...
This makes it universal, as some cards don't have the personal data file (Digi-ID)
It also makes it a bit ugly, as the common name is the name and personal ID code
concatenated like "FIRSTNAME,LASTNAME,123456789"
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4817 c6295689-39f2-0310-b995-f0e70906c6a9
2010-10-19 11:25:25 +00:00
martin
61572d590a
WindowsInstaller: be flexible with make dist result name.
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4796 c6295689-39f2-0310-b995-f0e70906c6a9
2010-10-06 07:53:59 +00:00
martin
dcd077243f
WindowsInstaller: simplify the installer creation process
...
git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4794 c6295689-39f2-0310-b995-f0e70906c6a9
2010-10-06 07:10:50 +00:00