- fix: Shouldn't warn "xxx.s is modifed" when "Generate assembly" is reran.

- fix: Shouldn't warn "Makefile is modifed" when "View Makefile" is reran.
This commit is contained in:
Roy Qu 2024-05-17 16:51:34 +08:00
parent 454dcbadcb
commit 4e688a9136
3 changed files with 12 additions and 3 deletions

View File

@ -2,6 +2,8 @@ Red Panda C++ Version 3.1
- fix: Can't correctly select in column mode. - fix: Can't correctly select in column mode.
- fix: Can't correctly parse template parameters that contains "->", like "std::queue<std::function<auto()->void>>"; - fix: Can't correctly parse template parameters that contains "->", like "std::queue<std::function<auto()->void>>";
- fix: Shouldn't warn "xxx.s is modifed" when "Generate assembly" is reran.
- fix: Shouldn't warn "Makefile is modifed" when "View Makefile" is reran.
Red Panda C++ Version 3.0 Red Panda C++ Version 3.0

View File

@ -2298,9 +2298,11 @@ bool MainWindow::compile(bool rebuild, CppCompileType compileType)
mCompileSuccessionTask->isExecutable = true; mCompileSuccessionTask->isExecutable = true;
} }
if (!mCompileSuccessionTask->isExecutable) { if (!mCompileSuccessionTask->isExecutable) {
Editor *editor = mEditorList->getOpenedEditorByFilename(mCompileSuccessionTask->execName); QString targetFileName = QFileInfo(mCompileSuccessionTask->execName).absoluteFilePath();
if (editor) Editor *editor = mEditorList->getOpenedEditorByFilename(targetFileName);
if (editor) {
mEditorList->closeEditor(editor,false,true); mEditorList->closeEditor(editor,false,true);
}
} }
} }
stretchMessagesPanel(true); stretchMessagesPanel(true);
@ -7333,6 +7335,10 @@ void MainWindow::on_actionView_Makefile_triggered()
{ {
if (!mProject) if (!mProject)
return; return;
Editor *editor = mEditorList->getOpenedEditorByFilename(mProject->makeFileName());
if (editor) {
mEditorList->closeEditor(editor, false, true);
}
prepareProjectForCompile(); prepareProjectForCompile();
mCompilerManager->buildProjectMakefile(mProject); mCompilerManager->buildProjectMakefile(mProject);
openFile(mProject->makeFileName()); openFile(mProject->makeFileName());

View File

@ -2,6 +2,8 @@
set -euxo pipefail set -euxo pipefail
ASTYLE_VERSION_TAG="3.4.15"
function fn_print_help() { function fn_print_help() {
echo " Usage: echo " Usage:
packages/msys/build-mingw.sh [-m|--msystem <MSYSTEM>] [-c|--clean] [-nd|--no-deps] [-t|--target-dir <dir>] packages/msys/build-mingw.sh [-m|--msystem <MSYSTEM>] [-c|--clean] [-nd|--no-deps] [-t|--target-dir <dir>]
@ -140,7 +142,6 @@ while [[ $# -gt 0 ]]; do
esac esac
done done
ASTYLE_VERSION_TAG="3.4.14"
BUILD_DIR="${TEMP}/redpanda-mingw-${MSYSTEM}-build" BUILD_DIR="${TEMP}/redpanda-mingw-${MSYSTEM}-build"
ASTYLE_BUILD_DIR="${BUILD_DIR}/astyle" ASTYLE_BUILD_DIR="${BUILD_DIR}/astyle"
PACKAGE_DIR="${TEMP}/redpanda-mingw-${MSYSTEM}-pkg" PACKAGE_DIR="${TEMP}/redpanda-mingw-${MSYSTEM}-pkg"