rabix
/
RedPanda-CPP
mirror of https://github.com/Reduced-panda/RedPanda-CPP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fix: in linux, projects no need of winres to be built 

update debian pacakges files
This commit is contained in:
Roy Qu 2022-01-15 12:25:30 +08:00
parent 6be9190a8a
commit 6209b1ff05
6 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS.md
View File

@ -23,6 +23,7 @@ Red Panda C++ Version 0.13.2
- fix: open a project file through "File"->"Open" will not correctly connect it with the project internally - fix: open a project file through "File"->"Open" will not correctly connect it with the project internally
- fix: wrong project program directory parameter is sent to the debugger - fix: wrong project program directory parameter is sent to the debugger
- enhancement: better behavior of mouse tips - enhancement: better behavior of mouse tips
- fix: in linux, projects no need of winres to be built
Red Panda C++ Version 0.13.1 Red Panda C++ Version 0.13.1
- enhancement: suppoort localization info in project templates - enhancement: suppoort localization info in project templates

6
RedPandaIDE/compiler/projectcompiler.cpp
View File

@ -176,6 +176,7 @@ void ProjectCompiler::writeMakeDefines(QFile &file)
// Get windres file // Get windres file
QString ObjResFile; QString ObjResFile;
#ifdef Q_OS_WIN
if (!mProject->options().privateResource.isEmpty()) { if (!mProject->options().privateResource.isEmpty()) {
if (!mProject->options().objectOutput.isEmpty()) { if (!mProject->options().objectOutput.isEmpty()) {
ObjResFile = includeTrailingPathDelimiter(mProject->options().objectOutput) + ObjResFile = includeTrailingPathDelimiter(mProject->options().objectOutput) +
@ -183,6 +184,7 @@ void ProjectCompiler::writeMakeDefines(QFile &file)
} else } else
ObjResFile = changeFileExt(mProject->options().privateResource, RES_EXT); ObjResFile = changeFileExt(mProject->options().privateResource, RES_EXT);
} }
#endif
// Mention progress in the logs // Mention progress in the logs
if (!ObjResFile.isEmpty()) { if (!ObjResFile.isEmpty()) {
@ -204,7 +206,9 @@ void ProjectCompiler::writeMakeDefines(QFile &file)
} }
writeln(file,"CPP = " + extractFileName(compilerSet()->cppCompiler())); writeln(file,"CPP = " + extractFileName(compilerSet()->cppCompiler()));
writeln(file,"CC = " + extractFileName(compilerSet()->CCompiler())); writeln(file,"CC = " + extractFileName(compilerSet()->CCompiler()));
#ifdef Q_OS_WIN
writeln(file,"WINDRES = " + extractFileName(compilerSet()->resourceCompiler())); writeln(file,"WINDRES = " + extractFileName(compilerSet()->resourceCompiler()));
#endif
if (!ObjResFile.isEmpty()) { if (!ObjResFile.isEmpty()) {
writeln(file,"RES = " + genMakePath1(ObjResFile)); writeln(file,"RES = " + genMakePath1(ObjResFile));
writeln(file,"OBJ = " + Objects + " $(RES)"); writeln(file,"OBJ = " + Objects + " $(RES)");
@ -381,6 +385,7 @@ void ProjectCompiler::writeMakeObjFilesRules(QFile &file)
} }
} }
#ifdef Q_OS_WIN
if (!mProject->options().privateResource.isEmpty()) { if (!mProject->options().privateResource.isEmpty()) {
// Concatenate all resource include directories // Concatenate all resource include directories
@ -433,6 +438,7 @@ void ProjectCompiler::writeMakeObjFilesRules(QFile &file)
} }
writeln(file); writeln(file);
} }
#endif
} }
void ProjectCompiler::writeln(QFile &file, const QString &s) void ProjectCompiler::writeln(QFile &file, const QString &s)

4
RedPandaIDE/settings.cpp
View File

@ -2422,8 +2422,10 @@ static void setDebugOptions(Settings::PCompilerSet pSet) {
} }
#ifdef Q_OS_LINUX #ifdef Q_OS_LINUX
pSet->setCustomCompileParams("--sanitize=address"); pSet->setCustomCompileParams("-fsanitize=address");
pSet->setUseCustomCompileParams(true); pSet->setUseCustomCompileParams(true);
pSet->setCustomLinkParams("-fsanitize=address");
pSet->setUseCustomLinkParams(true);
#endif #endif
// pOption = pSet->findOption("-static"); // pOption = pSet->findOption("-static");

2
packages/deb/builddeb.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
TMP_FOLDER=/tmp/redpandaide TMP_FOLDER=/tmp/redpandaide
version=0.12.6 version=0.13.2
make install make install
mkdir $TMP_FOLDER mkdir $TMP_FOLDER
mkdir $TMP_FOLDER/DEBIAN mkdir $TMP_FOLDER/DEBIAN

2
packages/deb/control
View File

@ -1,5 +1,5 @@
Package: RedPanda-IDE Package: RedPanda-IDE
Version: 0.12.6 Version: 0.13.2
Section: devel Section: devel
Priority: optional Priority: optional
Architecture: amd64 Architecture: amd64

6
packages/debian/changelog
View File

@ -1,3 +1,9 @@
redpanda-cpp (0.13.2-1) unstable; urgency=medium
* Update to 0.13.2
-- Roy Qu (瞿华) <royqh1979@gmail.com> Thu, 6 Jan 2022 14:52:00 +0800
redpanda-cpp (0.12.6-1) unstable; urgency=medium redpanda-cpp (0.12.6-1) unstable; urgency=medium
* Initial release * Initial release