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.

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

CON-276: Updated loading of redist + commit of submodule #144

Merged
merged 1 commit into from
Oct 24, 2022

Conversation

samuelraeburn
Copy link
Collaborator

@samuelraeburn samuelraeburn commented Oct 20, 2022

Updated loading of windows redistributable.

Updated rticonnextdds-connector submodule to feature/CON-276 branch:

Took all builds from BUILD_6.1.2.0_20221014T000000Z_RTI_REL build. All builds are licensed other than armv6.

Architectures used are as follows:
linux-arm: armv6vfphLinux3.xgcc4.7.2
linux-arm64: armv8Linux4.4gcc5.4.0
linux-x64: x64Linux2.6gcc4.4.5
win-x64: x64Win64VS2015
osx-x64: x64Darwin17clang9.0

Other than win-x64, these are identical to the architectures used in 1.2.0. Windows has been updated from VS2013 to VS2015. This meant also updating the redistributable to vcruntime140.dll.

@samuelraeburn
Copy link
Collaborator Author

Ran unit tests on Windows:


test\python\test_rticonnextdds_connector.py .........                                                            [  6%]
test\python\test_rticonnextdds_data_access.py ....................................xx.....................        [ 46%]
test\python\test_rticonnextdds_data_iterators.py ...                                                             [ 48%]
test\python\test_rticonnextdds_dataflow.py ....................                                                  [ 62%]
test\python\test_rticonnextdds_discovery.py .........                                                            [ 68%]
test\python\test_rticonnextdds_input.py ..x..                                                                    [ 71%]
test\python\test_rticonnextdds_metadata.py .................                                                     [ 83%]
test\python\test_rticonnextdds_output.py ..................                                                      [ 95%]
test\python\test_rticonnextdds_performance.py sssss                                                              [ 99%]
test\python\test_rticonnextdds_threading.py .                                                                    [100%]

================================ 138 passed, 5 skipped, 3 xfailed in 62.03s (0:01:02) =================================****

But, I am not sure how to check if in that situation we needed to load the redistributable or not.

@@ -139,7 +139,7 @@ def __init__(self): # pylint: disable=too-many-statements
directory = "win-x64"
libname = "rtiddsconnector"
post = "dll"
additional_lib = "msvcr120"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure why we didn't provide the .dll suffix previously. Looks to me like it is necessary at least.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you need the extension. The OS calls usually work with and without.

Copy link
Collaborator

@alexcamposruiz alexcamposruiz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this go into a support branch?

@samuelraeburn samuelraeburn merged commit a0e4f41 into develop Oct 24, 2022
@samuelraeburn samuelraeburn deleted the feature/CON-276 branch October 24, 2022 07:06
samuelraeburn added a commit that referenced this pull request Oct 24, 2022
samuelraeburn added a commit that referenced this pull request Oct 26, 2022
alvinkrebs added a commit that referenced this pull request Dec 15, 2022

