Skip to content

Commit b86a295

Browse files
kfleminkflemin
committed
Merge branch 'develop'
2 parents b1aff31 + 414a075 commit b86a295

File tree

10 files changed

+115
-78
lines changed

10 files changed

+115
-78
lines changed

‎CHANGELOG.md‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Changelog
22

3+
## Version 1.0.2
4+
5+
### Exciting New Features 🎉
6+
7+
* Upgrade GMT to v0.11.0 and TN to v0.4.0 by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/518
8+
* GMT dependency is now added via the new URBANopt-DES python dependency (v0.1.1)
9+
10+
### Other Changes
11+
12+
* Restore windows bat by @tijcolem in https://github.com/urbanopt/urbanopt-cli/pull/513
13+
314
## Version 1.0.1
415

516
## What's Changed
@@ -17,8 +28,6 @@
1728
## Version 0.14.0
1829
Date Range: 06/27/2024 - 11/15/2024
1930

20-
## What's Changed
21-
2231
### Exciting New Features 🎉
2332

2433
* Upgrade version of ThermalNetwork Python dependency by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/493
@@ -37,7 +46,7 @@ Date Range: 06/27/2024 - 11/15/2024
3746
Date Range: 05/15/2024 - 06/27/2024
3847

3948
### Exciting New Features 🎉
40-
* Resstock connecction by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/472
49+
* Resstock connection by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/472
4150

4251
**Full Changelog**: https://github.com/urbanopt/urbanopt-cli/compare/v0.12.0...v0.13.0
4352

@@ -59,7 +68,6 @@ Date Range: 01/26/2024 - 02/08/2024
5968

6069
* Call GMT-cli correctly by @vtnate in https://github.com/urbanopt/urbanopt-cli/pull/449
6170

62-
6371
**Full Changelog**: https://github.com/urbanopt/urbanopt-cli/compare/v0.11.0...v0.11.1
6472

6573
## Version 0.11.0

‎CMakeLists.txt‎

Lines changed: 40 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.10.2)
22
cmake_policy(SET CMP0048 NEW)
33

4-
project(URBANoptCLI VERSION 0.14.0)
4+
project(URBANoptCLI VERSION 1.0.1)
55

66
include(FindOpenStudioSDK.cmake)
77

@@ -88,22 +88,27 @@ option(BUILD_PACKAGE "Build package" OFF)
8888
# CI will build and upload urbanopt-cli-gems to s3 at (TBD)
8989
# need to update the MD5sum for each platform and url below
9090
if(UNIX)
91-
if(APPLE)
92-
set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20241118-darwin.tar.gz")
93-
set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "8c4d1ff5b4eb0592c16b4b2d259db6cd")
94-
else()
95-
if (ARCH MATCHES "arm64")
96-
set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-2024112-linux-arm.tar.gz")
97-
set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "67f329867b472d3fc84c304f306398e0")
98-
else()
99-
set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20241118-linux.tar.gz")
100-
set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "8e0203189e6b5abe857f714720d2b098")
101-
endif()
102-
endif()
91+
if(APPLE)
92+
if (ARCH MATCHES "arm64")
93+
set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20250206-darwin_arm64.tar.gz")
94+
set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "bd2aba33de9d42240a5327ee6b9fd397")
95+
else()
96+
set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20250206-darwin_x86_64.tar.gz")
97+
set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "bd2aba33de9d42240a5327ee6b9fd397")
98+
endif()
99+
else()
100+
if (ARCH MATCHES "arm64")
101+
set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20250205-linux_arm64.tar.gz")
102+
set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "4a5f74315a2d0cb541eb2a419859db23")
103+
else()
104+
set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20250205-linux.tar.gz")
105+
set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "fde4c0ac38789da809df040c5ce000b8")
106+
endif()
107+
endif()
103108
elseif(WIN32)
104109
if(CMAKE_CL_64)
105-
set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20241119-windows.tar.gz")
106-
set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "6e0e369409108e7ad24e25a32d73d3b8")
110+
set(URBANOPT_CLI_GEMS_ZIP_FILENAME "urbanopt-cli-gems-20250212-windows.tar")
111+
set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "6b6ffa03f66776f0e8fbbffef4278f61")
107112
endif()
108113
endif()
109114

