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

Unpin zeven_zip cookbook to ~> 4.0.0 #64

Draft
wants to merge 4 commits into
base: latest
Choose a base branch
from
+46 −21
Draft

Unpin zeven_zip cookbook to ~> 4.0.0 #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0e49c2
pessimistic locking to version 4 of zeven_zip
claraberendsen Feb 5, 2024
54e932e
correct seven_zip version
claraberendsen Feb 6, 2024
14021f1
remove seven_zip
claraberendsen Feb 6, 2024
8714aff
fix wrong slash on path
claraberendsen Feb 7, 2024
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
1 change: 0 additions & 1 deletion cookbooks/ros2_windows/metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@
#
# source_url 'https://github.com/osrf/chef-osrf'
depends 'chocolatey', '3.0.0'
depends 'seven_zip', '3.2.0'
depends 'windows', '7.0.2'
9 changes: 7 additions & 2 deletions cookbooks/ros2_windows/recipes/opencv.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
seven_zip_archive 'open_cv_zip' do
path 'C:\\'
remote_file 'C:\\opencv-3.4.6-vc16.VS2019.zip' do
source 'https://github.com/ros2/ros2/releases/download/opencv-archives/opencv-3.4.6-vc16.VS2019.zip'
end

archive_file 'open_cv_zip' do
destination 'C:\\'
path 'C:\\opencv-3.4.6-vc16.VS2019.zip'
overwrite true
action :extract
end

windows_env 'OpenCV_DIR' do
Expand Down
9 changes: 7 additions & 2 deletions cookbooks/ros2_windows/recipes/opensplice.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
seven_zip_archive 'opensplice' do
path 'C:\opensplice'
remote_file 'C:\\PXXX-VortexOpenSplice-6.9.190925OSS-HDE-x86_64.win-vs2019-installer.zip' do
source 'https://github.com/ADLINK-IST/opensplice/releases/download/OSPL_V6_9_190925OSS_RELEASE/PXXX-VortexOpenSplice-6.9.190925OSS-HDE-x86_64.win-vs2019-installer.zip'
end

archive_file 'opensplice' do
destination 'C:\\opensplice'
source 'C:\\PXXX-VortexOpenSplice-6.9.190925OSS-HDE-x86_64.win-vs2019-installer.zip'
overwrite true
action :extract
end

windows_env 'OSPL_HOME' do
Expand Down
2 changes: 0 additions & 2 deletions cookbooks/ros2_windows/recipes/ros2.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
include_recipe 'chocolatey'

# Using seven_zip also for general zip files because it can download and extract in a single resource
include_recipe 'seven_zip'
include_recipe 'ros2_windows::visual_studio'
include_recipe 'ros2_windows::python'
include_recipe 'ros2_windows::pip_installs'
Expand Down
9 changes: 7 additions & 2 deletions cookbooks/ros2_windows/recipes/ros2_binaries.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
release_version = node['ros2_windows']['ros_distro']
build_type = node['ros2_windows']['build_type']

seven_zip_archive 'ros2' do
remote_file 'C:\\ros2_windows.zip' do
source node['ros2_windows'][release_version][build_type]
path node['ros2_windows']['ros2_ws']
end

archive_file 'ros2' do
path 'C:\\ros2_windows.zip'
destination node['ros2_windows']['ros2_ws']
action :extract
end
11 changes: 7 additions & 4 deletions cookbooks/ros2_windows/recipes/rti_connext.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

connext_params = node['ros2_windows']['rti_connext']

include_recipe 'seven_zip'

output="#{Chef::JSONCompat.to_json_pretty(node.to_hash)}"

# These will fail if the rti_connext parameters have not been specified because the defaults are 'nil'
Expand Down Expand Up @@ -116,10 +114,15 @@
code "copy #{connext_params['license_file']} C:/connext/"
end

seven_zip_archive 'openssl_zip' do
path 'C:/connext/'
remote_file 'C:\\openssl.zip' do
source openssl_installer_zip
end

archive_file 'openssl_zip' do
destination 'C:/connext/'
path 'C:\\openssl.zip'
overwrite false
action :extract
end

windows_env 'RTI_LICENSE_FILE' do
Expand Down
26 changes: 18 additions & 8 deletions cookbooks/ros2_windows/recipes/xmllint.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
seven_zip_archive 'libxml2' do
path 'C:\\xmllint'
remote_file 'C:\\libxml2-2.9.3-win32-x86_64.7z' do
source 'https://www.zlatkovic.com/pub/libxml/64bit/libxml2-2.9.3-win32-x86_64.7z'
end
remote_file 'C:\\zlib-1.2.8-win32-x86_64.7z' do
source 'https://www.zlatkovic.com/pub/libxml/64bit/zlib-1.2.8-win32-x86_64.7z'
end
remote_file 'C:\\iconv-1.14-win32-x86_64.7z' do
source 'https://www.zlatkovic.com/pub/libxml/64bit/iconv-1.14-win32-x86_64.7z'
end

archive_file 'libxml2' do
destination 'C:\\xmllint'
path 'C:\\libxml2-2.9.3-win32-x86_64.7z'
overwrite true
end

seven_zip_archive 'zlib' do
path 'C:\\xmllint'
source 'https://www.zlatkovic.com/pub/libxml/64bit/zlib-1.2.8-win32-x86_64.7z'
archive_file 'zlib' do
destination 'C:\\xmllint'
path 'C:\\zlib-1.2.8-win32-x86_64.7z'
overwrite true
end

seven_zip_archive 'iconv' do
path 'C:\\xmllint'
source 'https://www.zlatkovic.com/pub/libxml/64bit/iconv-1.14-win32-x86_64.7z'
archive_file 'iconv' do
destination 'C:\\xmllint'
path 'C:\\iconv-1.14-win32-x86_64.7z'
overwrite true
end

Expand Down