* CON-92, CON-200 merge to 1.1.1 (#85)

* CON-92: Added the ability to obtain current version of Connector (#80)

* CON-92: Added the ability to obtain current version of Connector

3 static methods have been added to Connector
 - version
   - Provides the current version of Connector
 - native_library_version
   - Provides the current version of native libraries being used by Connector
 - native_library_build_string
   - Provides the build ID of the native libraries being used by Connector

* CON-92: Made the _from_native method static

* CON-92: Fixed docs

* CON-92: Changed output

Now a single function that provides a string conatining the API version +
core versions.
For example:
RTI Connector for Python, version 1.1.0
NDDSCORE_BUILD_6.1.0_20210531T122009Z_RTI_UNKNOWN
NDDSC_BUILD_6.1.0_20210531T122009Z_RTI_UNKNOWN
RTICONNECTOR_BUILD_6.1.0_20210531T122009Z_RTI_UNKNOWN

* CON-92: Renamed version to get_version

* CON-92: Remove ConnectorVersion from docs

Co-authored-by: Sam Raeburn <sam@rti.com>
(cherry picked from commit 00164ce)

* CON-200: Fix double free segfault (#79)

* CON-200: Fix double free segfault

* Update test/python/test_rticonnextdds_connector.py

Co-authored-by: Alex Campos <alejandro@rti.com>

Co-authored-by: Sam Raeburn <sam@rti.com>
Co-authored-by: Alex Campos <alejandro@rti.com>
(cherry picked from commit 9ffde89)

* Feature/con 191 (#83) (#86)

* CON-191: Added tests for 64-bit int conversions

* CON-191: Added docs

* CON-191: writer's edits to doc changes (py)

* CON-191: Updated tests and docs to reflect new behaviour

I noticed in the native libraries that we weren't being consistent with
the limits. Sometimes we were not checking for v < -LUA_MAX_INT, and sometimes
we were not being consistent with the use of > vs >=.
I have rectified this, the supported behaviour is as follows:

When setting via set_number, we allow |v| < 2^53.
When getting via get_number, we allow |v| <= 2^53.

The reason for the discrepancy between the set and get, is that
when we have a value in set_number, it has already been cast to a double,
so although 2^53 is perfectly representable, we do not know if the original
value was larger (e.g., 2^53 + 1 would appear as 2^53).

Also extended tests to ensure that all of the various supported ways
of setting / getting 64-bit values work as expected:
- allow setting large values via __setitem__ (string or number),
  set_string, set_dictionary
- allow getting large values via __getitem__ (returned as float or int
  depending on size), get_string, get_dictionary

* CON-191: Completed tests + docs

Co-authored-by: Sam Raeburn <sam@rti.com>
Co-authored-by: rkorte <rkorte@rti.com>
(cherry picked from commit 62a573c)

* CON-92: Handle case in obtaining version where Connector was git cloned (#87) (#88)

(cherry picked from commit 6a0ff37)

* PLATFORMS-2289. Adding macOS 11 to Connector PY release notes.

* HMAINT-235: Handle case where build ID contains 4 digits (#96) (#97)

(cherry picked from commit d7935e2)

* #fix HMAINT-202 -- update libraries for 1.2.0, set version for test.py (#100)

* HMAINT-202 -- correct rc1 version string (#103)

* HMAINT-202 -- set version to rc2 for testing (#107)

* CON-252: updating links from current to 6.1.1, py

* CORE-11993: canonical url added for python connector

* CON-251: connector py release notes for 6.1.1/1.2.0

* CON-251: 1.2.0 doc changes

- Move warning from 64-bit number section to release notes
- Add link to get_version API

* CON-251: added missing release note and fixed canonical formatting error

* CON-253: Document bug in numpy on aarch64 (#113) (#114)

(cherry picked from commit 77399ad)

* CON-234: fixing link to Python API reference

* CON-234: changed python api link to go to github

* HMAINT-202 -- set version string to 1.2.0 (#118)

* CON-251: applying PAM updates to supported platforms

* CON-251. Corrected the Jira # mentioned for CON-200 in what's fixed. Updated Supported Platforms to match JS release notes.

* CON-251. Corrected wording of what's tested.

* #fix HMAINT-202 -- new connector libraries for python, base on DDS 6.1.1 (20211203) (#121)

Co-authored-by: Bob Garrow <bgarrow@rti.com>

* #fix HMAINT-202 -- corrected library git references for py, base on DDS 6.1.1 (20211203) (#122)

* #fix HMAINT-202 -- clean out old libraries for py. (#123)

* CON-257: adding Lua vulnerability assessment to Connector 1.2.0 doc

* CON-257: updating vulnerability assessment section for python

* CON-257: updated release notes and copyright

* #fix HMAINT-202 -- new connector libraries for python, base on DDS 6.1.1 (20220309, bkprt) (#129)

* #fix HMAINT-202 -- final version string 1.2.0 (#132)

* CON-276: Updated loading of redist + commit of submodule (#144) (#146)

(cherry picked from commit a0e4f41)

* Feature/con 272 276 support (#148)

* CON-276: Updated documentation for supported Windows (#147)

* CON-276: Updated documentation for supported Windows

* CON-276: Fix notes

* CON-276: Updated PAM

(cherry picked from commit 0cbb5e1)

* Merge pull request #140 from rticommunity/doc/PY-44-readme

PY-44: adding deprecation notice to connector-py README files only
(cherry picked from commit ddafab4)
(cherry picked from commit 1be36f4)

* CON-276 CON-272: Cherry-picked changes to docs

* CON-276: Fix release notes

Co-authored-by: rkorte <36715349+rkorte@users.noreply.github.com>

* CON-280-support, change version number to 1.2.2 in support/connector/1.2.0 (#150)

* #fix CON-280-support, change version number to 1.2.2

* #fix CON-280-support, add rc suffix to version string ...

Co-authored-by: Bob Garrow <bgarrow@rti.com>

* CON-278 -- rc2 with libraries from 20221028 (#154)

Co-authored-by: Bob Garrow <bgarrow@rti.com>

* HMAINT-747: updating 1.2.0 version to 1.2.2 and 6.1.1 URLs to 6.1.2

* #fix CON-279 -- rc3 for new 20221111 libs ... (#157)

Co-authored-by: Bob Garrow <bgarrow@rti.com>

* CON-278 -- final version string for 1.2.2 (#159)

Co-authored-by: Bob Garrow <bgarrow@rti.com>

Co-authored-by: Sam <raeburnsamuel@gmail.com>
Co-authored-by: adelleolson <adelle@rti.com>
Co-authored-by: rkorte <rkorte@rti.com>
Co-authored-by: rkorte <36715349+rkorte@users.noreply.github.com>
Co-authored-by: Bob Garrow <bgarrow@rti.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants