Merge pull request #2 from SAP/versioning

Remove false error message on failure to delete file

CONTRIBUTING.md → .github/CONTRIBUTING.md

@@ -12,13 +12,13 @@
 
 All members of the project community must abide by the [SAP Open Source Code of Conduct](https://github.com/SAP/.github/blob/main/CODE_OF_CONDUCT.md).
 Only by respecting each other we can develop a productive, collaborative community.
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting [a project maintainer](.reuse/dep5).
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting [a project maintainer](../.reuse/dep5).
 
 ## Engaging in Our Project
 
 We use GitHub to manage reviews of pull requests.
 
-* If you are a new contributor, see: [Steps to Contribute](#steps-to-contribute)
+* If you are a new contributor, see [Steps to Contribute](#steps-to-contribute).
 
 * Before implementing your change, create an issue that describes the problem you would like to solve or the code that should be enhanced. Please note that you are willing to work on that issue.
 
@@ -36,7 +36,8 @@ You are welcome to contribute code in order to fix a bug or to implement a new f
 
 The following rule governs code contributions:
 
-* Contributions must be licensed under the [Apache 2.0 License](./LICENSE)
+* Contributions must be licensed under the [Apache 2.0 License](../LICENSE).
+
 * Due to legal reasons, contributors will be asked to accept a Developer Certificate of Origin (DCO) when they create the first pull request to this project. This happens in an automated fashion during the submission process. SAP uses [the standard DCO text of the Linux Foundation](https://developercertificate.org/).
 
 ## Issues and Planning

.github/workflows/versioning.yml

@@ -13,11 +13,15 @@ on:
 
 jobs:
   bump-build-no:
+    if: github.event.commits[0].author.name != 'github-actions'
     runs-on: ubuntu-latest
 
     steps:
-      - name: Check out repository
+      - name: Check out source code repository
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.ACCESS_PAT }}
 
       - name: Bump build number
         run: echo "VERSION=$(awk -F. '{$NF++;print}' OFS=. < cfg/VERSION)" >> $GITHUB_ENV
@@ -27,7 +31,7 @@ jobs:
 
       - name: Push updated VERSION file
         run: |
-          git config user.name "${{ github.actor }}"
-          git config user.email "${{ github.actor }}@users.noreply.github.com"
+          git config user.name github-actions
+          git config user.email github-actions@github.com
           git commit -m"chore(version): build number $VERSION" cfg/VERSION
           git push origin HEAD

README.md

@@ -67,7 +67,9 @@ We use the packages [googletest](https://github.com/google/googletest) and
 some unit tests for the C++ and Fortran code, respectively. Therefore,
 you need to set the environment variables `GTEST_ROOT` and `PFUNIT` to point to
 the root path of valid installations of the googletest and pFUnit frameworks,
-respectively, before executing the cmake command shown below.
+respectively, before executing the cmake command shown below. See
+[Installing googletest and pFUnit](https://github.com/SAP/fedem-foundation/blob/main/pFUnit/README.md#installing-googletest-and-pfunit)
+for instructions on how to install these packages on your system.
 
 - From a bash shell or command prompt, clone the sources of this repository:
 
@@ -83,7 +85,7 @@ respectively, before executing the cmake command shown below.
       cmake .. -DCMAKE_BUILD_TYPE=Release
       make check
 
-  If you also want to build and test a shared object library for
+  If you also want to build and test the shared object library for
   [chainShape](chainShape), you need to include `-DUSE_FORTRAN=ON`
   as command-line option to the cmake command above.
 
@@ -143,7 +145,11 @@ See also the [README.md](test/fedempy/README.md) file for `fedempy`.
 
 ## Contributing
 
-This project is open to feature requests/suggestions, bug reports etc. via [GitHub issues](https://github.com/SAP/fedem-mdb/issues). Contribution and feedback are encouraged and always welcome. For more information about how to contribute, the project structure, as well as additional contribution information, see our [Contribution Guidelines](CONTRIBUTING.md).
+This project is open to feature requests, suggestions, bug reports, etc.,
+via [GitHub issues](https://github.com/SAP/fedem-mdb/issues).
+Contributions and feedback are encouraged and always welcome.
+For more information about how to contribute,
+see our [Contribution Guidelines](.github/CONTRIBUTING.md).
 
 ## Security / Disclosure
 

cfg/VERSION

@@ -1 +1 @@
-3.0.2
+3.1.0

vpmDB/FmFileSys.C

@@ -7,8 +7,8 @@
 
 #include "vpmDB/FmFileSys.H"
 #include "FFaLib/FFaOS/FFaFilePath.H"
-#include "FFaLib/FFaDefinitions/FFaMsg.H"
 
+#include <iostream>
 #ifdef FT_HAS_QT
 #include <QDateTime>
 #include <QFileInfo>
@@ -19,7 +19,6 @@
 #include <unistd.h>
 #ifdef FT_HAS_DIRENT
 #include <dirent.h>
-#include <iostream>
 #endif
 #endif
 #include <string.h>
@@ -407,11 +406,13 @@ int FmFileSys::removeDir(const std::string& dirName, bool removeFiles)
     if (FmFileSys::isDirectory(FFaFilePath::makeItAbsolute(fName,dirName)))
       ret = FmFileSys::removeDir(fName,removeFiles);
     else if (removeFiles)
+    {
       ret = FmFileSys::deleteFile(fName) ? 1 : -1;
+      if (ret < 0)
+        std::cerr <<" *** Could not delete file "<< fName << std::endl;
+    }
     else
       ret = -1;
-    if (ret < 0)
-      ListUI <<"  -> Could not delete "<< fName <<"\n";
     if (ret < 0 && ndel >= 0)
       ndel = ret;
     else if (ret < 0 || ndel >= 0)
@@ -420,9 +421,12 @@ int FmFileSys::removeDir(const std::string& dirName, bool removeFiles)
   if (ndel < 0) return ndel;
 
 #ifdef FT_HAS_QT
-  return dir.rmdir(".") ? ndel : -1;
+  ret = dir.rmdir(".") ? ndel : -1;
 #else
   ret = rmdir(dirName.c_str());
-  return ret < 0 ? ret : ndel;
+  if (ret == 0) ret = ndel;
 #endif
+  if (ret < 0)
+    std::cerr <<" *** Could not delete directory "<< dirName << std::endl;
+  return ret;
 }