1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-07-01 15:00:38 +00:00

Step 6: Rename qb64.bas to qb64pe.bas

Mentions in the help (*.txt) files are excluded.
This commit is contained in:
Roland Heyder 2022-08-11 02:11:35 +02:00
parent 96fc1eb3a9
commit 0bd6afd389
4 changed files with 25847 additions and 25847 deletions

View file

@ -1,7 +1,7 @@
@ECHO OFF @ECHO OFF
SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION SETLOCAL ENABLEEXTENSIONS ENABLEDELAYEDEXPANSION
qb64_bootstrap.exe -x -w source\qb64.bas qb64_bootstrap.exe -x -w source\qb64pe.bas
IF ERRORLEVEL 1 exit /b 1 IF ERRORLEVEL 1 exit /b 1
del qb64_bootstrap.exe del qb64_bootstrap.exe

View file

@ -2,7 +2,7 @@
os=$1 os=$1
./qb64_bootstrap -x -w source/qb64.bas ./qb64_bootstrap -x -w source/qb64pe.bas
SUCCESS=$? SUCCESS=$?
rm qb64_bootstrap rm qb64_bootstrap

View file

@ -6,7 +6,7 @@ Build Process
This describes the process that goes on to compile a QB64 program into an executable. This describes the process that goes on to compile a QB64 program into an executable.
1. `QB64.bas` takes the QB64 source code and produces C++ source code for the program. That C++ source is placed into various files and goes into `./internal/temp`. 1. `QB64pe.bas` takes the QB64 source code and produces C++ source code for the program. That C++ source is placed into various files and goes into `./internal/temp`.
2. `make` is used to run the `Makefile` at the root of this repository. It is supplied the `OS` parameter, the `EXE` parameter for the final executable name, and a variety of `DEP_*` parameters depending on what dependencies the QB64 program requires. 2. `make` is used to run the `Makefile` at the root of this repository. It is supplied the `OS` parameter, the `EXE` parameter for the final executable name, and a variety of `DEP_*` parameters depending on what dependencies the QB64 program requires.
1. 3rd party dependencies located in `./internal/c/parts/` are compiled if requested. Each of these has its own `build.mk` file that includes the `make` logic to build that dependency. 1. 3rd party dependencies located in `./internal/c/parts/` are compiled if requested. Each of these has its own `build.mk` file that includes the `make` logic to build that dependency.
2. `./internal/c/libqb.cpp` is compiled with various C preprocessor flags depending on the provided `DEP_*` flags. The name is changed depending on the settings it is compiled with so that we don't accidentally use a libqb compiled with different settings. 2. `./internal/c/libqb.cpp` is compiled with various C preprocessor flags depending on the provided `DEP_*` flags. The name is changed depending on the settings it is compiled with so that we don't accidentally use a libqb compiled with different settings.
@ -19,13 +19,13 @@ CI Process
This describes how QB64 itself is built by the CI process to produce a release of QB64. The actual build scripts that do all of this are located in `.ci/`.` This describes how QB64 itself is built by the CI process to produce a release of QB64. The actual build scripts that do all of this are located in `.ci/`.`
1. Before CI ever begins, `./internal/source/` contains the generated C++ source of a previous version of `qb64.bas`. 1. Before CI ever begins, `./internal/source/` contains the generated C++ source of a previous version of `qb64pe.bas`.
2. `.ci/calculate_version.sh` is run to determine what version this CI build should be considered. That information is written to `./internal/version.txt`, if it is a release version `./internal/version.txt` is removed. 2. `.ci/calculate_version.sh` is run to determine what version this CI build should be considered. That information is written to `./internal/version.txt`, if it is a release version `./internal/version.txt` is removed.
3. 'bootstrap_qb64' is compiled from `./internal/source` 3. 'bootstrap_qb64' is compiled from `./internal/source`
1. `make` is used to call the `Makefile` with the proper `OS` setting, `EXE=bootstrap_qb64`, and `BUILD_QB64=y`. 1. `make` is used to call the `Makefile` with the proper `OS` setting, `EXE=bootstrap_qb64`, and `BUILD_QB64=y`.
2. The Makefile will take care of copying `./internal/source` into `./internal/temp` and compiling QB64 with the proper settings. 2. The Makefile will take care of copying `./internal/source` into `./internal/temp` and compiling QB64 with the proper settings.
4. `bootstrap_qb64` is used to compile `./source/qb64.bas` into a proper `qb64` executable 4. `bootstrap_qb64` is used to compile `./source/qb64pe.bas` into a proper `qb64` executable
1. We run `./bootstrap_qb64 -x ./source/qb64.bas` to compile QB64. This compiles QB64 the same way as a regular QB64 program as detailed in 'Build Process' 1. We run `./bootstrap_qb64 -x ./source/qb64pe.bas` to compile QB64. This compiles QB64 the same way as a regular QB64 program as detailed in 'Build Process'
5. `./internal/source` is cleared out and, excluding a few files, the contents of `./internal/temp` are copied into `./internal/source` as the new generated C++ source of QB64. 5. `./internal/source` is cleared out and, excluding a few files, the contents of `./internal/temp` are copied into `./internal/source` as the new generated C++ source of QB64.
6. `tests/run_tests.sh` is run to test the compiled version of QB64. A failure of these tests fails the build at this stage. 6. `tests/run_tests.sh` is run to test the compiled version of QB64. A failure of these tests fails the build at this stage.
7. `.ci/make-dist.sh` is run to produce the distribution of QB64, which is stored as a build artifact and potentially a release artifact.. 7. `.ci/make-dist.sh` is run to produce the distribution of QB64, which is stored as a build artifact and potentially a release artifact..
@ -44,13 +44,13 @@ Repository Layout
- `bootstrap.sh` - `bootstrap.sh`
- Linux and OSX, builds the precompiled version of QB64 located in `./internal/source` as `bootstrap_qb64.exe`. - Linux and OSX, builds the precompiled version of QB64 located in `./internal/source` as `bootstrap_qb64.exe`.
- `compile.bat` - `compile.bat`
- Uses `bootstrap_qb64.exe` to build `./source/qb64.bas`. This compiled QB64 is the released QB64.exe. - Uses `bootstrap_qb64.exe` to build `./source/qb64pe.bas`. This compiled QB64 is the released QB64.exe.
- `compile.sh` - `compile.sh`
- Uses `bootstrap_qb64` to build `./source/qb64.bas`. This built QB64 is what is used for testing, and the sources from this QB64 are placed into `./internal/source`. - Uses `bootstrap_qb64` to build `./source/qb64pe.bas`. This built QB64 is what is used for testing, and the sources from this QB64 are placed into `./internal/source`.
- `make-dist.sh` - `make-dist.sh`
- Copies all the relevant parts of QB64 into a new folder, which can be distributed as a release. - Copies all the relevant parts of QB64 into a new folder, which can be distributed as a release.
- `push-internal-source.sh` - `push-internal-source.sh`
- If `./internal/source` is different after building `./source/qb64.bas`, then this will automatically push those changes to the repository to update the sources used to build `bootstrap_qb64`. - If `./internal/source` is different after building `./source/qb64pe.bas`, then this will automatically push those changes to the repository to update the sources used to build `bootstrap_qb64`.
- `internal/` - `internal/`
- `help/` - `help/`
- Contains a downloaded copy of the help files, so that they do not have to be downloaded when QB64 is installed. - Contains a downloaded copy of the help files, so that they do not have to be downloaded when QB64 is installed.

