adjust CRLF handling of some Windows files

This commit is contained in:
Matthew Flatt 2010-05-10 09:05:30 -06:00
parent a81de56b30
commit 2ee555c4e0
10 changed files with 603 additions and 1112 deletions

26
src/.gitattributes vendored Normal file
View File

@ -0,0 +1,26 @@
# These files need to be CRLF for MSVC and Windows users to be happy.
# If you clone the git reposity under Windows, then it will normally
# convert all LFs to CRLF, anyway. But these file need to be CRLF
# when cloned to a Unix filesystem to assemble a Racket distribution.
*.vcproj -crlf
*.sln -crlf
*.manifest -crlf
*.rc -crlf
*.bat -crlf
src/worksp/README -crlf
src/racket/gc/BCC_MAKEFILE -crlf
src/racket/gc/digimars.mak -crlf
src/worksp/README -crlf
src/worksp/extradlls/README.TXT -crlf
src/worksp/gracket/gracket.manifest
src/worksp/mzcom/mzcom.def
src/worksp/mzcom/mzcom.rgs
src/worksp/mzcom/mzcomps.def
src/worksp/mzcom/mzobj.rgs
# These files seem to be generated. Maybe they shouldn't be
# in the repository; in any case, they are generated with
# CRLF, so let's keep them that way.
src/worksp/mzcom/mzcom.h -crlf
src/worksp/racket/resource.h -crlf
src/worksp/starters/resource.h -crlf

View File

@ -1,4 +1,3 @@
#lang scheme/base
(use-compiled-file-paths null)
@ -502,4 +501,3 @@
(copy-file/diff "mzdyn3m.exp" "../../../lib/msvc/mzdyn3m.exp")
(copy-file/diff "mzdyn3m.obj" "../../../lib/msvc/mzdyn3m.obj")

View File

@ -1,2 +1 @@
#include "jconfig.vc"

View File

@ -1,180 +0,0 @@
# Microsoft Developer Studio Project File - Name="MzCOM" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
CFG=MzCOM - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "MzCOM.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "MzCOM.mak" CFG="MzCOM - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "MzCOM - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE "MzCOM - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "MzCOM - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
# ADD CPP /nologo /MTd /W3 /Gm /ZI /Od /I "..\..\..\include" /I "..\..\mzcom" /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /i ".\..\mzcom" /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
# ADD LINK32 libcmtd.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 wsock32.lib libmzschxxxxxxx.lib libmzgcxxxxxxx.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcmt.lib" /out:"../../../collects/mzcom/mzcom.exe" /pdbtype:sept /libpath:"..\libmzsch\Debug" /libpath:"..\libmzgc\Debug"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "MzCOM - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "MzCOM___Win32_Release"
# PROP BASE Intermediate_Dir "MzCOM___Win32_Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /O1 /I "../../mzscheme/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
# ADD CPP /nologo /MT /W3 /O1 /I "..\..\mzcom" /I "." /I "..\..\..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /YX /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /i "..\..\mzcom" /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# 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 /nologo /subsystem:windows /machine:I386
# ADD 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 wsock32.lib libmzschxxxxxxx.lib libmzgcxxxxxxx.lib /nologo /subsystem:windows /machine:I386 /out:"../../../collects/mzcom/mzcom.exe" /libpath:"..\libmzsch\Release" /libpath:"..\libmzgc\Release"
# SUBTRACT LINK32 /pdb:none
!ENDIF
# Begin Target
# Name "MzCOM - Win32 Debug"
# Name "MzCOM - Win32 Release"
# Begin Group "Source Files"
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
SOURCE=..\..\mzcom\mzcom.cxx
!IF "$(CFG)" == "MzCOM - Win32 Debug"
# ADD CPP /I "../../mzscheme/include ../worksp/mzcom"
!ELSEIF "$(CFG)" == "MzCOM - Win32 Release"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\mzcom\mzcom.idl
!IF "$(CFG)" == "MzCOM - Win32 Debug"
# ADD MTL /tlb "./mzcom.tlb"
# SUBTRACT MTL /Oicf
!ELSEIF "$(CFG)" == "MzCOM - Win32 Release"
# PROP Intermediate_Dir "Release"
# ADD MTL /tlb "./mzcom.tlb"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\mzcom\mzobj.cxx
!IF "$(CFG)" == "MzCOM - Win32 Debug"
!ELSEIF "$(CFG)" == "MzCOM - Win32 Release"
# PROP Intermediate_Dir "Release"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\mzcom\stdafx.h
# End Source File
# End Group
# Begin Group "Header Files"
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
SOURCE=.\mzcom.h
# End Source File
# Begin Source File
SOURCE=.\MzCOMCP.h
# End Source File
# Begin Source File
SOURCE=..\..\mzcom\mzobj.h
# End Source File
# Begin Source File
SOURCE=..\..\mzcom\resource.h
# End Source File
# End Group
# Begin Group "Resource Files"
# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
# Begin Source File
SOURCE=.\mzcom.ico
# End Source File
# Begin Source File
SOURCE=.\mzcom.rc
# End Source File
# Begin Source File
SOURCE=.\MzCOM.rgs
# End Source File
# Begin Source File
SOURCE=.\MzObj.rgs
# End Source File
# End Group
# End Target
# End Project