@@ -129,21 +134,26 @@ endif()
129134
set(RUBY_DIR "${PROJECT_BINARY_DIR}/ruby")
130135

131136
if(UNIX)
132-
if(APPLE)
133-
set(RUBY_ZIP_FILENAME "ruby-2.7.2-darwin.tar.gz")
134-
set(RUBY_ZIP_EXPECTED_MD5 "1ee27d6381797a5af7398f8eee8edb07")
135-
else()
136-
if (ARCH MATCHES "arm64")
137-
set(URBANOPT_CLI_GEMS_ZIP_FILENAME "ruby-2.7.2-ubuntu-22.04-arm.tar.gz")
138-
set(URBANOPT_CLI_GEMS_ZIP_EXPECTED_MD5 "bfef9299b151f84334684134c9a09347")
139-
else()
140-
set(RUBY_ZIP_EXPECTED_MD5 "853425b0c9878b064937f9e49688c6c6")
141-
set(RUBY_ZIP_FILENAME "ruby-2.7.2-linux.tar.gz")
142-
endif()
143-
endif()
137+
if(APPLE)
138+
if(ARCH MATCHES "arm64")
139+
set(RUBY_ZIP_FILENAME "ruby-3.2.2-darwin_arm64.tar.gz")
140+
set(RUBY_ZIP_EXPECTED_MD5 "01ccfb8acbf67b3e172795301767dde3")
141+
else()
142+
set(RUBY_ZIP_FILENAME "ruby-3.2.2-darwin_x86_64.tar.gz")
143+
set(RUBY_ZIP_EXPECTED_MD5 "e431eb4e78391d29d7ed0c138f59125c")
144+
endif()
145+
else() # Linux
146+
if (ARCH MATCHES "arm64")
147+
set(RUBY_ZIP_FILENAME "ruby-3.2.2-linux_arm64.tar.gz")
148+
set(RUBY_ZIP_EXPECTED_MD5 "7a777f6a4fdbf7b8d561156a94e677b8")
149+
else()
150+
set(RUBY_ZIP_EXPECTED_MD5 "74c9f8f4c693df02a361730dcf780a99")
151+
set(RUBY_ZIP_FILENAME "ruby-3.2.2-linux_x86_64.tar.gz")
152+
endif()
153+
endif()
144154
elseif(WIN32)
145-
set(RUBY_ZIP_FILENAME "ruby-2.7.2-win32.tar.gz")
146-
set(RUBY_ZIP_EXPECTED_MD5 "414a24f3ebb074534d2186595683c5b4")
155+
set(RUBY_ZIP_FILENAME "ruby-3.2.2_win32.tar.gz")
156+
set(RUBY_ZIP_EXPECTED_MD5 "c67bda97ad696d66561c3f39387fd5d1")
147157
endif()
148158

149159
set(RUBY_ZIP_LOCAL_PATH "${PROJECT_BINARY_DIR}/${RUBY_ZIP_FILENAME}")
@@ -182,6 +192,7 @@ if(UNIX)
182192
elseif(WIN32)
183193
install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env-gitbash.sh DESTINATION "." COMPONENT "URBANopt" RENAME "setup-env.sh")
184194
install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env.ps1 DESTINATION "." COMPONENT "URBANopt")
195+
install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/setup-env.bat DESTINATION "." COMPONENT "URBANopt")
185196
endif()
186197

187198
install(DIRECTORY "${PROJECT_BINARY_DIR}/ruby" DESTINATION "." COMPONENT "Ruby" USE_SOURCE_PERMISSIONS)

