Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support include files for package names with dot (closes #1129) #1132

Merged
merged 3 commits into from
Jan 18, 2021
Merged

support include files for package names with dot (closes #1129) #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcac34d
protect include fine names from using dots from package name
eddelbuettel Dec 27, 2020
e4fdc46
add ChangeLog after rebase
eddelbuettel Dec 28, 2020
fb91e5a
roll minor version
eddelbuettel Jan 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2021-01-17 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): Roll minor version
* inst/include/Rcpp/config.h: Idem

2021-01-16 Dirk Eddelbuettel <edd@debian.org>

* tests/tinytest.R: Test for CODECOV when deciding to run extensive
Expand All @@ -12,6 +17,8 @@
* R/RcppClass.R: Idem
* R/RcppLdpath.R: Idem

* src/attributes.cpp: Support include files with dots in package name

2021-01-14 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Date, Version): Release 1.0.6
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: Rcpp
Title: Seamless R and C++ Integration
Version: 1.0.6
Date: 2021-01-14
Version: 1.0.6.1
Date: 2021-01-17
Author: Dirk Eddelbuettel, Romain Francois, JJ Allaire, Kevin Ushey, Qiang Kou,
Nathan Russell, Douglas Bates and John Chambers
Maintainer: Dirk Eddelbuettel <edd@debian.org>
Expand Down
4 changes: 2 additions & 2 deletions inst/include/Rcpp/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#define RCPP_VERSION_STRING "1.0.6"

// the current source snapshot
#define RCPP_DEV_VERSION RcppDevVersion(1,0,6,0)
#define RCPP_DEV_VERSION_STRING "1.0.6.0"
#define RCPP_DEV_VERSION RcppDevVersion(1,0,6,1)
#define RCPP_DEV_VERSION_STRING "1.0.6.1"

#endif
17 changes: 13 additions & 4 deletions src/attributes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,9 @@ namespace attributes {
// if it wasn't (throws exception on io error)
bool commit(const std::string& preamble = std::string());

// Convert a dot in package name to underscore for use in header file name
std::string dotNameHelper(const std::string & name) const;

private:

// Private virtual for doWriteFunctions so the base class
Expand Down Expand Up @@ -717,7 +720,7 @@ namespace attributes {
std::string includeDir_;
};

// Class which manages generating PackageName_RcppExports.h header file
// Class which manages generating PackageName.h header file
class CppPackageIncludeGenerator : public ExportsGenerator {
public:
CppPackageIncludeGenerator(const std::string& packageDir,
Expand Down Expand Up @@ -1894,6 +1897,13 @@ namespace attributes {
return removeFile(targetFile_);
}

// Convert a possible dot in package name to underscore as needed for header file
std::string ExportsGenerator::dotNameHelper(const std::string & name) const {
std::string newname(name);
std::replace(newname.begin(), newname.end(), '.', '_');
return newname;
}

CppExportsGenerator::CppExportsGenerator(const std::string& packageDir,
const std::string& package,
const std::string& fileSep)
Expand Down Expand Up @@ -2128,7 +2138,7 @@ namespace attributes {
const std::string& fileSep)
: ExportsGenerator(
packageDir + fileSep + "inst" + fileSep + "include" +
fileSep + package + kRcppExportsSuffix,
fileSep + dotNameHelper(package) + kRcppExportsSuffix,
package,
"//")
{
Expand Down Expand Up @@ -2346,7 +2356,7 @@ namespace attributes {
const std::string& fileSep)
: ExportsGenerator(
packageDir + fileSep + "inst" + fileSep + "include" +
fileSep + package + ".h",
fileSep + dotNameHelper(package) + ".h",
package,
"//")
{
Expand All @@ -2359,7 +2369,6 @@ namespace attributes {
std::string guard = getHeaderGuard(); // #nocov start
ostr() << "#ifndef " << guard << std::endl;
ostr() << "#define " << guard << std::endl << std::endl;

ostr() << "#include \"" << packageCpp() << kRcppExportsSuffix
<< "\"" << std::endl;

Expand Down