Compiling/Installing : The CFGDIR parameter was removed. Use FILESDIR instead.

danmar · danmar · commit a17f2a6f05fe · 2019-08-17T10:53:07.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -71,10 +71,8 @@ matrix:
         - git clean -dfx
 # check what happens if we want to install it to some other dir,
         - echo $CXXFLAGS
-        - make -s MATCHCOMPILER=yes CFGDIR=/usr/share/cppcheck/cfg -j 2
-        - sudo make MATCHCOMPILER=yes CFGDIR=/usr/share/cppcheck/cfg install
-        - sudo mkdir -p /usr/share/cppcheck/cfg
-        - sudo install -D ./cfg/* -t /usr/share/cppcheck/cfg
+        - make -s MATCHCOMPILER=yes FILESDIR=/usr/share/cppcheck -j 2
+        - sudo make MATCHCOMPILER=yes FILESDIR=/usr/share/cppcheck install
 # check if it actually works:
         - /usr/bin/cppcheck ./cli
 # check if showtime=top5 works
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,9 @@ include(cmake/cxx11.cmake REQUIRED)
 
 use_cxx11()
 
+file(GLOB addons "addons/*.py")
 file(GLOB cfgs "cfg/*.cfg")
+file(GLOB platforms "platforms/*.xml")
 
 if (BUILD_TESTS)
     enable_testing()
diff --git a/Makefile b/Makefile
diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
@@ -23,6 +23,15 @@ install(TARGETS cppcheck
     RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}
     COMPONENT applications)
 
+install(FILES ${addons}
+   DESTINATION ${FILESDIR}/addons
+   COMPONENT headers)
+
 install(FILES ${cfgs}
-   DESTINATION ${CFGDIR}/
+   DESTINATION ${FILESDIR}/cfg
    COMPONENT headers)
+
+install(FILES ${platforms}
+   DESTINATION ${FILESDIR}/platforms
+   COMPONENT headers)
+
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
@@ -832,14 +832,14 @@ int CppCheckExecutor::check_internal(CppCheck& cppcheck, int /*argc*/, const cha
     if (!std || !posix || !windows) {
         const std::list<ErrorLogger::ErrorMessage::FileLocation> callstack;
         const std::string msg("Failed to load " + std::string(!std ? "std.cfg" : !posix ? "posix.cfg" : "windows.cfg") + ". Your Cppcheck installation is broken, please re-install.");
-#ifdef CFGDIR
-        const std::string details("The Cppcheck binary was compiled with CFGDIR set to \"" +
-                                  std::string(CFGDIR) + "\" and will therefore search for "
-                                  "std.cfg in that path.");
+#ifdef FILESDIR
+        const std::string details("The Cppcheck binary was compiled with FILESDIR set to \""
+                                  FILESDIR "\" and will therefore search for "
+                                  "std.cfg in " FILESDIR "/cfg.");
 #else
         const std::string cfgfolder(Path::fromNativeSeparators(Path::getPathFromFilename(argv[0])) + "cfg");
-        const std::string details("The Cppcheck binary was compiled without CFGDIR set. Either the "
-                                  "std.cfg should be available in " + cfgfolder + " or the CFGDIR "
+        const std::string details("The Cppcheck binary was compiled without FILESDIR set. Either the "
+                                  "std.cfg should be available in " + cfgfolder + " or the FILESDIR "
                                   "should be configured.");
 #endif
         ErrorLogger::ErrorMessage errmsg(callstack, emptyString, Severity::information, msg+" "+details, "failedToLoadCfg", false);
diff --git a/cmake/compilerDefinitions.cmake b/cmake/compilerDefinitions.cmake
@@ -5,5 +5,5 @@ if (UNIX)
     if (HAVE_RULES)
         add_definitions(-DHAVE_RULES -DTIXML_USE_STL)
     endif()
-    add_definitions(-DCFGDIR="${CFGDIR}")
+    add_definitions(-DFILESDIR="${FILESDIR}")
 endif()
diff --git a/cmake/options.cmake b/cmake/options.cmake
@@ -48,5 +48,5 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 
-set(CFGDIR                         ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} CACHE STRING "CFG files directory")
+set(FILESDIR                       ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} CACHE STRING "Cppcheck files directory")
 
diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
@@ -746,14 +746,14 @@ Library::Error MainWindow::loadLibrary(Library *library, const QString &filename
     if (ret.errorcode != Library::ErrorCode::FILE_NOT_FOUND)
         return ret;
 
-#ifdef CFGDIR
-    // Try to load the library from CFGDIR..
-    const QString cfgdir = CFGDIR;
-    if (!cfgdir.isEmpty()) {
-        ret = library->load(nullptr, (cfgdir+"/"+filename).toLatin1());
+#ifdef FILESDIR
+    // Try to load the library from FILESDIR/cfg..
+    const QString filesdir = FILESDIR;
+    if (!filesdir.isEmpty()) {
+        ret = library->load(nullptr, (filesdir+"/cfg/"+filename).toLatin1());
         if (ret.errorcode != Library::ErrorCode::FILE_NOT_FOUND)
             return ret;
-        ret = library->load(nullptr, (cfgdir+"/cfg/"+filename).toLatin1());
+        ret = library->load(nullptr, (filesdir+filename).toLatin1());
         if (ret.errorcode != Library::ErrorCode::FILE_NOT_FOUND)
             return ret;
     }
diff --git a/gui/projectfiledialog.cpp b/gui/projectfiledialog.cpp
@@ -76,15 +76,12 @@ ProjectFileDialog::ProjectFileDialog(ProjectFile *projectFile, QWidget *parent)
     const QString applicationFilePath = QCoreApplication::applicationFilePath();
     const QString appPath = QFileInfo(applicationFilePath).canonicalPath();
     QSettings settings;
-#ifdef CFGDIR
-    const QString cfgdir = CFGDIR;
-#endif
     const QString datadir = settings.value("DATADIR",QString()).toString();
     QStringList searchPaths;
     searchPaths << appPath << appPath + "/cfg" << inf.canonicalPath();
-#ifdef CFGDIR
-    if (!cfgdir.isEmpty())
-        searchPaths << cfgdir << cfgdir + "/cfg";
+#ifdef FILESDIR
+    if (FILESDIR[0])
+        searchPaths << FILESDIR << FILESDIR "/cfg";
 #endif
     if (!datadir.isEmpty())
         searchPaths << datadir << datadir + "/cfg";
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -74,11 +74,11 @@ namespace {
             if (Path::fileExists(exepath + "addons/" + fileName))
                 return exepath + "addons/" + fileName;
 
-#ifdef CFGDIR
-            if (Path::fileExists(CFGDIR + fileName))
-                return CFGDIR + fileName;
-            if (Path::fileExists(CFGDIR + ("../addons/" + fileName)))
-                return CFGDIR + ("../addons/" + fileName);
+#ifdef FILESDIR
+            if (Path::fileExists(FILESDIR + ("/" + fileName)))
+                return FILESDIR + ("/" + fileName);
+            if (Path::fileExists(FILESDIR + ("/addons/" + fileName)))
+                return FILESDIR + ("/addons/" + fileName);
 #endif
             return "";
         }
diff --git a/lib/library.cpp b/lib/library.cpp
@@ -95,8 +95,8 @@ Library::Error Library::load(const char exename[], const char path[])
         }
 
         std::list<std::string> cfgfolders;
-#ifdef CFGDIR
-        cfgfolders.push_back(CFGDIR);
+#ifdef FILESDIR
+        cfgfolders.push_back(FILESDIR "/cfg");
 #endif
         if (exename) {
             const std::string exepath(Path::fromNativeSeparators(Path::getPathFromFilename(exename)));
diff --git a/lib/platform.cpp b/lib/platform.cpp
@@ -165,12 +165,12 @@ bool cppcheck::Platform::loadPlatformFile(const char exename[], const std::strin
             filenames.push_back(Path::getPathFromFilename(Path::fromNativeSeparators(exename)) + "platforms/" + filename);
             filenames.push_back(Path::getPathFromFilename(Path::fromNativeSeparators(exename)) + "platforms/" + filename + ".xml");
         }
-#ifdef CFGDIR
-        std::string cfgdir = CFGDIR;
-        if (!cfgdir.empty() && cfgdir[cfgdir.size()-1] != '/')
-            cfgdir += '/';
-        filenames.push_back(cfgdir + ("../platforms/" + filename));
-        filenames.push_back(cfgdir + ("../platforms/" + filename + ".xml"));
+#ifdef FILESDIR
+        std::string filesdir = FILESDIR;
+        if (!filesdir.empty() && filesdir[filesdir.size()-1] != '/')
+            filesdir += '/';
+        filenames.push_back(filesdir + ("platforms/" + filename));
+        filenames.push_back(filesdir + ("platforms/" + filename + ".xml"));
 #endif
         bool success = false;
         for (int i = 0; i < filenames.size(); ++i) {
diff --git a/readme.md b/readme.md
@@ -83,16 +83,16 @@ make
 The recommended release build is:
 
 ```shell
-make MATCHCOMPILER=yes CFGDIR=cfg HAVE_RULES=yes CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function"
+make MATCHCOMPILER=yes FILESDIR=/usr/share/cppcheck HAVE_RULES=yes CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function"
 ```
 
 Flags:
 
 1.  `MATCHCOMPILER=yes`
     Python is used to optimise cppcheck. The Token::Match patterns are converted into C++ code at compile time.
 
-2.  `CFGDIR=cfg`
-    Specify folder where .cfg files are found
+2.  `FILESDIR=/usr/share/cppcheck`
+    Specify folder where cppcheck files are installed (addons, cfg, platform)
 
 3.  `HAVE_RULES=yes`
     Enable rules (PCRE is required if this is used)
diff --git a/readme.txt b/readme.txt
@@ -77,12 +77,12 @@ Compiling
             make
 
         The recommended release build is:
-            make MATCHCOMPILER=yes CFGDIR=cfg HAVE_RULES=yes
+            make MATCHCOMPILER=yes FILESDIR=/usr/share/cppcheck HAVE_RULES=yes
 
         Flags:
-        MATCHCOMPILER=yes : Python is used to optimise cppcheck at compile time
-        CFGDIR=cfg        : Specify folder where .cfg files are found
-        HAVE_RULES=yes    : Enable rules (pcre is required if this is used)
+        MATCHCOMPILER=yes               : Python is used to optimise cppcheck at compile time
+        FILESDIR=/usr/share/cppcheck    : Specify folder where cppcheck files are installed
+        HAVE_RULES=yes                  : Enable rules (pcre is required if this is used)
 
     g++ (for experts)
     =================
diff --git a/test/testimportproject.cpp b/test/testimportproject.cpp
@@ -99,7 +99,7 @@ class TestImportProject : public TestFixture {
 
     void importCompileCommands1() const {
         const char json[] = "[ { \"directory\": \"/tmp\","
-                            "\"command\": \"gcc -I/tmp -DCFGDIR=\\\\\\\"/usr/local/share/Cppcheck\\\\\\\" -DTEST1 -DTEST2=2 -o /tmp/src.o -c /tmp/src.c\","
+                            "\"command\": \"gcc -I/tmp -DFILESDIR=\\\\\\\"/usr/local/share/Cppcheck\\\\\\\" -DTEST1 -DTEST2=2 -o /tmp/src.o -c /tmp/src.c\","
                             "\"file\": \"/tmp/src.c\" } ]";
         std::istringstream istr(json);
         TestImporter importer;
diff --git a/tools/daca-test-patch.sh b/tools/daca-test-patch.sh
@@ -14,10 +14,10 @@ cd ~/cppcheck
 git checkout -f
 git apply $1
 make clean
-nice make SRCDIR=build CFGDIR=~/cppcheck/cfg CXXFLAGS=-O2
+nice make MATCHCOMPILER=yes FILESDIR=~/cppcheck CXXFLAGS=-O2
 mv cppcheck ~/daca2/cppcheck-patch
 git checkout -f
-nice make SRCDIR=build CFGDIR=~/cppcheck/cfg CXXFLAGS=-O2
+nice make MATCHCOMPILER=yes FILESDIR=~/cppcheck CXXFLAGS=-O2
 mv cppcheck ~/daca2/cppcheck-head
 make clean
 nice make
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
@@ -97,7 +97,7 @@ static void compilefiles(std::ostream &fout, const std::vector<std::string> &fil
         getDeps(file, depfiles);
         for (const std::string &depfile : depfiles)
             fout << " " << depfile;
-        fout << "\n\t$(CXX) " << args << " $(CPPFLAGS) $(CFG) $(CXXFLAGS)" << (external?" -w":"") << " $(UNDEF_STRICT_ANSI) -c -o " << objfile(file) << " " << builddir(file) << "\n\n";
+        fout << "\n\t$(CXX) " << args << " $(CPPFLAGS) $(CPPFILESDIR) $(CXXFLAGS)" << (external?" -w":"") << " $(UNDEF_STRICT_ANSI) -c -o " << objfile(file) << " " << builddir(file) << "\n\n";
     }
 }
 
@@ -229,11 +229,11 @@ int main(int argc, char **argv)
          << "    libcppdir:=lib\n"
          << "endif\n\n";
 
-    // explicit cfg dir..
-    fout << "ifdef CFGDIR\n"
-         << "    CFG=-DCFGDIR=\\\"$(CFGDIR)\\\"\n"
+    // explicit files dir..
+    fout << "ifdef FILESDIR\n"
+         << "    CPPFILESDIR=-DFILESDIR=\\\"$(FILESDIR)\\\"\n"
          << "else\n"
-         << "    CFG=\n"
+         << "    CPPFILESDIR=\n"
          << "endif\n\n";
 
     // enable backtrac
@@ -408,20 +408,31 @@ int main(int argc, char **argv)
     fout << "install: cppcheck\n";
     fout << "\tinstall -d ${BIN}\n";
     fout << "\tinstall cppcheck ${BIN}\n";
-    fout << "\tinstall addons/*.py ${BIN}\n";
-    fout << "\tinstall addons/*/*.py ${BIN}\n";
     fout << "\tinstall htmlreport/cppcheck-htmlreport ${BIN}\n";
-    fout << "ifdef CFGDIR \n";
-    fout << "\tinstall -d ${DESTDIR}${CFGDIR}\n";
-    fout << "\tinstall -m 644 cfg/* ${DESTDIR}${CFGDIR}\n";
-    fout << "endif\n\n";
+    fout << "ifdef FILESDIR\n";
+    fout << "\tinstall -d ${DESTDIR}${FILESDIR}\n";
+    fout << "\tinstall -d ${DESTDIR}${FILESDIR}/addons\n";
+    fout << "\tinstall -m 644 addons/*.py ${DESTDIR}${FILESDIR}/addons\n";
+    fout << "\tinstall -d ${DESTDIR}${FILESDIR}/cfg\n";
+    fout << "\tinstall -m 644 cfg/*.cfg ${DESTDIR}${FILESDIR}/cfg\n";
+    fout << "\tinstall -d ${DESTDIR}${FILESDIR}/platforms\n";
+    fout << "\tinstall -m 644 platforms/*.xml ${DESTDIR}${FILESDIR}/platforms\n";
+    fout << "else\n";
+    fout << "\t$(error FILESDIR must be set!)\n";
+    fout << "endif\n";
+    fout << "\n";
     fout << "uninstall:\n";
     fout << "\t@if test -d ${BIN}; then \\\n";
-    fout << "\t  files=\"cppcheck cppcheck-htmlreport \\\n";
-    fout << "\t    `ls -d addons/*.py addons/*/*.py 2>/dev/null | sed 's,^.*/,,'`\"; \\\n";
+    fout << "\t  files=\"cppcheck cppcheck-htmlreport\"; \\\n";
     fout << "\t  echo '(' cd ${BIN} '&&' rm -f $$files ')'; \\\n";
     fout << "\t  ( cd ${BIN} && rm -f $$files ); \\\n";
     fout << "\tfi\n";
+    fout << "ifdef FILESDIR \n";
+    fout << "\t@if test -d ${DESTDIR}${FILESDIR}; then \\\n";
+    fout << "\t  echo rm -rf ${DESTDIR}${FILESDIR}; \\\n";
+    fout << "\t  rm -rf ${DESTDIR}${FILESDIR}; \\\n";
+    fout << "\tfi\n";
+    fout << "endif\n";
     fout << "ifdef CFGDIR \n";
     fout << "\t@if test -d ${DESTDIR}${CFGDIR}; then \\\n";
     fout << "\t  files=\"`cd cfg 2>/dev/null && ls`\"; \\\n";