‎FindOpenStudioSDK.cmake‎

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
set(OPENSTUDIO_VERSION_MAJOR 3)
2-
set(OPENSTUDIO_VERSION_MINOR 7)
2+
set(OPENSTUDIO_VERSION_MINOR 9)
33
set(OPENSTUDIO_VERSION_PATCH 0)
44
set(OPENSTUDIO_VERSION "${OPENSTUDIO_VERSION_MAJOR}.${OPENSTUDIO_VERSION_MINOR}.${OPENSTUDIO_VERSION_PATCH}")
55

@@ -12,45 +12,25 @@ else()
1212
# This will make it throw, which an informative message
1313
# find_package(openstudio "${OPENSTUDIO_VERSION}" CONFIG REQUIRED)
1414

15-
15+
set(OPENSTUDIO_VERSION_SHA "+c77fbb9569")
1616
set(OPENSTUDIO_BASELINK "https://github.com/NREL/OpenStudio/releases/download/v${OPENSTUDIO_VERSION}"
1717
CACHE STRING "Base link to where the openstudio archives are hosted" FORCE)
1818

19-
set(OPENSTUDIO_VERSION_SHA "+d5269793f1")
20-
2119
if(APPLE)
22-
set(OPENSTUDIO_EXPECTED_HASH a4585ef0a3523168f8975ecd1cff1d12)
20+
set(OPENSTUDIO_EXPECTED_HASH 39c5ae27eeb840472e36b728ab906315)
2321
set(OPENSTUDIO_PLATFORM "Darwin-x86_64")
2422
set(OPENSTUDIO_EXT "tar.gz")
2523
elseif(UNIX)
26-
if(LSB_RELEASE_VERSION_SHORT MATCHES "22.04")
27-
if (ARCH MATCHES "arm64")
28-
set(OPENSTUDIO_EXPECTED_HASH d98b3d3d133a7c5bc1b9581553d23811)
29-
set(OPENSTUDIO_PLATFORM "Ubuntu-22.04-arm64")
30-
else()
31-
set(OPENSTUDIO_EXPECTED_HASH 1e48f36417d3d118d6a10f1a7d61f46e)
32-
endif()
33-
set(OPENSTUDIO_EXPECTED_HASH 5c006e5e66e5e859206a63626ea2966f)
24+
if (ARCH MATCHES "arm64")
25+
set(OPENSTUDIO_EXPECTED_HASH fd1ba05628eb55b3bb72923a8395e267)
26+
set(OPENSTUDIO_PLATFORM "Ubuntu-22.04-arm64")
27+
else()
28+
set(OPENSTUDIO_EXPECTED_HASH 67522b9a1ba5749cf0b3cf101a6131cf)
3429
set(OPENSTUDIO_PLATFORM "Ubuntu-22.04-x86_64")
35-
else() # Assumes 20.04
36-
set(OPENSTUDIO_EXPECTED_HASH 5c006e5e66e5e859206a63626ea2966f)
37-
set(OPENSTUDIO_PLATFORM "Ubuntu-20.04-x86_64")
38-
endif()
39-
if(LSB_RELEASE_VERSION_SHORT MATCHES "20.04")
40-
if (ARCH MATCHES "arm64")
41-
set(OPENSTUDIO_EXPECTED_HASH d98b3d3d133a7c5bc1b9581553d23811)
42-
else()
43-
set(OPENSTUDIO_EXPECTED_HASH 1e48f36417d3d118d6a10f1a7d61f46e)
44-
endif()
45-
set(OPENSTUDIO_EXPECTED_HASH 5c006e5e66e5e859206a63626ea2966f)
46-
set(OPENSTUDIO_PLATFORM "Ubuntu-20.04-x86_64")
47-
else() # Assumes 20.04
48-
set(OPENSTUDIO_EXPECTED_HASH 5c006e5e66e5e859206a63626ea2966f)
49-
set(OPENSTUDIO_PLATFORM "Ubuntu-20.04-x86_64")
5030
endif()
5131
set(OPENSTUDIO_EXT "tar.gz")
5232
elseif(WIN32)
53-
set(OPENSTUDIO_EXPECTED_HASH f192860357fdbffb5705942a991b072b)
33+
set(OPENSTUDIO_EXPECTED_HASH c3a1ec4bc98d7418780a702036ce0edb)
5434
set(OPENSTUDIO_PLATFORM "Windows")
5535
set(OPENSTUDIO_EXT "tar.gz")
5636
endif()

