[Pcsclite-cvs-commit] CVS muscleTool/win32
CVS User ohme-guest
ludovic.rousseau at free.fr
Sun Aug 7 15:52:53 UTC 2005
Update of /cvsroot/muscleapps/muscleTool/win32
In directory haydn:/tmp/cvs-serv10211/win32
Modified Files:
MuscleTools.dsp
Added Files:
MuscleTools.dsw MuscleTools.mak MuscleTools.sln
MuscleTools.vcproj
Log Message:
- genkeys can generate RSA, DSA and RSA-CRT keys
- crypt supports any combination of possible key - cipher - signature
algorithms Java Card 2.1.1 offers and the card is capable
- crypt can read from file and write output to file
- Included man page in Makefile.am
- improved autoconf checks
- general usability improved
- support for version 2.0 of MuscleCard library, MuscleCard Plug-In, Card
Edge 2.0
- enter PIN with keypad
- deletekey command
- deletepin command
- resume supports returns new capabilities
- AES support
- extended format command
--- /cvsroot/muscleapps/muscleTool/win32/MuscleTools.dsp 2002/05/07 23:21:41 1.2
+++ /cvsroot/muscleapps/muscleTool/win32/MuscleTools.dsp 2005/08/07 15:52:52 1.3
@@ -1,24 +1,24 @@
# Microsoft Developer Studio Project File - Name="MuscleTools" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
+# ** NICHT BEARBEITEN **
# TARGTYPE "Win32 (x86) Console Application" 0x0103
CFG=MuscleTools - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
+!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
+!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "MuscleTools.mak".
!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
+!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
!MESSAGE NMAKE /f "MuscleTools.mak" CFG="MuscleTools - Win32 Debug"
!MESSAGE
-!MESSAGE Possible choices for configuration are:
+!MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
-!MESSAGE "MuscleTools - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "MuscleTools - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "MuscleTools - Win32 Release" (basierend auf "Win32 (x86) Console Application")
+!MESSAGE "MuscleTools - Win32 Debug" (basierend auf "Win32 (x86) Console Application")
!MESSAGE
# Begin Project
@@ -42,7 +42,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\PCSC\src\PCSC" /I "E:\quarantine\pthread\pthreads" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -51,7 +51,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 pthreadVC.lib musclecard.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 pthreadVC.lib musclecard.lib /nologo /subsystem:console /machine:I386 /libpath:"E:\quarantine\pthread\pthreads" /libpath:"..\..\PCSC\win32\Release"
# Begin Special Build Tool
SOURCE="$(InputPath)"
PostBuild_Cmds=copy Release\muscleTools.exe ..\..\win32bin
@@ -71,7 +71,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\PCSC\src\PCSC" /I "E:\quarantine\pthread\pthreads" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -80,7 +80,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 pthreadVC.lib musclecard.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 pthreadVC.lib musclecard.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"E:\quarantine\pthread\pthreads" /libpath:"..\..\PCSC\win32\Debug"
# Begin Special Build Tool
SOURCE="$(InputPath)"
PostBuild_Cmds=copy Debug\muscleTools.exe ..\..\win32bin
@@ -97,6 +97,10 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
+SOURCE=..\help.c
+# End Source File
+# Begin Source File
+
SOURCE=..\muscleTool.c
!IF "$(CFG)" == "MuscleTools - Win32 Release"
@@ -109,10 +113,30 @@
!ENDIF
# End Source File
+# Begin Source File
+
+SOURCE=..\parser.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\scanner.c
+# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=..\help.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\muscleTool.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\parser.h
+# End Source File
# End Group
# Begin Group "Resource Files"
--- /cvsroot/muscleapps/muscleTool/win32/MuscleTools.dsw 2005/08/07 15:52:53 NONE
+++ /cvsroot/muscleapps/muscleTool/win32/MuscleTools.dsw 2005/08/07 15:52:53 1.1
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GELÖSCHT WERDEN!
###############################################################################
Project: "MuscleTools"=".\MuscleTools.dsp" - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################
--- /cvsroot/muscleapps/muscleTool/win32/MuscleTools.mak 2005/08/07 15:52:53 NONE
+++ /cvsroot/muscleapps/muscleTool/win32/MuscleTools.mak 2005/08/07 15:52:53 1.1
!MESSAGE
!MESSAGE Possible Targets:
!MESSAGE ALL [DEBUG=] - Build version.
!MESSAGE CLEAN - Delete Debug and Release directories
!MESSAGE
!MESSAGE MUSCLECARD_INC - Path to MuscleCard includes
!MESSAGE MUSCLECARD_LIB - Path to MuscleCard link library (.lib)
!MESSAGE PTHREADS_INC - Path to pthreads includes
!MESSAGE PTHREADS_LIB - Path to pthreads library
!MESSAGE PTHREADS_NAME - Name of pthreads library (without extension)
!MESSAGE PCSC_INC - Path to PC/SC Lite includes
!MESSAGE FLEX - Path including file name of the flex executable
!MESSAGE FLEX_INC - Path to shipped flex includes
!MESSAGE BISON - Path including file name of the bison executable
!MESSAGE
# replace with your path to the MuscleCard header files
# or specify on command line
MUSCLECARD_INC=C:\Dokumente und Einstellungen\Widerstand\Eigene Dateien\Uni\Javacard\Muscle\libmusclecard\src\PCSC
!IF !EXIST("$(MUSCLECARD_INC)")
!ERROR Your path to the header files for MuscleCard is wrong. \
Replace it in the Makefile or call nmake with MUSCLECARD_INC=<PATH_TO_MUSCLECARD_HEADERS>
!ENDIF
# replace with your path to the MuscleCard header files
# or specify on command line
PCSC_INC=C:\Dokumente und Einstellungen\Widerstand\Eigene Dateien\Uni\Javacard\Muscle\libmusclecard\src\PCSC\win32
!IF !EXIST("$(PCSC_INC)")
!ERROR Your path to the header files for MuscleCard is wrong. \
Replace it in the Makefile or call nmake with PCSC_INC=<PATH_TO_PCSC_HEADERS>
!ENDIF
# replace with your path to the MuscleCard link library (.lib) file
# or specify on command line excluding the Release or Debug directory
MUSCLECARD_LIB=C:\Dokumente und Einstellungen\Widerstand\Eigene Dateien\Uni\Javacard\Muscle\libmusclecard\win32
!IF !EXIST("$(MUSCLECARD_LIB)")
!ERROR Your path to the link library (.lib) file for MuscleCard \
excluding the Release or Debug directory is wrong \
Replace it in the Makefile or call nmake with MUSCLECARD_LIB=<PATH_TO_MUSCLECARD_LIBS>
!ENDIF
# replace with your path to the Pthreads header files
# or specify on command line
PTHREADS_INC=e:\quarantine\pthread\pthreads
!IF !EXIST("$(PTHREADS_INC)")
!ERROR Your path to the header files for Pthreads is wrong. \
Replace it in the Makefile or call nmake with PTHREADS_INC=<PATH_TO_PTHREADS_HEADERS>
!ENDIF
# replace with your path to the Pthreads library files
# or specify on command line
PTHREADS_LIB=e:\quarantine\pthread\pthreads
!IF !EXIST("$(PTHREADS_LIB)")
!ERROR Your path to the library files for Pthreads is wrong. \
Replace it in the Makefile or call nmake with PTHREADS_LIB=<PATH_TO_PTHREADS_LIBS>
!ENDIF
# replace with your name of the Pthreads library
# or specify on command line
PTHREADS_NAME=pthreadVC
# replace with the location of your flex executable
# or specify at command line
FLEX="e:\Programme\GnuWin32\bin\flex.exe"
# replace with the location of the include directory of your flex distribution
# or specify it at command line
# A file called unistd.h is needed to compile C files generated by flex.
FLEX_INC="e:\Programme\GnuWin32\include"
!IF !EXIST($(FLEX_INC))
!ERROR Your path to the header file needed to compile C files generated by flex is wrong. \
A file called unistd.h is needed to compile C files generated by flex. \
Replace it in the Makefile or call nmake with FLEX_INC=<HEADERS_NEEDED_TO_COMPILE_FLEX_FILES>
!ENDIF
# replace with the location of your bison executable
# or specify at command line
BISON="e:\Programme\GnuWin32\bin\bison.exe"
# Directory name may not contain spaces
DEBUG_OUTDIR=Debug
# Directory name may not contain spaces
RELEASE_OUTDIR=Release
!IFNDEF DEBUG
OUTDIR=$(RELEASE_OUTDIR)
!ELSE
OUTDIR=$(DEBUG_OUTDIR)
!ENDIF
LINK32=link.exe
CPP=cl.exe
ALL : $(OUTDIR)\MuscleTool.exe
CLEAN :
- at rd /S /Q $(DEBUG_OUTDIR)
- at rd /S /Q $(RELEASE_OUTDIR)
$(OUTDIR) :
- at mkdir $(OUTDIR)
LINK32_OBJS= \
$(OUTDIR)\help.obj \
$(OUTDIR)\muscleTool.obj \
$(OUTDIR)\parser.obj \
$(OUTDIR)\scanner.obj
!IFNDEF DEBUG
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "$(MUSCLECARD_INC)" /I "$(PCSC_INC)" /I "$(PTHREADS_INC)" /D "WIN32" \
/D "NDEBUG" /D "VERSION2" /D "_CONSOLE" /D "_MBCS" /Fo"$(OUTDIR)\\" /Fd"$(OUTDIR)\\" /FD /c
LINK32_FLAGS=$(PTHREADS_NAME).lib musclecard.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\MuscleTools.pdb" /machine:I386 /out:"$(OUTDIR)\MuscleTool.exe" /libpath:"$(MUSCLECARD_LIB)/$(OUTDIR)" /libpath:"$(PTHREADS_LIB)"
!ELSE
CPP_PROJ=/nologo /MD /W3 /Gm /GX /ZI /Od /I "$(MUSCLECARD_INC)" /I "$(PCSC_INC)" /I "$(PTHREADS_INC)" /D "VERSION2" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR"$(OUTDIR)\\" /Fo"$(OUTDIR)\\" /Fd"$(OUTDIR)\\" /FD /GZ /c
LINK32_FLAGS=$(PTHREADS_NAME).lib musclecard.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\MuscleTools.pdb" /debug /machine:I386 /out:"$(OUTDIR)\MuscleTool.exe" /pdbtype:sept /libpath:"$(MUSCLECARD_LIB)/$(OUTDIR)" /libpath:"$(PTHREADS_LIB)"
!ENDIF
$(OUTDIR)\MuscleTool.exe : ../scanner.c ../parser.c $(OUTDIR) $(LINK32_OBJS)
$(LINK32) $(LINK32_FLAGS) $(LINK32_OBJS)
.c{$(OUTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(OUTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(OUTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
../scanner.c : ../scanner.l
!IF !EXIST($(FLEX))
ERROR Flex not found. Change the macro FLEX in this Makefile to point to the \
correct location or specify it on the command line FLEX=<LOCATION_OF_FLEX_EXECUTABLE>
!ELSE
flex -o../scanner.c ../scanner.l
!ENDIF
../parser.c : ../parser.y
!IF !EXIST($(BISON))
ERROR Bison not found. Change the macro BISON in this Makefile to point to the \
correct location or specify it on the command line BISON=<LOCATION_OF_BISON_EXECUTABLE>
!ELSE
bison -do ../parser.c ../parser.y
!ENDIF
SOURCE=..\help.c
"$(OUTDIR)\help.obj" : $(SOURCE) "$(OUTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
SOURCE=..\muscleTool.c
"$(OUTDIR)\muscleTool.obj" : $(SOURCE) "$(OUTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
SOURCE=..\parser.c
"$(OUTDIR)\parser.obj" : $(SOURCE) "$(OUTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
SOURCE=..\scanner.c
"$(OUTDIR)\scanner.obj" : $(SOURCE) "$(OUTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)--- /cvsroot/muscleapps/muscleTool/win32/MuscleTools.sln 2005/08/07 15:52:53 NONE
+++ /cvsroot/muscleapps/muscleTool/win32/MuscleTools.sln 2005/08/07 15:52:53 1.1
Microsoft Visual Studio Solution File, Format Version 8.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MuscleTools", "MuscleTools.vcproj", "{6E8A5A97-54E2-45AA-961D-5D00EA0A8B4E}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
Debug = Debug
Release = Release
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{6E8A5A97-54E2-45AA-961D-5D00EA0A8B4E}.Debug.ActiveCfg = Debug|Win32
{6E8A5A97-54E2-45AA-961D-5D00EA0A8B4E}.Debug.Build.0 = Debug|Win32
{6E8A5A97-54E2-45AA-961D-5D00EA0A8B4E}.Release.ActiveCfg = Release|Win32
{6E8A5A97-54E2-45AA-961D-5D00EA0A8B4E}.Release.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
GlobalSection(ExtensibilityAddIns) = postSolution
EndGlobalSection
EndGlobal
--- /cvsroot/muscleapps/muscleTool/win32/MuscleTools.vcproj 2005/08/07 15:52:53 NONE
+++ /cvsroot/muscleapps/muscleTool/win32/MuscleTools.vcproj 2005/08/07 15:52:53 1.1
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="MuscleTools"
ProjectGUID="{6E8A5A97-54E2-45AA-961D-5D00EA0A8B4E}"
SccProjectName=""
SccLocalPath="">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\libmusclecard\src\PCSC;E:\quarantine\pthread\pthreads"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="TRUE"
RuntimeLibrary="4"
EnableFunctionLevelLinking="TRUE"
PrecompiledHeaderFile=".\Release/MuscleTools.pch"
[175 lines skipped]
More information about the Pcsclite-cvs-commit
mailing list