View File

@ -1,59 +0,0 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "MzCOM"=.\MzCOM.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name libmzgc
End Project Dependency
Begin Project Dependency
Project_Dep_Name libmzsch
End Project Dependency
}}}
###############################################################################
Project: "libmzgc"=..\libmzgc\libmzgc.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Project: "libmzsch"=..\libmzsch\libmzsch.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################

View File

@ -1,292 +0,0 @@
# Microsoft Developer Studio Generated NMAKE File, Based on MzCOM.dsp
!IF "$(CFG)" == ""
CFG=MzCOM - Win32 Debug
!MESSAGE No configuration specified. Defaulting to MzCOM - Win32 Debug.
!ENDIF
!IF "$(CFG)" != "MzCOM - Win32 Debug" && "$(CFG)" != "MzCOM - Win32 Release"
!MESSAGE Invalid configuration "$(CFG)" specified.
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "MzCOM.mak" CFG="MzCOM - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "MzCOM - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE "MzCOM - Win32 Release" (based on "Win32 (x86) Application")
!MESSAGE
!ERROR An invalid configuration is specified.
!ENDIF
!IF "$(OS)" == "Windows_NT"
NULL=
!ELSE
NULL=nul
!ENDIF
!IF "$(CFG)" == "MzCOM - Win32 Debug"
OUTDIR=.\Debug
INTDIR=.\Debug
ALL : "..\..\..\collects\mzcom\mzcom.exe" ".\mzcom.tlb" ".\Debug\regsvr32.trg"
CLEAN :
-@erase "$(INTDIR)\mzcom.obj"
-@erase "$(INTDIR)\mzcom.res"
-@erase "$(INTDIR)\mzobj.obj"
-@erase "$(INTDIR)\vc60.idb"
-@erase "$(INTDIR)\vc60.pdb"
-@erase "$(OUTDIR)\mzcom.pdb"
-@erase "..\..\..\collects\mzcom\mzcom.exe"
-@erase "..\..\..\collects\mzcom\mzcom.ilk"
-@erase ".\mzcom.tlb"
-@erase ".\Debug\regsvr32.trg"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
CPP_PROJ=/nologo /MTd /W3 /Gm /ZI /Od /I "..\..\..\collects\mzscheme\include" /I "..\..\mzcom" /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /Fp"$(INTDIR)\MzCOM.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.c{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
MTL=midl.exe
MTL_PROJ=
RSC=rc.exe
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mzcom.res" /i ".\..\mzcom" /d "_DEBUG"
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\MzCOM.bsc"
BSC32_SBRS= \
LINK32=link.exe
LINK32_FLAGS=libcmtd.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 wsock32.lib mzsrc.lib gc.lib /nologo /subsystem:windows /incremental:yes /pdb:"$(OUTDIR)\mzcom.pdb" /debug /machine:I386 /nodefaultlib:"libcmt.lib" /out:"../../../collects/mzcom/mzcom.exe" /pdbtype:sept /libpath:"..\mzsrc\Debug" /libpath:"..\gc\Debug"
LINK32_OBJS= \
"$(INTDIR)\mzcom.obj" \
"$(INTDIR)\mzobj.obj" \
"$(INTDIR)\mzcom.res"
"..\..\..\collects\mzcom\mzcom.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
OutDir=.\Debug
TargetPath=\plt\collects\mzcom\mzcom.exe
InputPath=\plt\collects\mzcom\mzcom.exe
SOURCE="$(InputPath)"
"$(OUTDIR)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
<<tempfile.bat
@echo off
"$(TargetPath)" /RegServer
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
echo Server registration done!
<<
!ELSEIF "$(CFG)" == "MzCOM - Win32 Release"
OUTDIR=.\Release
INTDIR=.\Release
ALL : "..\..\..\collects\mzcom\mzcom.exe" ".\Release\regsvr32.trg"
CLEAN :
-@erase "$(INTDIR)\mzcom.obj"
-@erase "$(INTDIR)\mzcom.res"
-@erase "$(INTDIR)\vc60.idb"
-@erase "..\..\..\collects\mzcom\mzcom.exe"
-@erase ".\mzcom.tlb"
-@erase ".\Release\mzobj.obj"
-@erase ".\Release\regsvr32.trg"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
CPP=cl.exe
CPP_PROJ=/nologo /MT /W3 /O1 /I "..\..\mzcom" /I "." /I "..\..\..\collects\mzscheme\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /Fp"$(INTDIR)\MzCOM.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
.c{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.c{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cpp{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
.cxx{$(INTDIR)}.sbr::
$(CPP) @<<
$(CPP_PROJ) $<
<<
MTL=midl.exe
MTL_PROJ=
RSC=rc.exe
RSC_PROJ=/l 0x409 /fo"$(INTDIR)\mzcom.res" /i "..\..\mzcom" /d "NDEBUG"
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\MzCOM.bsc"
BSC32_SBRS= \
LINK32=link.exe
LINK32_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib mzsrc.lib gc.lib /nologo /subsystem:windows /incremental:no /pdb:"$(OUTDIR)\mzcom.pdb" /machine:I386 /out:"../../../collects/mzcom/mzcom.exe" /libpath:"..\mzsrc\Release" /libpath:"..\gc\Release"
LINK32_OBJS= \
"$(INTDIR)\mzcom.obj" \
".\Release\mzobj.obj" \
"$(INTDIR)\mzcom.res"
"..\..\..\collects\mzcom\mzcom.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
OutDir=.\Release
TargetPath=\plt\collects\mzcom\mzcom.exe
InputPath=\plt\collects\mzcom\mzcom.exe
SOURCE="$(InputPath)"
"$(OUTDIR)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
<<tempfile.bat
@echo off
"$(TargetPath)" /RegServer
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
echo Server registration done!
<<
!ENDIF
!IF "$(NO_EXTERNAL_DEPS)" != "1"
!IF EXISTS("MzCOM.dep")
!INCLUDE "MzCOM.dep"
!ELSE
!MESSAGE Warning: cannot find "MzCOM.dep"
!ENDIF
!ENDIF
!IF "$(CFG)" == "MzCOM - Win32 Debug" || "$(CFG)" == "MzCOM - Win32 Release"
SOURCE=..\..\mzcom\mzcom.cxx
!IF "$(CFG)" == "MzCOM - Win32 Debug"
CPP_SWITCHES=/nologo /MTd /W3 /Gm /ZI /Od /I "..\..\..\collects\mzscheme\include" /I "..\..\mzcom" /I "." /I "../../mzscheme/include ../worksp/mzcom" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /Fp"$(INTDIR)\MzCOM.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c
"$(INTDIR)\mzcom.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) @<<
$(CPP_SWITCHES) $(SOURCE)
<<
!ELSEIF "$(CFG)" == "MzCOM - Win32 Release"
CPP_SWITCHES=/nologo /MT /W3 /O1 /I "..\..\mzcom" /I "." /I "..\..\..\collects\mzscheme\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /Fp"$(INTDIR)\MzCOM.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
"$(INTDIR)\mzcom.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) @<<
$(CPP_SWITCHES) $(SOURCE)
<<
!ENDIF
SOURCE=..\..\mzcom\mzcom.idl
!IF "$(CFG)" == "MzCOM - Win32 Debug"
MTL_SWITCHES=/tlb "./mzcom.tlb"
".\mzcom.tlb" : $(SOURCE) "$(INTDIR)"
$(MTL) @<<
$(MTL_SWITCHES) $(SOURCE)
<<
!ELSEIF "$(CFG)" == "MzCOM - Win32 Release"
MTL_SWITCHES=/tlb "./mzcom.tlb"
".\mzcom.tlb" : $(SOURCE)
$(MTL) @<<
$(MTL_SWITCHES) $(SOURCE)
<<
!ENDIF
SOURCE=..\..\mzcom\mzobj.cxx
!IF "$(CFG)" == "MzCOM - Win32 Debug"
"$(INTDIR)\mzobj.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "MzCOM - Win32 Release"
".\Release\mzobj.obj" : $(SOURCE)
$(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
SOURCE=.\mzcom.rc
"$(INTDIR)\mzcom.res" : $(SOURCE) "$(INTDIR)"
$(RSC) $(RSC_PROJ) $(SOURCE)
!ENDIF

View File

@ -1,4 +1,3 @@
#include <windows.h>
static int warned;