‎example_files/python_deps/dependencies.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
2-
{ "name": "ThermalNetwork", "version": "0.3.3"},
2+
{ "name": "ThermalNetwork", "version": "0.4.0"},
33
{ "name": "urbanopt-ditto-reader", "version": "0.6.4"},
44
{ "name": "NREL-disco", "version": "0.5.1"},
5-
{ "name": "geojson-modelica-translator", "version": "0.9.2"}
5+
{ "name": "urbanopt-des", "version": "0.1.1"}
66
]

‎lib/uo_cli.rb‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,8 @@ def self.setup_python_variables
911911
pip_path: nil,
912912
ditto_path: nil,
913913
gmt_path: nil,
914-
ghe_path: nil
914+
ghe_path: nil,
915+
des_output_path: nil,
915916
}
916917

917918
# get location
@@ -933,6 +934,7 @@ def self.setup_python_variables
933934
pvars[:gmt_path] = configs[:gmt_path]
934935
pvars[:disco_path] = configs[:disco_path]
935936
pvars[:ghe_path] = configs[:ghe_path]
937+
pvars[:des_output_path] = configs[:des_output_path]
936938
end
937939
return pvars
938940
end
@@ -1084,13 +1086,15 @@ def self.install_python_dependencies
10841086
pvars[:gmt_path] = File.join(mac_path_base, 'bin', 'uo_des')
10851087
pvars[:disco_path] = File.join(mac_path_base, 'bin', 'disco')
10861088
pvars[:ghe_path] = File.join(mac_path_base, 'bin', 'thermalnetwork')
1089+
pvars[:des_output_path] = File.join(mac_path_base, 'bin', 'des-output')
10871090
configs = {
10881091
python_path: pvars[:python_path],
10891092
pip_path: pvars[:pip_path],
10901093
ditto_path: pvars[:ditto_path],
10911094
gmt_path: pvars[:gmt_path],
10921095
disco_path: pvars[:disco_path],
1093-
ghe_path: pvars[:ghe_path]
1096+
ghe_path: pvars[:ghe_path],
1097+
des_output_path: pvars[:des_output_path]
10941098
}
10951099
else
10961100
# windows
@@ -1118,14 +1122,16 @@ def self.install_python_dependencies
11181122
pvars[:gmt_path] = File.join(windows_path_base, 'Scripts', 'uo_des.exe')
11191123
pvars[:disco_path] = File.join(windows_path_base, 'Scripts', 'disco.exe')
11201124
pvars[:ghe_path] = File.join(windows_path_base, 'Scripts', 'thermalnetwork.exe')
1125+
pvars[:des_output_path] = File.join(windows_path_base, 'Scripts', 'des-output.exe')
11211126

11221127
configs = {
11231128
python_path: pvars[:python_path],
11241129
pip_path: pvars[:pip_path],
11251130
ditto_path: pvars[:ditto_path],
11261131
gmt_path: pvars[:gmt_path],
11271132
disco_path: pvars[:disco_path],
1128-
ghe_path: pvars[:ghe_path]
1133+
ghe_path: pvars[:ghe_path],
1134+
des_output_path: pvars[:des_output_path]
11291135
}
11301136
end
11311137

‎lib/uo_cli/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55

66
module URBANopt
77
module CLI
8-
VERSION = '1.0.1'.freeze
8+
VERSION = '1.0.2'.freeze
99
end
1010
end

‎scripts/setup-env-gitbash.sh‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
# Then you can use this env.sh to setup the environment.
66
# (e.g. source ~/.env_uo.sh)
77

8+
RUBY_BASE_VERSION="3.2.0"
9+
MINICONDA_VERSION="24.9.2-0"
810

911
BASE_DIR_NAME=$(dirname `which $0`)
1012
UO_DIR_NAME=$(basename "$BASE_DIR_NAME")
1113

12-
GEM_HOME=${BASE_DIR_NAME}/gems/ruby/2.7.0
13-
GEM_PATH=${BASE_DIR_NAME}/gems/ruby/2.7.0
14-
PATH=${BASE_DIR_NAME}/ruby/bin:${BASE_DIR_NAME}/gems/ruby/2.7.0/bin:${BASE_DIR_NAME}/gems/ruby/2.7.0/gems/${UO_DIR_NAME}/example_files/python_deps/Miniconda-4.12.0/bin:$PATH
14+
GEM_HOME=${BASE_DIR_NAME}/gems/ruby/${RUBY_BASE_VERSION}
15+
GEM_PATH=${BASE_DIR_NAME}/gems/ruby/${RUBY_BASE_VERSION}
16+
PATH=${BASE_DIR_NAME}/ruby/bin:${BASE_DIR_NAME}/gems/ruby/${RUBY_BASE_VERSION}/bin:${BASE_DIR_NAME}/gems/ruby/${RUBY_BASE_VERSION}/gems/${UO_DIR_NAME}/example_files/python_deps/Miniconda-${MINICONDA_VERSION}/bin:$PATH
1517
RUBYLIB=${BASE_DIR_NAME}/OpenStudio/Ruby
1618
RUBY_DLL_PATH=${BASE_DIR_NAME}/OpenStudio/Ruby
1719

‎scripts/setup-env-unix.sh‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
# Then you can use this env.sh to setup the environment.
66
# (e.g. . env.sh)
77

8+
RUBY_BASE_VERSION="3.2.0"
9+
MINICONDA_VERSION="24.9.2-0"
810
UO_DIR=$(dirname "$(realpath "$0")")
911
UO_DIR_NAME=$(basename "$UO_DIR")
1012

11-
GEM_HOME=${UO_DIR}/gems/ruby/2.7.0
12-
GEM_PATH=${UO_DIR}/gems/ruby/2.7.0
13-
PATH=${UO_DIR}/ruby/bin:${UO_DIR}/gems/ruby/2.7.0/bin:${UO_DIR}/gems/ruby/2.7.0/gems/${UO_DIR_NAME}/example_files/python_deps/Miniconda-4.12.0/bin:$PATH
13+
GEM_HOME=${UO_DIR}/gems/ruby/${RUBY_BASE_VERSION}
14+
GEM_PATH=${UO_DIR}/gems/ruby/${RUBY_BASE_VERSION}
15+
PATH=${UO_DIR}/ruby/bin:${UO_DIR}/gems/ruby/${RUBY_BASE_VERSION}/bin:${UO_DIR}/gems/ruby/${RUBY_BASE_VERSION}/gems/${UO_DIR_NAME}/example_files/python_deps/Miniconda-${MINICONDA_VERSION}/bin:$PATH
1416
RUBYLIB=${UO_DIR}/OpenStudio/Ruby
1517
RUBY_DLL_PATH=${UO_DIR}/OpenStudio/Ruby
1618

