Skip to content

Commit

Permalink
Merge pull request #2202 from NREL/add_symlinks_to_openstudio_standar…
Browse files Browse the repository at this point in the history 
…ds_gem

Adds symlinks to openstudio-standards gem for Mac
  • Loading branch information
@evanweaver
evanweaver committed Apr 21, 2016
2 parents c81a6f7 + b222316 commit 0ad4c0a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions DarwinPostFlight.sh.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ ruby_install_dir="$2/Applications/${CMAKE_PROJECT_NAME} ${OPENSTUDIO_VERSION}/Ru
ln -sf "$2/Applications/${CMAKE_PROJECT_NAME} ${OPENSTUDIO_VERSION}/Ruby/openstudio.rb" /Library/Ruby/Site/
ln -sFf "$2/Applications/${CMAKE_PROJECT_NAME} ${OPENSTUDIO_VERSION}/Ruby/openstudio" /Library/Ruby/Site/

#---------- Create Symbolic Links to the openstudio-standards gem ----------
ln -sFf "$2/Applications/${CMAKE_PROJECT_NAME} ${OPENSTUDIO_VERSION}/ruby-2.0.0-aws-Darwin/lib/ruby/gems/2.0.0/gems/openstudio-standards-0.1.2" /Library/Ruby/Gems/2.0.0/gems/
ln -sf "$2/Applications/${CMAKE_PROJECT_NAME} ${OPENSTUDIO_VERSION}/ruby-2.0.0-aws-Darwin/lib/ruby/gems/2.0.0/specifications/openstudio-standards-0.1.2.gemspec" /Library/Ruby/Gems/2.0.0/specifications/

#---------- Write a plugin-config.rb file for later installation ----------
# And put it in the install folder for later reuse by the user if needed
Expand Down
2 changes: 1 addition & 1 deletion dependencies/ruby/Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ gem 'test-unit', '= 2.0.0.0'

# OpenStudio
gem 'openstudio-aws', '~> 0.4.0.pre1'
gem 'openstudio-standards', '= 0.1.2'
gem 'openstudio-standards', '= 0.1.2' # Also update DarwinPostFlight.sh.in when updating gem version

6 comments on commit 0ad4c0a

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

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

develop (evanweaver) - x86_64-MacOS-10.10-clang: OK (2373 of 2406 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

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

iteration (evanweaver) - x86_64-MacOS-10.10-clang: OK (2365 of 2406 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

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

develop (evanweaver) - x86_64-Linux-Ubuntu-14.04-clang-3.5: OK (2344 of 2406 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

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

develop (evanweaver) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

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

iteration (evanweaver) - x86_64-Linux-Ubuntu-14.04-clang-3.5: OK (2343 of 2406 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

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

iteration (evanweaver) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

Please sign in to comment.