Skip to content

Commit 73c58bf

Browse files
committed
Rename bootstrap executable to force it to rebuild
1 parent 45a8342 commit 73c58bf

8 files changed

+14
-99
lines changed

Build.bat

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if not exist "bin" (
2424
mkdir bin
2525
)
2626

27-
if not exist "bin\cakelisp_bootstrap.exe" (
27+
if not exist "bin\cakelisp_bootstrap_v2.exe" (
2828
goto manualBuild
2929
) else (
3030
goto bootstrapBuild
@@ -51,7 +51,7 @@ CL.exe src/Tokenizer.cpp ^
5151
Advapi32.lib Ole32.lib OleAut32.lib ^
5252
/I 3rdPartySrc ^
5353
/EHsc /MP /DWINDOWS /DCAKELISP_EXPORTING ^
54-
/Fe"bin\cakelisp_bootstrap" /Zi /Fd"bin\cakelisp_bootstrap.pdb" /DEBUG:FASTLINK
54+
/Fe"bin\cakelisp_bootstrap_v2" /Zi /Fd"bin\cakelisp_bootstrap_v2.pdb" /DEBUG:FASTLINK
5555
echo %ERRORLEVEL%
5656
rem Advapi32.lib Ole32.lib OleAut32.lib are for FindVisualStudio.cpp
5757

@@ -67,7 +67,7 @@ rem Advapi32.lib Ole32.lib OleAut32.lib are for FindVisualStudio.cpp
6767
)
6868

6969
:bootstrapBuild
70-
"bin\cakelisp_bootstrap.exe" Bootstrap_MSVC.cake
70+
"bin\cakelisp_bootstrap_v2.exe" Bootstrap_MSVC.cake
7171
@if %ERRORLEVEL% == 0 (
7272
echo Success! Use bin\cakelisp.exe to build your programs
7373
goto success

Build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
CAKELISP_BOOTSTRAP_BIN=bin/cakelisp_bootstrap
3+
CAKELISP_BOOTSTRAP_BIN=bin/cakelisp_bootstrap_v2
44
CC=g++
55
LINK=g++
66

BuildAndRunTests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55

66
./bin/cakelisp --list-built-ins-details || exit $?
77

8-
./bin/cakelisp runtime/Config_Linux.cake test/RunTests.cake || exit $?
8+
./bin/cakelisp --verbose-build-reasons runtime/Config_Linux.cake test/RunTests.cake || exit $?

Build_Mac.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
CAKELISP_BOOTSTRAP_BIN=bin/cakelisp_bootstrap
3+
CAKELISP_BOOTSTRAP_BIN=bin/cakelisp_bootstrap_v2
44
CC=clang
55
LINK=clang
66

Build_RunTests.bat

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if not exist "bin" (
2222
mkdir bin
2323
)
2424

25-
if not exist "bin\cakelisp_bootstrap.exe" (
25+
if not exist "bin\cakelisp_bootstrap_v2.exe" (
2626
goto manualBuild
2727
) else (
2828
goto bootstrapBuild
@@ -49,7 +49,7 @@ CL.exe src/Tokenizer.cpp ^
4949
Advapi32.lib Ole32.lib OleAut32.lib ^
5050
/I 3rdPartySrc ^
5151
/EHsc /MP /DWINDOWS /DCAKELISP_EXPORTING ^
52-
/Fe"bin\cakelisp_bootstrap" /Zi /Fd"bin\cakelisp_bootstrap.pdb" /DEBUG:FASTLINK
52+
/Fe"bin\cakelisp_bootstrap_v2" /Zi /Fd"bin\cakelisp_bootstrap_v2.pdb" /DEBUG:FASTLINK
5353
echo %ERRORLEVEL%
5454

5555
@if %ERRORLEVEL% == 0 (
@@ -63,7 +63,7 @@ CL.exe src/Tokenizer.cpp ^
6363
)
6464

6565
:bootstrapBuild
66-
"bin\cakelisp_bootstrap.exe" Bootstrap_MSVC.cake
66+
"bin\cakelisp_bootstrap_v2.exe" Bootstrap_MSVC.cake
6767
@if %ERRORLEVEL% == 0 (
6868
echo Success! Use bin\cakelisp.exe to build your programs
6969
goto build_user

Build_SimpleMacros.bat

-85
This file was deleted.

ReadMe.org

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ cd cakelisp
4444
./Build.sh
4545
#+END_SRC
4646

47-
This script first builds cakelisp explicitly, then uses the ~cakelisp_bootstrap~ executable to build Cakelisp using Cakelisp. Subsequent executions of ~Build.sh~ will also build using Cakelisp, which means all the caching features will be in effect (making builds much faster).
47+
This script first builds cakelisp explicitly, then uses the ~cakelisp_bootstrap_v2~ executable to build Cakelisp using Cakelisp. Subsequent executions of ~Build.sh~ will also build using Cakelisp, which means all the caching features will be in effect (making builds much faster).
4848

4949
You can then run ~./bin/cakelisp~. Have fun! A simple test:
5050
#+BEGIN_SRC sh

doc/Tutorial_ProjectSetup.org

+4-4
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ You should see the following output, if all things go well:
128128
Cakelisp
129129

130130

131-
bin/cakelisp_bootstrap does not exist. Building bootstrap executable manually
132-
Built bin/cakelisp_bootstrap successfully. Now building with Cakelisp
131+
bin/cakelisp_bootstrap_v2 does not exist. Building bootstrap executable manually
132+
Built bin/cakelisp_bootstrap_v2 successfully. Now building with Cakelisp
133133
Successfully built and linked bin/cakelisp
134134
Cakelisp successfully bootstrapped. Use ./bin/cakelisp to build your files
135135

@@ -148,10 +148,10 @@ Run ~chmod +x Build.sh~ to give the build script executable permissions, then ru
148148
** No such directory "Dependencies/cakelisp"
149149
Check you are in project's root directory when running build script. Download cakelisp to ~Dependencies/cakelisp~.
150150

151-
** Build fails after "Building bootstrap executable manually", and "Built bin/cakelisp_bootstrap successfully." was not output
151+
** Build fails after "Building bootstrap executable manually", and "Built bin/cakelisp_bootstrap_v2 successfully." was not output
152152
Check ~Dependencies/cakelisp/Build.sh~. Does it reference your system's compiler toolchain correctly? Edit it if not.
153153

154-
** Build fails after "Built bin/cakelisp_bootstrap successfully.", and "Successfully built and linked bin/cakelisp" was not output
154+
** Build fails after "Built bin/cakelisp_bootstrap_v2 successfully.", and "Successfully built and linked bin/cakelisp" was not output
155155
Cakelisp itself must not refer to your system's compiler toolchain correctly. Open ~ModuleManager.cpp~ and find your platform in ~moduleManagerInitialize()~. You may need to edit these defaults.
156156

157157
Another option is to look at ~Dependencies/cakelisp/runtime/Config_Mingw.cake~ and add similar code to the ~Dependencies/cakelisp/Bootstrap*.cake~ script for your platform. This allows you to override Cakelisp's default compiler toolchain variables.

0 commit comments

Comments
 (0)