Unifies project wide vendor/product strings
This commit is contained in:
Frank Morgner
parent
cc6d7677da
commit
69783f4e6c
21
configure.ac
21
configure.ac
|
|
@ -4,7 +4,7 @@ AC_PREREQ(2.60)
|
|||
|
||||
define([PRODUCT_NAME], [OpenSC])
|
||||
define([PRODUCT_TARNAME], [opensc])
|
||||
define([PRODUCT_BUGREPORT], [opensc-devel@lists.sourceforge.net])
|
||||
define([PRODUCT_BUGREPORT], [https://github.com/OpenSC/OpenSC/issues])
|
||||
define([PACKAGE_VERSION_MAJOR], [0])
|
||||
define([PACKAGE_VERSION_MINOR], [15])
|
||||
define([PACKAGE_VERSION_FIX], [0])
|
||||
|
|
@ -13,8 +13,11 @@ define([PACKAGE_VERSION_REVISION], [0])
|
|||
|
||||
define([VS_FF_LEGAL_COPYRIGHT], [OpenSC Project])
|
||||
define([VS_FF_LEGAL_COMPANY_NAME], [OpenSC Project])
|
||||
define([VS_FF_LEGAL_COMPANY_URL], [https://github.com/OpenSC])
|
||||
define([VS_FF_COMMENTS], [Provided under the terms of the GNU Lesser General Public License (LGPLv2.1+).])
|
||||
define([VS_FF_PRODUCT_NAME], [OpenSC smartcard framework])
|
||||
define([VS_FF_PRODUCT_UPDATES], [https://github.com/OpenSC/OpenSC/releases])
|
||||
define([VS_FF_PRODUCT_URL], [https://github.com/OpenSC/OpenSC])
|
||||
|
||||
m4_include(version.m4)
|
||||
m4_sinclude(version.m4.ci)
|
||||
|
|
@ -32,8 +35,11 @@ OPENSC_VERSION_REVISION="PACKAGE_VERSION_REVISION"
|
|||
|
||||
OPENSC_VS_FF_LEGAL_COPYRIGHT="VS_FF_LEGAL_COPYRIGHT"
|
||||
OPENSC_VS_FF_COMPANY_NAME="VS_FF_LEGAL_COMPANY_NAME"
|
||||
OPENSC_VS_FF_COMPANY_URL="VS_FF_LEGAL_COMPANY_URL"
|
||||
OPENSC_VS_FF_COMMENTS="VS_FF_COMMENTS"
|
||||
OPENSC_VS_FF_PRODUCT_NAME="VS_FF_PRODUCT_NAME"
|
||||
OPENSC_VS_FF_PRODUCT_UPDATES="VS_FF_PRODUCT_UPDATES"
|
||||
OPENSC_VS_FF_PRODUCT_URL="VS_FF_PRODUCT_URL"
|
||||
|
||||
# LT Version numbers, remember to change them just *before* a release.
|
||||
# (Code changed: REVISION++)
|
||||
|
|
@ -654,6 +660,9 @@ AC_DEFINE_UNQUOTED([OPENSC_VS_FF_LEGAL_COPYRIGHT], [${OPENSC_VS_FF_LEGAL_COPYRIG
|
|||
AC_DEFINE_UNQUOTED([OPENSC_VS_FF_COMPANY_NAME], [${OPENSC_VS_FF_COMPANY_NAME}], [OpenSC version-info CompanyName value])
|
||||
AC_DEFINE_UNQUOTED([OPENSC_VS_FF_COMMENTS], [${OPENSC_VS_FF_COMMENTS}], [OpenSC version-info Comments])
|
||||
AC_DEFINE_UNQUOTED([OPENSC_VS_FF_PRODUCT_NAME], [${OPENSC_VS_FF_PRODUCT_NAME}], [OpenSC version-info ProductName])
|
||||
AC_DEFINE_UNQUOTED([OPENSC_VS_FF_PRODUCT_UPDATES], [${OPENSC_VS_FF_PRODUCT_UPDATES}], [OpenSC version-info UpdateURL])
|
||||
AC_DEFINE_UNQUOTED([OPENSC_VS_FF_PRODUCT_URL], [${OPENSC_VS_FF_PRODUCT_URL}], [OpenSC version-info ProductURL])
|
||||
AC_DEFINE_UNQUOTED([OPENSC_VS_FF_COMPANY_URL], [${OPENSC_VS_FF_COMPANY_URL}], [OpenSC version-info UpdateURL])
|
||||
|
||||
pkcs11dir="\$(libdir)/pkcs11"
|
||||
|
||||
|
|
@ -667,6 +676,9 @@ AC_SUBST([OPENSC_VS_FF_LEGAL_COPYRIGHT])
|
|||
AC_SUBST([OPENSC_VS_FF_COMPANY_NAME])
|
||||
AC_SUBST([OPENSC_VS_FF_COMMENTS])
|
||||
AC_SUBST([OPENSC_VS_FF_PRODUCT_NAME])
|
||||
AC_SUBST([OPENSC_VS_FF_PRODUCT_UPDATES])
|
||||
AC_SUBST([OPENSC_VS_FF_PRODUCT_URL])
|
||||
AC_SUBST([OPENSC_VS_FF_COMPANY_URL])
|
||||
AC_SUBST([OPENSC_LT_CURRENT])
|
||||
AC_SUBST([OPENSC_LT_REVISION])
|
||||
AC_SUBST([OPENSC_LT_AGE])
|
||||
|
|
@ -757,13 +769,16 @@ OpenSC has been configured with the following options:
|
|||
|
||||
|
||||
Version: ${PACKAGE_VERSION}
|
||||
Version fix: ${OPENSC_VERSION_FIX}
|
||||
Version revision: ${OPENSC_VERSION_REVISION}
|
||||
Version fix: ${OPENSC_VERSION_FIX}
|
||||
Version revision: ${OPENSC_VERSION_REVISION}
|
||||
|
||||
Copyright: ${OPENSC_VS_FF_LEGAL_COPYRIGHT}
|
||||
Company: ${OPENSC_VS_FF_COMPANY_NAME}
|
||||
Company URL: ${OPENSC_VS_FF_COMPANY_URL}
|
||||
Comments: ${OPENSC_VS_FF_COMMENTS}
|
||||
Product name: ${OPENSC_VS_FF_PRODUCT_NAME}
|
||||
Product updates: ${OPENSC_VS_FF_PRODUCT_UPDATES}
|
||||
Product URL: ${OPENSC_VS_FF_PRODUCT_URL}
|
||||
|
||||
User binaries: $(eval eval eval echo "${bindir}")
|
||||
Configuration files: $(eval eval eval echo "${sysconfdir}")
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
[Setup]
|
||||
AppName=OpenSC
|
||||
AppVerName=OpenSC @PACKAGE_VERSION@
|
||||
AppPublisher=OpenSC Project
|
||||
AppPublisherURL=http://www.opensc-project.org/
|
||||
AppSupportURL=http://www.opensc-project.org/opensc/
|
||||
AppUpdatesURL=http://www.opensc-project.org/opensc/
|
||||
AppName=@OPENSC_VS_FF_PRODUCT_NAME@
|
||||
AppVerName=@OPENSC_VS_FF_PRODUCT_NAME@ @PACKAGE_VERSION@
|
||||
AppPublisher=@OPENSC_VS_FF_LEGAL_COMPANY_NAME@
|
||||
AppPublisherURL=@OPENSC_VS_FF_COMPANY_URL@
|
||||
AppSupportURL=@PRODUCT_BUGREPORT@
|
||||
AppUpdatesURL=@OPENSC_VS_FF_PRODUCT_UPDATES@
|
||||
DefaultDirName={pf}\OpenSC Project\OpenSC
|
||||
OutputBaseFilename=OpenSC-@PACKAGE_VERSION@
|
||||
Compression=lzma/normal
|
||||
|
|
@ -22,10 +22,10 @@ AppendDefaultDirName=false
|
|||
AppVersion=@PACKAGE_VERSION@
|
||||
VersionInfoVersion=@OPENSC_VERSION_MAJOR@.@OPENSC_VERSION_MINOR@.@OPENSC_VERSION_FIX@
|
||||
VersionInfoDescription=OpenSC tools and libraries
|
||||
VersionInfoTextVersion=v@PACKAGE_VERSION@
|
||||
VersionInfoTextVersion=@PACKAGE_VERSION@
|
||||
DisableReadyPage=true
|
||||
InternalCompressLevel=max
|
||||
VersionInfoCopyright=2010 OpenSC Project
|
||||
VersionInfoCopyright=@OPENSC_VS_FF_LEGAL_COPYRIGHT@
|
||||
DisableStartupPrompt=true
|
||||
AlwaysShowComponentsList=false
|
||||
ShowComponentSizes=false
|
||||
|
|
@ -42,11 +42,11 @@ DefaultGroupName=OpenSC
|
|||
[Tasks]
|
||||
|
||||
[Files]
|
||||
Source: opensc\*.profile; DestDir: {app}\profiles
|
||||
Source: opensc\*.dll; DestDir: {sys}; Flags: overwritereadonly replacesameversion ignoreversion uninsnosharedfileprompt restartreplace
|
||||
Source: opensc\*.exe; DestDir: {app}; Flags: overwritereadonly replacesameversion ignoreversion
|
||||
Source: opensc\share\opensc\*.profile; DestDir: {app}\profiles
|
||||
Source: opensc\bin\*.dll; DestDir: {sys}; Flags: overwritereadonly replacesameversion ignoreversion uninsnosharedfileprompt restartreplace
|
||||
Source: opensc\bin\*.exe; DestDir: {app}; Flags: overwritereadonly replacesameversion ignoreversion
|
||||
Source: engine_pkcs11\*.dll; DestDir: {sys}; Components: OpenSSL_engine; Flags: overwritereadonly replacesameversion ignoreversion
|
||||
Source: opensc.conf; DestDir: {app};
|
||||
Source: opensc\etc\opensc.conf; DestDir: {app};
|
||||
;Source: www.opensc-project.org.url; DestDir: {app}
|
||||
[Icons]
|
||||
;Name: {group}\OpenSC Project website; Filename: {app}\www.opensc-project.org.url; Comment: Go to OpenSC Project website; Components:
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
<?xml version="1.0" encoding="windows-1252"?>
|
||||
<?if $(var.Platform) = x64 ?>
|
||||
<?define ProductName = "OpenSC (64bit)" ?>
|
||||
<?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@ (64bit)" ?>
|
||||
<?define Win64YesNo="yes" ?>
|
||||
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
|
||||
<?define PlatformSystemFolder = "System64Folder" ?>
|
||||
<?define PlatformUpgradeCode = "{9A449570-69A2-11E0-9CC6-955B4824019B}" ?>
|
||||
<?else ?>
|
||||
<?define ProductName = "OpenSC" ?>
|
||||
<?define ProductName = "@OPENSC_VS_FF_PRODUCT_NAME@" ?>
|
||||
<?define Win64YesNo="no" ?>
|
||||
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
|
||||
<?define PlatformSystemFolder = "SystemFolder" ?>
|
||||
|
|
@ -20,11 +20,11 @@
|
|||
Language="1033"
|
||||
Codepage="1252"
|
||||
Version="@OPENSC_VERSION_MAJOR@.@OPENSC_VERSION_MINOR@.@OPENSC_VERSION_FIX@.0"
|
||||
Manufacturer="OpenSC Project">
|
||||
Manufacturer="@OPENSC_VS_FF_COMPANY_NAME@">
|
||||
<Package Platform="$(var.Platform)"
|
||||
Description="OpenSC Installer"
|
||||
Comments="OpenSC Project home page https://github.com/OpenSC/OpenSC/wiki"
|
||||
Manufacturer="OpenSC Project"
|
||||
Description="@VS_FF_PRODUCT_NAME@ Installer"
|
||||
Comments="@OPENSC_VS_FF_COMMENTS@"
|
||||
Manufacturer="@OPENSC_VS_FF_COMPANY_NAME@"
|
||||
InstallerVersion="300"
|
||||
Languages="1033"
|
||||
Compressed="yes"
|
||||
|
|
@ -36,10 +36,10 @@
|
|||
<WixVariable Id="WixUIBannerBmp" Value="bannrbmp.bmp"/>
|
||||
<WixVariable Id="WixUIDialogBmp" Value="dlgbmp.bmp"/>
|
||||
<!-- Links in info -->
|
||||
<Property Id="ARPHELPLINK" Value="http://www.opensc-project.org/opensc/wiki/ReportingBugs"/>
|
||||
<Property Id="ARPURLINFOABOUT" Value="http://www.opensc-project.org/"/>
|
||||
<Property Id="ARPURLUPDATEINFO" Value="http://www.opensc-project.org/opensc/wiki/WindowsInstaller"/>
|
||||
<Property Id="ARPCONTACT" Value="OpenSC"/>
|
||||
<Property Id="ARPHELPLINK" Value="@PRODUCT_BUGREPORT@"/>
|
||||
<Property Id="ARPURLINFOABOUT" Value="@OPENSC_VS_FF_PRODUCT_URL@"/>
|
||||
<Property Id="ARPURLUPDATEINFO" Value="@OPENSC_VS_FF_PRODUCT_UPDATES@"/>
|
||||
<Property Id="ARPCONTACT" Value="@OPENSC_VS_FF_COMPANY_URL@"/>
|
||||
|
||||
<Icon Id="OpenSC.ico" SourceFile="OpenSC.ico" />
|
||||
<Property Id="ARPPRODUCTICON" Value="OpenSC.ico" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue