Merge branch 'master' of github.com:royqh1979/RedPanda-CPP

NEWS.md

@@ -1,5 +1,5 @@
 Red Panda C++ Version 0.13.2
-  - fix: "delete and exit" button in the environtment / page option page doesn't work correctly 
+  - fix: "delete and exit" button in the environtment / folder option page doesn't work correctly 
   - fix: crash when closing the options dialog under Ubuntu 20.04 LTS ( no memory leak now)
   - enhancement: can add non-code file in templates
   - enhancement: if there's no selection when copy/cut, select currect line by default
@@ -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: wrong project program directory parameter is sent to the debugger
   - enhancement: better behavior of mouse tips
+  - fix: in linux, projects no need of winres to be built
 
 Red Panda C++ Version 0.13.1
  - enhancement: suppoort localization info in project templates

RedPandaIDE/compiler/projectcompiler.cpp

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

RedPandaIDE/settings.cpp

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

Red_Panda_CPP.pro

@@ -15,7 +15,7 @@ linux: {
         PREFIX = /usr/local
     }
 
-    QMAKE_SUBSTITUTES += redpandaide.desktop.in
+    QMAKE_SUBSTITUTES += linux/redpandaide.desktop.in
 
     resources.path = $${PREFIX}/share/$${APP_NAME}
     resources.files += linux/templates
@@ -32,7 +32,7 @@ linux: {
     INSTALLS += pixmaps
 
     desktop.path = $${PREFIX}/share/applications
-    desktop.files += redpandaide.desktop
+    desktop.files += linux/redpandaide.desktop
     INSTALLS += desktop
 
 }

packages/deb/builddeb.sh

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

packages/deb/control

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

packages/debian/changelog

@@ -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
 
   * Initial release