Skip to content
Merged
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions conan/mruby/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from conan.errors import ConanInvalidConfiguration
from conan.errors import ConanException
from conan.tools.microsoft.visual import msvc_runtime_flag, is_msvc
from conan.tools.microsoft import VCVars

import os
import io
Expand Down Expand Up @@ -45,6 +46,9 @@ def layout(self):
basic_layout(self, src_folder="source")

def generate(self):
if is_msvc(self):
VCVars(self).generate()

self.build_config = os.path.join(self.build_folder, self.source_folder, "build_config", "mtconnect.rb")

with open(self.build_config, "w") as f:
Expand Down Expand Up @@ -165,6 +169,12 @@ def build(self):
trace = ''
if self.options.trace:
trace = '--trace'
# Show all current environment variables
self.output.info("=== Environment Variables ===")
self.run("set" if self.settings.os == "Windows" else "env", shell=True)

# Show PATH, Ruby version, and Rake version inline
self.output.info(f"PATH: {os.environ.get('PATH')}")
self.run("rake %s MRUBY_CONFIG=%s MRUBY_BUILD_DIR=%s" % (trace, self.build_config, self.build_folder),
cwd=self.source_folder)

Expand Down