View file

@ -12963,7 +12963,7 @@ RESUME NEXT
qberror: qberror:
'_CONSOLE ON '_CONSOLE ON
'_ECHO "A QB error has occurred (and you have compiled in debugging support)." '_ECHO "A QB error has occurred (and you have compiled in debugging support)."
'_ECHO "Some key information (qb64.bas):" '_ECHO "Some key information (qb64pe.bas):"
'_ECHO "Error" + STR$(ERR) '_ECHO "Error" + STR$(ERR)
'_ECHO "Description: " + _ERRORMESSAGE$ '_ECHO "Description: " + _ERRORMESSAGE$
'_ECHO "Line" + STR$(_ERRORLINE) '_ECHO "Line" + STR$(_ERRORLINE)
@ -12987,7 +12987,7 @@ IF Debug THEN 'A more in-your-face error handler
END IF END IF
_CONTROLCHR OFF _CONTROLCHR OFF
PRINT "A QB error has occurred (and you have compiled in debugging support)." PRINT "A QB error has occurred (and you have compiled in debugging support)."
PRINT "Some key information (qb64.bas):" PRINT "Some key information (qb64pe.bas):"
PRINT "Error"; ERR PRINT "Error"; ERR
PRINT "Description: "; _ERRORMESSAGE$ PRINT "Description: "; _ERRORMESSAGE$
PRINT "Line"; _ERRORLINE PRINT "Line"; _ERRORLINE