*** empty log message ***

This commit is contained in:
chris 2002-09-30 21:06:52 +00:00
parent 3b37dbeff5
commit d90ff7085d
5 changed files with 116 additions and 97 deletions

View File

@ -102,7 +102,7 @@
#endif
#ifdef WIN32
#define VER "0.2.5-win"
#define VER "0.2.6-win"
#endif

View File

@ -74,7 +74,7 @@ NewX509::NewX509(QWidget *parent , const char *name, db_key *key, db_x509req *re
QRegExpValidator validator( rx, 0 );
countryName->setValidator( &validator );
// pretty fat Title :-)
QFont tFont = getFont();
QFont tFont;// = getFont();
tFont.setPointSize(14);
tFont.setBold(true);
tFont.setUnderline(true);

View File

@ -1,4 +1,4 @@
AC_INIT(xca, 0.2.5)
AC_INIT(xca, 0.2.6)
AC_CONFIG_SRCDIR([MainWindow.h])
AC_CONFIG_HEADERS([config.h])
@ -26,7 +26,7 @@ AC_CHECK_HEADERS([db4/db_cxx.h db3/db_cxx.h db/db_cxx.h db_cxx.h],[H_DB=y;break]
if test "$H_DB" == no; then
AC_MSG_ERROR([Berkeley DB header files not found (Redhat 7.3 users should have a look at www.hohnstaedt.de/xca for a workaround)])
fi
AC_CHECK_HEADER([qaccessible.h])
AC_CHECK_HEADERS([qaccessible.h])
AC_LANG(C)
# Checks for libraries.

201
xca.nsi
View File

@ -1,91 +1,110 @@
; xca.nsi
;
; This is the .nsi script for creating the nullsoft windows installer
; The name of the installer
Name "X CA"
Caption "X Certification Authority"
; The licenseagreement
LicenseText "You must accept the following BSD like license to continue."
LicenseData COPYRIGHT
; The file to write
OutFile "xca.exe"
; The default installation directory
InstallDir $PROGRAMFILES\xca
; Registry key to check for directory (so if you install again, it will
; overwrite the old one automatically)
InstallDirRegKey HKLM SOFTWARE\xca "Install_Dir"
; The text to prompt the user to enter a directory
ComponentText "This will install the X Certification Authority (c) 2002 by Christian@Hohnstaedt.de"
; The text to prompt the user to enter a directory
DirText "Choose a directory to install in to:"
; The stuff to install
Section "xca (required)"
; Set output path to the installation directory.
SetOutPath $INSTDIR
; Put file there
File "Release\xca.exe"
File "img\bigcert.png"
File "img\bigcsr.png"
File "img\bigkey.png"
File "img\bigtemp.png"
File "img\halfkey.png"
File "img\invalidcert.png"
File "img\invalidcertkey.png"
File "img\key.png"
File "img\req.png"
File "img\reqkey.png"
File "img\template.png"
File "img\validcert.png"
File "img\validcertkey.png"
File "c:\devel\db-4.0.14\build_win32\Release\libdb40.dll"
File "c:\devel\openssl-0.9.6g\out32dll\Release\SSLeay32.dll"
File "c:\devel\openssl-0.9.6g\out32dll\Release\libeay32.dll"
File "e:\win\qt2\bin\msvcrt.dll"
File "c:\windows\system\msvcp60.dll"
File "e:\win\qt2\bin\qt-mt230nc.dll"
; Write the installation path into the registry
WriteRegStr HKLM SOFTWARE\xca "Install_Dir" "$INSTDIR"
; Write the uninstall keys for Windows
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\xca" "DisplayName" "X CA (remove only)"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\xca" "UninstallString" '"$INSTDIR\uninstall.exe"'
WriteUninstaller "uninstall.exe"
SectionEnd
; optional section
Section "Start Menu Shortcuts"
CreateDirectory "$SMPROGRAMS\xca"
CreateShortCut "$SMPROGRAMS\xca\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
CreateShortCut "$SMPROGRAMS\xca\xca xca.lnk" "$INSTDIR\xca.exe" "" "$INSTDIR\xca.exe" 0
SectionEnd
; uninstall stuff
UninstallText "This will uninstall xca. Hit next to continue."
; special uninstall section.
Section "Uninstall"
; remove registry keys
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\xca"
DeleteRegKey HKLM SOFTWARE\xca
; remove files
Delete $INSTDIR\xca.exe
; MUST REMOVE UNINSTALLER, too
Delete $INSTDIR\uninstall.exe
; remove shortcuts, if any.
Delete "$SMPROGRAMS\xca\*.*"
; remove directories used.
RMDir "$SMPROGRAMS\xca"
;RMDir "$INSTDIR" NO, we keep the databasefiles xca.db
Delete "$INSTDIR\xca\*.png"
Delete "$INSTDIR\xca\*.dll"
SectionEnd
; eof
; xca.nsi
;
; This is the .nsi script for creating the nullsoft windows installer
; The name of the installer
Name "X CA"
Caption "X Certification Authority"
; The licenseagreement
LicenseText "You must accept the following BSD like license to continue."
LicenseData COPYRIGHT
; The file to write
OutFile "xca.exe"
; The default installation directory
InstallDir $PROGRAMFILES\xca
; Registry key to check for directory (so if you install again, it will
; overwrite the old one automatically)
InstallDirRegKey HKLM SOFTWARE\xca "Install_Dir"
; The text to prompt the user to enter a directory
ComponentText "This will install the X Certification Authority (c) 2002 by Christian@Hohnstaedt.de"
; The text to prompt the user to enter a directory
DirText "Choose a directory to install in to:"
; The stuff to install
Section "xca (required)"
; Set output path to the installation directory.
SetOutPath $INSTDIR
; Put file there
File "Release\xca.exe"
File "img\bigcert.png"
File "img\bigcsr.png"
File "img\bigkey.png"
File "img\bigtemp.png"
File "img\halfkey.png"
File "img\invalidcert.png"
File "img\invalidcertkey.png"
File "img\key.png"
File "img\req.png"
File "img\reqkey.png"
File "img\template.png"
File "img\validcert.png"
File "img\validcertkey.png"
File "c:\devel\db-4.0.14\build_win32\Release\libdb40.dll"
File "c:\devel\openssl-0.9.6g\out32dll\Release\SSLeay32.dll"
File "c:\devel\openssl-0.9.6g\out32dll\Release\libeay32.dll"
File "e:\win\qt2\bin\msvcrt.dll"
File "c:\windows\system\msvcp60.dll"
File "e:\win\qt2\bin\qt-mt230nc.dll"
; Write the installation path into the registry
WriteRegStr HKLM SOFTWARE\xca "Install_Dir" "$INSTDIR"
; Write the uninstall keys for Windows
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\xca" "DisplayName" "X CA (remove only)"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\xca" "UninstallString" '"$INSTDIR\uninstall.exe"'
WriteUninstaller "uninstall.exe"
SectionEnd
; optional section
Section "Start Menu Shortcuts"
CreateDirectory "$SMPROGRAMS\xca"
CreateShortCut "$SMPROGRAMS\xca\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
CreateShortCut "$SMPROGRAMS\xca\xca xca.lnk" "$INSTDIR\xca.exe" "" "$INSTDIR\xca.exe" 0
SectionEnd
; uninstall stuff
UninstallText "This will uninstall xca. Hit next to continue."
; special uninstall section.
Section "Uninstall"
; remove registry keys
DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\xca"
DeleteRegKey HKLM SOFTWARE\xca
; remove files
Delete $INSTDIR\xca.exe
; MUST REMOVE UNINSTALLER, too
Delete $INSTDIR\uninstall.exe
; remove shortcuts, if any.
Delete "$SMPROGRAMS\xca\*.*"
; remove directories used.
RMDir "$SMPROGRAMS\xca"
;RMDir "$INSTDIR" NO, we keep the databasefiles xca.db
Delete "$INSTDIR\xca\*.png"
Delete "$INSTDIR\xca\*.dll"
Delete "$INSTDIR\bigcert.png"
Delete "$INSTDIR\bigcsr.png"
Delete "$INSTDIR\bigkey.png"
Delete "$INSTDIR\bigtemp.png"
Delete "$INSTDIR\halfkey.png"
Delete "$INSTDIR\invalidcert.png"
Delete "$INSTDIR\invalidcertkey.png"
Delete "$INSTDIR\key.png"
Delete "$INSTDIR\req.png"
Delete "$INSTDIR\reqkey.png"
Delete "$INSTDIR\template.png"
Delete "$INSTDIR\validcert.png"
Delete "$INSTDIR\validcertkey.png"
Delete "$INSTDIR\libdb40.dll"
Delete "$INSTDIR\SSLeay32.dll"
Delete "$INSTDIR\libeay32.dll"
Delete "$INSTDIR\msvcrt.dll"
Delete "$INSTDIR\msvcp60.dll"
Delete "$INSTDIR\qt-mt230nc.dll"
SectionEnd
; eof

View File

@ -1,5 +1,5 @@
HEADERS = CertDetail_UI.h ExportKey.h KeyDetail_UI.h MainWindow.h NewKey_UI.h NewX509.h PassRead_UI.h PassWrite_UI.h ReqDetail_UI.h TrustState_UI.h lib/db_base.h lib/db_key.h lib/db_temp.h lib/db_x509.h lib/db_x509req.h lib/pki_base.h lib/pki_key.h lib/pki_pkcs12.h lib/pki_temp.h lib/pki_x509.h lib/pki_x509req.h
SOURCES = ExportKey.cpp MainWindow.cpp MainWindowKeys.cpp MainWindowTemps.cpp MainWindowX509.cpp MainWindowX509Req.cpp NewX509.cpp main.cpp lib/db_base.cpp lib/db_key.cpp lib/db_temp.cpp lib/db_x509.cpp lib/db_x509req.cpp lib/pki_base.cpp lib/pki_key.cpp lib/pki_pkcs12.cpp lib/pki_temp.cpp lib/pki_x509.cpp lib/pki_x509req.cpp
HEADERS = ExportKey.h MainWindow.h NewX509.h lib/db_base.h lib/db_key.h lib/db_temp.h lib/db_x509.h lib/db_x509req.h lib/pki_base.h lib/pki_crl.h lib/pki_key.h lib/pki_pkcs12.h lib/pki_temp.h lib/pki_x509.h lib/pki_x509req.h
SOURCES = ExportKey.cpp MainWindow.cpp MainWindowKeys.cpp MainWindowTemps.cpp MainWindowX509.cpp MainWindowX509Req.cpp NewX509.cpp main.cpp lib/db_base.cpp lib/db_key.cpp lib/db_temp.cpp lib/db_x509.cpp lib/db_x509req.cpp lib/pki_base.cpp lib/pki_crl.cpp lib/pki_key.cpp lib/pki_pkcs12.cpp lib/pki_temp.cpp lib/pki_x509.cpp lib/pki_x509req.cpp
FORMS = CertDetail.ui ExportKey_UI.ui KeyDetail.ui MainWindow_UI.ui NewKey.ui NewX509_UI.ui PassRead.ui PassWrite.ui ReqDetail.ui TrustState.ui
TRANSLATIONS = xca_de.ts xca_es.ts
TARGET = xca