Skip to content

Commit 42f2a60

Browse files
authored
Update the LibExtension.so to 1.2 for R and Python (#40)
* updte .so to 1.2 * update to 1.2 * update docs * trying to get zip to recognize file name * .. * updating version to see why zip not found * update minor version in cmake * update cmake versino for python
1 parent f3014f1 commit 42f2a60

File tree

11 files changed

+13
-13
lines changed

11 files changed

+13
-13
lines changed

language-extensions/R/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ B. Installing needed packages from respective sources.
7676
1. Install the [Rcpp](https://cran.r-project.org/web/packages/Rcpp/index.html) and [RInside](https://cran.r-project.org/web/packages/RInside/index.html) packages into this R runtime. These are needed to seamlessly integrate and embed R in C++.
7777

7878
1. Run [**build-RExtension.sh**](./build/linux/build-RExtension.sh) which will generate: \
79-
- /PATH/TO/ENLISTMENT/build-output/RExtension/linux/release/libRExtension.so.1.1
79+
- /PATH/TO/ENLISTMENT/build-output/RExtension/linux/release/libRExtension.so.1.2
8080

8181
1. Run [**create-R-extension-zip.sh**](./build/linux/create-RExtension-zip.sh) which will generate: \
8282
- /PATH/TO/ENLISTMENT/build-output/RExtension/linux/release/packages/R-lang-extension.zip \

language-extensions/R/build/linux/build-RExtension.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function build {
4646

4747
# Check the exit code of the compiler and exit appropriately so that build will fail.
4848
#
49-
check_exit_code "Success: Built libRExtension.so.1.1" "Error: Failed to build RExtension"
49+
check_exit_code "Success: Built libRExtension.so.1.2" "Error: Failed to build RExtension"
5050

5151
# Move the generated libs to configuration folder
5252
#
@@ -57,7 +57,7 @@ function build {
5757
# This will create the RExtension package with unsigned binaries, this is used for local development and non-release builds. Release
5858
# builds will call create-RExtension-zip.sh after the binaries have been signed and this will be included in the zip
5959
#
60-
zip ${TARGET}/R-lang-extension libRExtension.so.1.1
60+
zip ${TARGET}/R-lang-extension libRExtension.so.1.2
6161

6262
check_exit_code "Success: Created R-lang-extension.zip" "Error: Failed to create zip for RExtension"
6363
}

language-extensions/R/build/linux/create-RExtension-zip.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function build {
2020

2121
mkdir -p ${BUILD_OUTPUT}/packages
2222
cd ${BUILD_OUTPUT}
23-
zip packages/R-lang-extension-linux libRExtension.so.1.1
23+
zip packages/R-lang-extension-linux libRExtension.so.1.2
2424
check_exit_code ${BUILD_CONFIGURATION}
2525
}
2626

language-extensions/R/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
cmake_minimum_required (VERSION 3.5)
44

55
set(REXTENSION_VERSION_MAJOR "1")
6-
set(REXTENSION_VERSION_MINOR "1")
6+
set(REXTENSION_VERSION_MINOR "2")
77
set(REXTENSION_VERSION ${REXTENSION_VERSION_MAJOR}.${REXTENSION_VERSION_MINOR})
88

99
# this is what the final library is going to be named

language-extensions/R/test/build/linux/run-RExtension-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function build {
1919

2020
pushd ${REXTENSIONTEST_WORKING_DIR}/${CMAKE_CONFIGURATION}
2121
# Move the generated libs to configuration folder
22-
cp ${REXTENSION_WORKING_DIR}/${CMAKE_CONFIGURATION}/libRExtension.so.1.1 .
22+
cp ${REXTENSION_WORKING_DIR}/${CMAKE_CONFIGURATION}/libRExtension.so.1.2 .
2323
./RExtension-test --gtest_output=xml:${ENL_ROOT}/out/TestReport_RExtension-test.xml
2424

2525
# Check the exit code of the tests.

language-extensions/R/test/src/RExtensionApiTests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ using namespace std;
3737
const string x_RExtensionLibName = "libRExtension.dll";
3838
namespace fs = filesystem;
3939
#else
40-
const string x_RExtensionLibName = "libRExtension.so.1.1";
40+
const string x_RExtensionLibName = "libRExtension.so.1.2";
4141
namespace fs = experimental::filesystem;
4242
#endif // _WIN64
4343

language-extensions/python/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ B. Installing needed packages from respective sources.
6262
1. Modify [**PythonExtensionUtils_linux.cpp**](src/linux/PythonExtensionUtils_linux.cpp). Change the version of python on line 97 to the custom python version.
6363

6464
1. Run [**build-python-extension.sh**](build/linux/build-python-extension.sh) which will generate: \
65-
- PATH/TO/ENLISTMENT/build-output/pythonextension/linux/release/libPythonExtension.so.1.1
65+
- PATH/TO/ENLISTMENT/build-output/pythonextension/linux/release/libPythonExtension.so.1.2
6666

6767
1. Run [**create-python-extension-zip.sh**](build/linux/create-python-extension-zip.sh) which will generate: \
6868
- PATH/TO/ENLISTMENT/build-output/pythonextension/linux/release/packages/python-lang-extension.zip \

language-extensions/python/build/linux/build-python-extension.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function build {
4242

4343
# Check the exit code of the compiler and exit appropriately so that build will fail.
4444
#
45-
check_exit_code "Success: Built libPythonExtension.so.1.1" "Error: Failed to build python extension"
45+
check_exit_code "Success: Built libPythonExtension.so.1.2" "Error: Failed to build python extension"
4646

4747
# Move the generated libs to configuration folder
4848
#
@@ -54,7 +54,7 @@ function build {
5454
# This will create the python extension package with unsigned binaries, this is used for local development and non-release builds. release
5555
# builds will call create-python-extension-zip.sh after the binaries have been signed and this will be included in the zip
5656
#
57-
zip ${TARGET}/python-lang-extension libPythonExtension.so.1.1
57+
zip ${TARGET}/python-lang-extension libPythonExtension.so.1.2
5858

5959
check_exit_code "Success: Created python-lang-extension.zip" "Error: Failed to create zip for python extension"
6060
}

language-extensions/python/build/linux/create-python-extension-zip.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function build {
2121

2222
mkdir -p ${BUILD_OUTPUT}/packages
2323
cd ${BUILD_OUTPUT}
24-
zip packages/python-lang-extension-linux libPythonExtension.so.1.1
24+
zip packages/python-lang-extension-linux libPythonExtension.so.1.2
2525
check_exit_code ${BUILD_CONFIGURATION}
2626
}
2727

language-extensions/python/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
cmake_minimum_required (VERSION 3.5)
44

55
set(PYTHONEXTENSION_VERSION_MAJOR "1")
6-
set(PYTHONEXTENSION_VERSION_MINOR "1")
6+
set(PYTHONEXTENSION_VERSION_MINOR "2")
77
set(PYTHONEXTENSION_VERSION ${PYTHONEXTENSION_VERSION_MAJOR}.${PYTHONEXTENSION_VERSION_MINOR})
88
set(PYTHON_VERSION "3.10")
99
set(PYTHON_VERSION_NO_DOT "310")

language-extensions/python/test/build/linux/run-pythonextension-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ function build {
2222

2323
# Move the generated libs to configuration folder
2424
#
25-
cp ${PYTHONEXTENSION_WORKING_DIR}/${CMAKE_CONFIGURATION}/libPythonExtension.so.1.1 .
25+
cp ${PYTHONEXTENSION_WORKING_DIR}/${CMAKE_CONFIGURATION}/libPythonExtension.so.1.2 .
2626
cp /usr/src/gtest/*.so .
2727

2828
ENL_ROOT=${ENL_ROOT} ./pythonextension-test --gtest_output=xml:${ENL_ROOT}/out/TestReport_PythonExtension-test.xml

0 commit comments

Comments
 (0)