Skip to content

Commit

Permalink
fix: disabled tebako package stripping on Windows because of #172
Browse files Browse the repository at this point in the history
  • Loading branch information
maxirmx committed Jul 21, 2024
1 parent fe7fb8c commit fd496a4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ endif(DWARFS_PRELOAD)
# Ruby

set(RUBY_L_FLAGS "-L${DEPS_LIB_DIR} -L${CMAKE_CURRENT_BINARY_DIR}")
set(RUBY_C_FLAGS "-pthread -I${DEPS_INCLUDE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/include")
set(RUBY_C_FLAGS "-O0 -pthread -I${DEPS_INCLUDE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/include")

# Shadow
# https://github.com/deivid-rodriguez/byebug/issues/825
Expand Down
4 changes: 2 additions & 2 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ To ensure the correct version of bison is picked, run this command before the bu

[source,sh]
----
export PATH="$(brew --prefix bison)/bin:$PATH"
export PATH="$(brew --prefix bison)/bin:$PATH"
----

=== Windows (workstation 10, 11; Server 2019, 2022)
Expand All @@ -154,7 +154,7 @@ Once it is installed use the following commands:
Please note that on Windows tebako may face issues related by CMake path length limitations.
(https://gitlab.kitware.com/cmake/cmake/-/issues/25936)
This error may affect not tebako itself but the gems that need to be package and use CMake to build native extensions.
There is no workaround for this issue as it lloks like is a limitation of the manifest used to build CMake executable.
There is no workaround for this issue as it looks like is a limitation of the manifest used to build CMake executable.

== Installation

Expand Down
7 changes: 6 additions & 1 deletion lib/tebako/packager.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,12 @@ def finalize(os_type, src_dir, app_name)
puts "-- Finalizing packaging"
exe_suffix = Packager::PatchHelpers.exe_suffix(os_type)
package_name = "#{app_name}#{exe_suffix}"
Tebako::Stripper.strip_file(File.join(src_dir, "ruby#{exe_suffix}"), package_name)
# [TODO] On MSys strip sometimes creates a broken executable
# https://github.com/tamatebako/tebako/issues/172
unless Packager::PatchHelpers.msys?(os_type)
Tebako::Stripper.strip_file(File.join(src_dir, "ruby#{exe_suffix}"),
package_name)
end

puts "Created tebako package at \"#{package_name}\""
end
Expand Down

0 comments on commit fd496a4

Please sign in to comment.