Skip to content

Update ThermoSysPro #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AnHeuermann wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update ThermoSysPro #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
171040b
Update README.md
Dec 7, 2020
9357726
Update ThermoSysPro to be used from GitHub
Dec 7, 2020
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
41 changes: 37 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,41 @@ sudo apt-get install omc
```

### Add a new library
1. Put your library somewere public in git (or svn).
2. Edit repos.json and add the URL to your library and the commit hash (revision number for svn).
3. Commit your change.
4. Make sure you run the Hudson Job: OpenModelica_UPDATE_LIBRARIES to update the Makefiles
1. Put your library somewhere public in git.
2. Edit [repos.json](https://github.com/OpenModelica/OMLibraries/blob/master/repos.json) and add the URL to your library with the gittag or hash and branch name.

**Example for a public GitHub repository using a git tag:**
```json
[...]
{
"core": true, // Is your library a core library (true) or another library (false)
"dest": "LibraryName", // The name of your library
"options": {
"gitbranch": "master", // Git branch (optional)
"gittag": "v1.0.0", // Git tag pointing to commit to be used
"license": "bsd3" // Under what license is your library published (optional)
},
"rev": "v1.0.0", // Version of your library you tagged
"url": "https://github.com/UserName/LibraryName/.git" // URL of your GitHub repository
},
[...]
```

**Example for a public GitHub repository using a branch and commit hash:**
```json
[...]
{
"core": true, // Is your library a core library (true) or another library (false)
"dest": "LibraryName", // The name of your library
"options": {
"gitbranch": "v1.0.0-maintenance", // Git branch
"license": "bsd3" // Under what license is your library published (optional)
},
"rev": "802e7d85e35e14asdg53dsg1sdd6911804382f29", // Version of your library you tagged
"url": "https://github.com/UserName/LibraryName/.git" // URL of your GitHub repository
},
[...]
```
Note that JSON doesn't allow comments, so delete all comments from the above examples.
3. Create a pull request with your changes.
4. One of the developers will then run the Hudson Job: OpenModelica_UPDATE_LIBRARIES to update the Makefiles
22 changes: 8 additions & 14 deletions repos.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,21 +694,15 @@
{
"core": true,
"dest": "ThermoSysPro",
"multitarget": [
{
"options": {
"gitbranch": "maint/3.1"
},
"rev": "db81ae1b5a6a85f6c6c7693244cafa6087e18ff5"
},
{
"options": {
"gitbranch": "master"
},
"rev": "5cef9acb4dedf8af6f4638a4448f08a544ebd30b"
}
"options": {
"gittag": "v3.2",
"license": "bsd3"
},
"rev": "v3.2",
"targets": [
"ThermoSysPro 3.2"
],
"url": "https://openmodelica.org/git/ThermoSysPro.git"
"url": "https://github.com/ThermoSysPro/ThermoSysPro/.git"
},
{
"core": true,
Expand Down