-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Use feature/release_3.24.6.1 branch of blp repo * Enable macOS in CI as it is arm64 based now Dump logs in CI if failure Update install_name_tool call * Download branch is now a variable * Adjust src/Makevars.win to blp branch too * Support both cpu platforms for macOS * Edit to DESCRIPTION::Description [ci skip] * Revert from feature/release_3.24.6.1 to master following blp merge * Update ChangeLog for recent PRs
- Loading branch information
1 parent
890fb5f
commit a16d3fd
Showing
6 changed files
with
94 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,13 @@ | ||
| 2024-09-05 John Laing <[email protected]> | ||
|
|
||
| * src/bsrch.cpp: Correct over-use of Name{} | ||
| * R/bsrch.R: Add example of bsrch() | ||
| * man/bsrch.R: Idem | ||
|
|
||
| 2024-09-01 Dirk Eddelbuettel <[email protected]> | ||
|
|
||
| * src/bds.cpp: Correct over-use of Name{} | ||
|
|
||
| 2024-08-27 Dirk Eddelbuettel <[email protected]> | ||
|
|
||
| * DESCRIPTION (Version, Date): Roll micro version and date | ||
|
|
@@ -20,6 +30,8 @@ | |
| * src/lookup.cpp: Idem | ||
|
|
||
| * src/Makevars.in: Remove obsolete C++11 setter | ||
| * src/Makevars.in: Set to development branch of blp repo for testing | ||
| * src/Makevars.win: Idem | ||
|
|
||
| * .editorconfig: Added | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,54 +1,55 @@ | ||
| ## -*- mode: Makefile; tab-width: 8 -*- | ||
| ## | ||
| ## Makefile.win -- Windows build system | ||
| ## | ||
| ## Copyright (C) 2015 Whit Armstrong and Dirk Eddelbuettel | ||
| ## | ||
| ## This file is part of Rblpapi | ||
| ## | ||
| ## Rblpapi is free software: you can redistribute it and/or modify | ||
| ## it under the terms of the GNU General Public License as published by | ||
| ## the Free Software Foundation, either version 2 of the License, or | ||
| ## (at your option) any later version. | ||
| ## | ||
| ## Rblpapi is distributed in the hope that it will be useful, | ||
| ## but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| ## GNU General Public License for more details. | ||
| ## | ||
| ## You should have received a copy of the GNU General Public License | ||
| ## along with Rblpapi. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
|
|
||
| ## Distinguish between 32 and 64 bit windows | ||
| ifeq "$(WIN)" "64" | ||
| FLV = x64 | ||
| else | ||
| FLV = i386 | ||
| endif | ||
|
|
||
| ## Standard compiler / linker flags including windows flavor | ||
| CXX_STD = CXX11 | ||
| PKG_CPPFLAGS = -I../inst/include -I. | ||
| PKG_LIBS = -lblpapi3_${WIN} -L${FLV} | ||
|
|
||
|
|
||
| ## SHLIB target is built by R, blpLibrary is a target we use to expand the tar.gz | ||
| all: blpLibrary $(SHLIB) | ||
|
|
||
| ## target to ensure tar.gz files get unpacked | ||
| ## the opening '@' ensures operations are executed 'quietly' | ||
| ## in order to see commands as they happens add a 'v' to the tar and cp commands | ||
| ## curl has '-k' flag to suppress certificate warnings | ||
| blpLibrary: | ||
| @if [ ! -d ../inst ]; then mkdir -p ../inst; fi | ||
| @if [ ! -d ../blp/win/${FLV} ]; then mkdir -p ../blp/win/${FLV}; fi | ||
| @if [ ! -f ../blp/win/${FLV}/blpHeaders.tar.gz ]; then curl -s -k -L -O https://github.com/Rblp/blp/raw/master/headers/windows/blpHeaders.tar.gz; mv blpHeaders.tar.gz ../blp/win/${FLV}; tar xfz ../blp/win/${FLV}/blpHeaders.tar.gz -C ../inst; fi | ||
| @if [ ! -f ../blp/win/${FLV}/blpLibrary.tar.gz ]; then curl -s -k -L -O https://github.com/Rblp/blp/raw/master/win${WIN}/blpLibrary.tar.gz; mv blpLibrary.tar.gz ../blp/win/${FLV}; tar xfz ../blp/win/${FLV}/blpLibrary.tar.gz; fi | ||
| @if [ ! -d ${FLV} ]; then mkdir -p ${FLV}; fi | ||
| @cp blpapi3_${WIN}.dll ${FLV} | ||
| @if [ ! -d ../inst/libs/${FLV} ]; then mkdir -p ../inst/libs/${FLV}; fi | ||
| @cp blpapi3_${WIN}.dll ../inst/libs/${FLV} | ||
|
|
||
| ## Ensure the blpLibrary target is always executed | ||
| .Phony: blpLibrary | ||
| ## -*- mode: Makefile; tab-width: 8 -*- | ||
| ## | ||
| ## Makefile.win -- Windows build system | ||
| ## | ||
| ## Copyright (C) 2015 - 2024 Whit Armstrong and Dirk Eddelbuettel | ||
| ## | ||
| ## This file is part of Rblpapi | ||
| ## | ||
| ## Rblpapi is free software: you can redistribute it and/or modify | ||
| ## it under the terms of the GNU General Public License as published by | ||
| ## the Free Software Foundation, either version 2 of the License, or | ||
| ## (at your option) any later version. | ||
| ## | ||
| ## Rblpapi is distributed in the hope that it will be useful, | ||
| ## but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| ## GNU General Public License for more details. | ||
| ## | ||
| ## You should have received a copy of the GNU General Public License | ||
| ## along with Rblpapi. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
|
|
||
| ## Distinguish between 32 and 64 bit windows | ||
| ifeq "$(WIN)" "64" | ||
| FLV = x64 | ||
| else | ||
| FLV = i386 | ||
| endif | ||
|
|
||
| ## Standard compiler / linker flags including windows flavor | ||
| # CXX_STD = CXX11 | ||
| PKG_CPPFLAGS = -I../inst/include -I. | ||
| PKG_LIBS = -lblpapi3_${WIN} -L${FLV} | ||
|
|
||
|
|
||
| ## SHLIB target is built by R, blpLibrary is a target we use to expand the tar.gz | ||
| all: blpLibrary $(SHLIB) | ||
|
|
||
| ## target to ensure tar.gz files get unpacked | ||
| ## the opening '@' ensures operations are executed 'quietly' | ||
| ## in order to see commands as they happens add a 'v' to the tar and cp commands | ||
| ## curl has '-k' flag to suppress certificate warnings | ||
| BRANCH = "master" | ||
| blpLibrary: | ||
| @if [ ! -d ../inst ]; then mkdir -p ../inst; fi | ||
| @if [ ! -d ../blp/win/${FLV} ]; then mkdir -p ../blp/win/${FLV}; fi | ||
| @if [ ! -f ../blp/win/${FLV}/blpHeaders.tar.gz ]; then curl -s -k -L -O https://github.com/Rblp/blp/raw/${BRANCH}/headers/windows/blpHeaders.tar.gz; mv blpHeaders.tar.gz ../blp/win/${FLV}; tar xfz ../blp/win/${FLV}/blpHeaders.tar.gz -C ../inst; fi | ||
| @if [ ! -f ../blp/win/${FLV}/blpLibrary.tar.gz ]; then curl -s -k -L -O https://github.com/Rblp/blp/raw/${BRANCH}/win${WIN}/blpLibrary.tar.gz; mv blpLibrary.tar.gz ../blp/win/${FLV}; tar xfz ../blp/win/${FLV}/blpLibrary.tar.gz; fi | ||
| @if [ ! -d ${FLV} ]; then mkdir -p ${FLV}; fi | ||
| @cp blpapi3_${WIN}.dll ${FLV} | ||
| @if [ ! -d ../inst/libs/${FLV} ]; then mkdir -p ../inst/libs/${FLV}; fi | ||
| @cp blpapi3_${WIN}.dll ../inst/libs/${FLV} | ||
|
|
||
| ## Ensure the blpLibrary target is always executed | ||
| .Phony: blpLibrary |