‎scripts/setup-env.bat‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
IF "%HOMEPATH%"=="" ECHO HOMEPATH is NOT defined. Please set this env value to your home directory before running this script.
2+
IF "%HOMEPATH%"=="" exit /B
3+
4+
SET RUBY_BASE_VERSION=3.2.0
5+
SET MINICONDA_VERSION=24.9.2-0
6+
SET BASE_DIR_NAME=%~d0%~p0
7+
8+
SET GEM_HOME=%BASE_DIR_NAME%\gems\ruby\%RUBY_BASE_VERSION%
9+
SET GEM_PATH=%BASE_DIR_NAME%\gems\ruby\%RUBY_BASE_VERSION%
10+
SET PATH=%BASE_DIR_NAME%\ruby\bin;%BASE_DIR_NAME%\gems\ruby\%RUBY_BASE_VERSION%\bin;%PATH%
11+
SET RUBYLIB=%BASE_DIR_NAME%\OpenStudio\Ruby
12+
SET RUBY_DLL_PATH=%BASE_DIR_NAME%\OpenStudio\Ruby
13+
14+
%BASE_DIR_NAME%\gems\ruby\%RUBY_BASE_VERSION%\gems\$%BASE_DIR_NAME%/example_files/python_deps/Miniconda-%MINICONDA_VERSION=%/bin
15+
16+
17+
IF EXIST %HOMEPATH%\.env_uo.bat (
18+
del "%HOMEPATH%\.env_uo.bat"
19+
)
20+
21+
echo SET "GEM_HOME=%GEM_HOME%">> "%HOMEPATH%\.env_uo.bat"
22+
echo SET "GEM_PATH=%GEM_PATH%">> "%HOMEPATH%\.env_uo.bat"
23+
echo SET "PATH=%PATH%">> "%HOMEPATH%\.env_uo.bat"
24+
echo SET "RUBYLIB=%RUBYLIB%">> "%HOMEPATH%\.env_uo.bat"
25+
echo SET "RUBY_DLL_PATH=%RUBY_DLL_PATH%">> "%HOMEPATH%\.env_uo.bat"
26+

‎scripts/setup-env.ps1‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
if (-not (Test-Path $HOME)) { echo "env HOME needs to be set before running this script" }
99
if (-not (Test-Path $HOME)) { exit }
1010

11+
12+
$RUBY_BASE_VERSION = "3.2.0"
1113
# uo install_python will install its own python within the gem directories so we need to find the python path and add it to $env.PATH
1214
$output = Get-ChildItem -ErrorAction SilentlyContinue -Directory "C:\URBANopt*" -Recurse -Filter "python-3.10" | Select-Object FullName
1315

@@ -21,9 +23,9 @@ else {
2123

2224
$BASE_DIR_NAME = $PSScriptRoot
2325

24-
$GEM_HOME = "$BASE_DIR_NAME\gems\ruby\2.7.0"
25-
$GEM_PATH = "$BASE_DIR_NAME\gems\ruby\2.7.0"
26-
$PATH += ";$BASE_DIR_NAME\ruby\bin;$BASE_DIR_NAME\gems\ruby\2.7.0\bin;$RUBY_PYTHON_PATH;$env::PATH"
26+
$GEM_HOME = "$BASE_DIR_NAME\gems\ruby\$RUBY_BASE_VERSION"
27+
$GEM_PATH = "$BASE_DIR_NAME\gems\ruby\$RUBY_BASE_VERSION"
28+
$PATH += ";$BASE_DIR_NAME\ruby\bin;$BASE_DIR_NAME\gems\ruby\$RUBY_BASE_VERSION\bin;$RUBY_PYTHON_PATH;$env::PATH"
2729
$RUBYLIB = "$BASE_DIR_NAME\OpenStudio\Ruby"
2830
$RUBY_DLL_PATH = "$BASE_DIR_NAME\OpenStudio\Ruby"
2931

@@ -42,4 +44,4 @@ Remove-Item $HOME/.env_uo.bat -ErrorAction Ignore
4244
'SET "GEM_PATH=' + $GEM_PATH + '"' >> $HOME/.env_uo.bat
4345
'SET "PATH=' + $PATH + '"' >> $HOME/.env_uo.bat
4446
'SET "RUBYLIB=' + $RUBYLIB + '"' >> $HOME/.env_uo.bat
45-
'SET "RUBY_DLL_PATH=' + $RUBY_DLL_PATH + '"' >> $HOME/.env_uo.bat
47+
'SET "RUBY_DLL_PATH=' + $RUBY_DLL_PATH + '"' >> $HOME/.env_uo.bat

0 commit comments

Comments
 (0)