Skip to content

Commit

Permalink
Merge pull request #3723 from NREL/v2.9.0-rc3
Browse files Browse the repository at this point in the history 
Updating master for 2.9.0 release
  • Loading branch information
@tijcolem
tijcolem authored Oct 10, 2019
2 parents 9dff44e + 45858ab commit 801faa4
Show file tree
Hide file tree
Showing 4,215 changed files with 217,343 additions and 27,094 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
## OpenStudio Pull Request Template

Please read [OpenStudio Pull Requests](http://https://github.com/NREL/OpenStudio/wiki/OpenStudio-Pull-Requests) to better understand the OpenStrudio Pull Request protocol.
Please read [OpenStudio Pull Requests](https://github.com/NREL/OpenStudio/wiki/OpenStudio-Pull-Requests) to better understand the OpenStrudio Pull Request protocol.
31 changes: 17 additions & 14 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,21 @@
.bundle
test_gems
test_fails.txt
/build/
/build_debug/
/build-debug/
/build-meta/
/build_release/
/build-release/
/build_64/
/build-64/
/build-relwithdebinfo/
/build_relwithdebinfo/
/build_profile/
/build-profile/
/core-build/
/super-build/
# Ignore build folders, no matter where in the tree they might be
build/
build_debug/
build-debug/
build-meta/
build_release/
build-release/
build_64/
build-64/
build-relwithdebinfo/
build_relwithdebinfo/
build_profile/
build-profile/
core-build/
super-build/

*.sublime-workspace

Expand All @@ -25,4 +26,6 @@ cmake-build-debug

developer/msvc/Visualizers/all_concat.natvis
.vscode/
.vs/
*.cache

3 changes: 3 additions & 0 deletions .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ deploy_latest_master:windows:
dependencies:
- build_deploy_all_others:windows
script:
- developer/ruby/CheckOSMVersions.rb # Ensure Library/Resources OSMs are at the right version
- aws s3 cp ./ s3://openstudio-builds/master/latest/ --recursive --exclude "*" --include "OpenStudio-2.*-Windows.exe"

deploy_latest_master:mac:
Expand All @@ -288,6 +289,7 @@ deploy_latest_master:mac:
dependencies:
- build_deploy_all_others:mac
script:
- developer/ruby/CheckOSMVersions.rb
- aws s3 cp ./ s3://openstudio-builds/master/latest/ --recursive --exclude "*" --include "OpenStudio-2.*-Darwin.zip"

deploy_latest_master:ubuntu:
Expand All @@ -299,6 +301,7 @@ deploy_latest_master:ubuntu:
dependencies:
- build_deploy_all_others:ubuntu
script:
- developer/ruby/CheckOSMVersions.rb
- aws s3 cp ./ s3://openstudio-builds/master/latest/ --recursive --exclude "*" --include "OpenStudio-2.*-Linux.deb"

testCTest_develop:windows:
Expand Down
10 changes: 10 additions & 0 deletions Jenkinsfile_develop
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
//Jenkins pipelines are stored in shared libaries. Please see: https://github.com/tijcolem/nrel_cbci_jenkins_libs

@Library('cbci_shared_libs') _

// Build for PR to develop branch only.
if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) {

openstudio_incremental_develop()

}
2 changes: 1 addition & 1 deletion LICENSE.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OpenStudio(R), Copyright (c) 2008-2018, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
following conditions are met:
Expand Down
50 changes: 48 additions & 2 deletions copyright.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OpenStudio(R), Copyright (c) 2008-2018, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
OpenStudio(R), Copyright (c) 2008-2019, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
following conditions are met:
Expand Down Expand Up @@ -934,7 +934,30 @@ You can redistribute it and/or modify it under either the terms of the
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.


*** Spider gbXML Tools ********************************************************

MIT License

Copyright (c) 2018 Ladybug Tools

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

*** SQLite ********************************************************************
2001 September 15

Expand All @@ -944,6 +967,29 @@ The author disclaims copyright to this source code. In place of a legal notice,
May you find forgiveness for yourself and forgive others.
May you share freely, never taking more than you give.

*** ThreeJS ********************************************************

The MIT License

Copyright © 2010-2018 three.js authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

*** zlib **********************************************************************
Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
Expand Down
22 changes: 0 additions & 22 deletions dependencies/ruby/Gemfile
View file

This file was deleted.

65 changes: 0 additions & 65 deletions dependencies/ruby/Gemfile.lock
View file

This file was deleted.

2 changes: 1 addition & 1 deletion dependencies/ruby/Ruby.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ index 668f9e1..73e5429 100644
!else
MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib -I.
-RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)" -I.
+RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)" -I. -I./ext/date/lib/
+RUNRUBY = .\$(PROGRAM) -I$(srcdir)/lib -I"$(EXTOUT)/$(arch)" -I. -I./ext/date/lib/ -I./ext/openssl/lib/
!endif
MINIRUBY = $(MINIRUBY) $(MINIRUBYOPT)
RUNRUBY = $(RUNRUBY) "$(srcdir)/tool/runruby.rb" --extout="$(EXTOUT)" $(RUNRUBYOPT) -- $(RUN_OPTS)
124 changes: 0 additions & 124 deletions dependencies/ruby/build_openstudio_gems.rb
View file

This file was deleted.

Loading

0 comments on commit 801faa4

Please sign in to comment.