improve build.bat and related clean-up

This commit is contained in:
Matthew Flatt 2010-12-06 06:25:39 -07:00
parent 9dc827dec3
commit 011fa0bb90
8 changed files with 49 additions and 34 deletions

View File

@ -3,3 +3,6 @@
*/Debug */Debug
*/x64 */x64
*/*.user */*.user
rbuildmode.obj
rbuildmode.exe

View File

@ -263,7 +263,7 @@ The libraries
racket\lib\win32\msvc\libracketxxxxxxx.lib racket\lib\win32\msvc\libracketxxxxxxx.lib
racket\lib\win32\msvc\libmzgcxxxxxxx.lib racket\lib\win32\msvc\libmzgcxxxxxxx.lib
which are created by the mzsrc and gc projects, provide linking which are created by the libracket and libmzgc projects, provide linking
information for using the libracket3mxxxxxxx.dll, libracketxxxxxxx.dll, information for using the libracket3mxxxxxxx.dll, libracketxxxxxxx.dll,
and libmzgcxxxxxxx.dll DLLs. The versioning script adjusts the names, and libmzgcxxxxxxx.dll DLLs. The versioning script adjusts the names,
as described above. as described above.

View File

@ -1,40 +1,60 @@
setlocal
cl rbuildmode.c
rbuildmode.exe
if errorlevel 1 (set BUILDMODE=win32) else (set BUILDMODE=x64)
cd racket cd racket
devenv racket.sln /Build Release devenv racket.sln /Build "Release|%BUILDMODE%"
if errorlevel 1 exit /B 1
cd ..\gracket cd ..\gracket
devenv gracket.sln /Build Release devenv gracket.sln /Build "Release|%BUILDMODE%"
if errorlevel 1 exit /B 1
cd .. cd ..
cd gc2 cd gc2
..\..\..\racketcgc -cu make.rkt ..\..\..\racketcgc -cu make.rkt
if errorlevel 1 exit /B 1
cd .. cd ..
..\..\racket -cu ..\get-libs.rkt core ..\..\lib ..\..\racket -cu ..\get-libs.rkt core ..\..\lib
if errorlevel 1 exit /B 1
..\..\racket -cu ..\get-libs.rkt gui ..\..\lib ..\..\racket -cu ..\get-libs.rkt gui ..\..\lib
if errorlevel 1 exit /B 1
cd mzstart cd mzstart
devenv mzstart.sln /Build Release devenv mzstart.sln /Build "Release|%BUILDMODE%"
if errorlevel 1 exit /B 1
cd ..\mrstart cd ..\mrstart
devenv mrstart.sln /Build Release devenv mrstart.sln /Build "Release|%BUILDMODE%"
if errorlevel 1 exit /B 1
cd .. cd ..
cd mzcom cd mzcom
devenv mzcom.sln /Build Release devenv mzcom.sln /Build "Release|%BUILDMODE%"
if errorlevel 1 exit /B 1
cd ..\libmysterx cd ..\libmysterx
devenv libmysterx.sln /Build Release devenv libmysterx.sln /Build "Release|%BUILDMODE%"
if errorlevel 1 exit /B 1
cd .. cd ..
cd libmysterx cd libmysterx
..\..\..\racket -cu xform.rkt ..\..\..\racket -cu xform.rkt
if errorlevel 1 exit /B 1
cd .. cd ..
cd mzcom cd mzcom
..\..\..\racket -cu xform.rkt ..\..\..\racket -cu xform.rkt
if errorlevel 1 exit /B 1
cd .. cd ..
cd mzcom cd mzcom
devenv mzcom.sln /Build 3m devenv mzcom.sln /Build "3m|%BUILDMODE%"
if errorlevel 1 exit /B 1
cd ..\libmysterx cd ..\libmysterx
devenv libmysterx.sln /Build 3m devenv libmysterx.sln /Build "3m|%BUILDMODE%"
if errorlevel 1 exit /B 1
cd .. cd ..
..\..\racket -l setup -N "raco setup" ..\..\racket -l setup -N "raco setup"
if errorlevel 1 exit /B 1

View File

@ -155,7 +155,7 @@
BrowseInformation="1" BrowseInformation="1"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="false"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
@ -341,7 +341,7 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="false"
DebugInformationFormat="0" DebugInformationFormat="0"
CompileAs="0" CompileAs="0"
/> />
@ -529,7 +529,7 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="false"
DebugInformationFormat="0" DebugInformationFormat="0"
CompileAs="0" CompileAs="0"
/> />

View File

@ -112,8 +112,6 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Register $(ProjectName).dll"
CommandLine="REGSVR32 /s ..\..\..\..\lib\$(ProjectName).dll"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
@ -162,7 +160,7 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
BrowseInformation="1" BrowseInformation="1"
WarningLevel="4" WarningLevel="4"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="false"
DebugInformationFormat="3" DebugInformationFormat="3"
/> />
<Tool <Tool
@ -211,8 +209,6 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Register $(ProjectName).dll"
CommandLine="REGSVR32 /s ..\..\..\..\lib\$(ProjectName).dll"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
@ -313,8 +309,6 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Register $(ProjectName).dll"
CommandLine="REGSVR32 /s ..\..\..\..\lib\$(ProjectName).dll"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
@ -366,7 +360,7 @@
ProgramDataBaseFileName="" ProgramDataBaseFileName=""
WarningLevel="4" WarningLevel="4"
SuppressStartupBanner="true" SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="false"
DebugInformationFormat="0" DebugInformationFormat="0"
/> />
<Tool <Tool
@ -416,8 +410,6 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Register $(ProjectName).dll"
CommandLine="REGSVR32 /s ..\..\..\..\lib\$(ProjectName).dll"
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>

View File

@ -112,8 +112,6 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Register $(ProjectName).dll"
CommandLine="REGSVR32 /s ..\..\..\..\lib\$(ProjectName).dll"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
@ -160,7 +158,7 @@
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
BrowseInformation="1" BrowseInformation="1"
WarningLevel="4" WarningLevel="4"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="false"
DebugInformationFormat="3" DebugInformationFormat="3"
CompileAs="2" CompileAs="2"
/> />
@ -211,8 +209,6 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Register $(ProjectName).dll"
CommandLine="REGSVR32 /s ..\..\..\..\lib\$(ProjectName).dll"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
@ -315,8 +311,6 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Register $(ProjectName).dll"
CommandLine="REGSVR32 /s ..\..\..\..\lib\$(ProjectName).dll"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
@ -368,7 +362,7 @@
ProgramDataBaseFileName="" ProgramDataBaseFileName=""
WarningLevel="4" WarningLevel="4"
SuppressStartupBanner="true" SuppressStartupBanner="true"
Detect64BitPortabilityProblems="true" Detect64BitPortabilityProblems="false"
DebugInformationFormat="0" DebugInformationFormat="0"
CompileAs="2" CompileAs="2"
/> />
@ -419,8 +413,6 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
Description="Register $(ProjectName).dll"
CommandLine="REGSVR32 /s ..\..\..\..\lib\$(ProjectName).dll"
/> />
</Configuration> </Configuration>
</Configurations> </Configurations>

View File

@ -45,7 +45,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..,..\..\racket\include,..\..\racket\src,..\..\foreign\libffi_msvc,$(NOINHERIT)" AdditionalIncludeDirectories="..,..\..\racket\include,..\..\racket\src,$(NOINHERIT)"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GC_DLL;__STDC__;LIBMZ_EXPORTS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GC_DLL;__STDC__;LIBMZ_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
@ -130,7 +130,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..,..\..\racket\include,..\..\racket\src,..\..\foreign\libffi_msvc,$(NOINHERIT)" AdditionalIncludeDirectories="..,..\..\racket\include,..\..\racket\src,$(NOINHERIT)"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GC_DLL;__STDC__;LIBMZ_EXPORTS;_CRT_SECURE_NO_DEPRECATE" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GC_DLL;__STDC__;LIBMZ_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"

8
src/worksp/rbuildmode.c Normal file
View File

@ -0,0 +1,8 @@
int main() {
#ifdef _WIN64
return 0;
#else
return 1;
#endif
}