Skip to content

Commit

Permalink
Updated spawn hash
Browse files Browse the repository at this point in the history
  • Loading branch information
mwetter committed Oct 28, 2024
1 parent 05958b9 commit 8b232ed
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ def print_output(typ, stream):
def run_test(pathVariable):
# List of files to be moved
fileMoves = [
{"src": os.path.abspath(os.path.join("Buildings", "Resources", "bin", "spawn-0.6.0-3794215efe", "linux64")),
{"src": os.path.abspath(os.path.join("Buildings", "Resources", "bin", "spawn-0.6.0-db168408b0", "linux64")),
"des": "my-bin"},
{"src": os.path.abspath(os.path.join("Buildings", "Resources", "weatherdata")),
"des": "some_weather_directory_that_the_fmu_does_not_know_about"},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# build_type is either custom or builds
spawn_dists = [
{"version": "0.6.0",
"commit": "3794215efe",
"commit": "db168408b0",
"build_type": "custom"}
]
###########################################################################
Expand Down
4 changes: 2 additions & 2 deletions Buildings/ThermalZones/EnergyPlus_24_2_0/Building.mo
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ model Building
"Model that declares a building to which EnergyPlus objects belong to"
extends Modelica.Blocks.Icons.Block;

constant String spawnExe="spawn-0.6.0-3794215efe"
"Name of the spawn executable, without extension, such as spawn-0.6.0-3794215efeaaa"
constant String spawnExe="spawn-0.6.0-db168408b0"
"Name of the spawn executable, without extension, such as spawn-0.6.0-db168408b0aaa"
annotation (HideResult=true);

constant String idfVersion = "24_2_0"
Expand Down
28 changes: 14 additions & 14 deletions Buildings/ThermalZones/EnergyPlus_24_2_0/UsersGuide.mo
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ the binaries can be downloaded from the following links:
</tr>
<tr>
<td>Linux</td>
<td><a href=\"https://spawn.s3.amazonaws.com/custom/Spawn-light-0.6.0-3794215efe-Linux.tar.gz\">
https://spawn.s3.amazonaws.com/custom/Spawn-light-0.6.0-3794215efe-Linux.tar.gz</a>
<td><a href=\"https://spawn.s3.amazonaws.com/custom/Spawn-light-0.6.0-db168408b0-Linux.tar.gz\">
https://spawn.s3.amazonaws.com/custom/Spawn-light-0.6.0-db168408b0-Linux.tar.gz</a>
</td>
</tr>
<tr>
<td>Windows</td>
<td><a href=\"https://spawn.s3.amazonaws.com/custom/Spawn-light-0.6.0-3794215efe-win64.zip\">
https://spawn.s3.amazonaws.com/custom/Spawn-light-0.6.0-3794215efe-win64.zip</a>
<td><a href=\"https://spawn.s3.amazonaws.com/custom/Spawn-light-0.6.0-db168408b0-win64.zip\">
https://spawn.s3.amazonaws.com/custom/Spawn-light-0.6.0-db168408b0-win64.zip</a>
</td>
</tr>
</table>
Expand All @@ -51,9 +51,9 @@ To install, proceed as follows:
Run from a terminal
</p>
<pre>
wget https://spawn.s3.amazonaws.com/custom/Spawn-light-0.6.0-3794215efe-Linux.tar.gz;
tar xzf Spawn-light-0.6.0-3794215efe-Linux.tar.gz;
export PATH=${PATH}:`pwd`/Spawn-light-0.6.0-3794215efe-Linux/bin
wget https://spawn.s3.amazonaws.com/custom/Spawn-light-0.6.0-db168408b0-Linux.tar.gz;
tar xzf Spawn-light-0.6.0-db168408b0-Linux.tar.gz;
export PATH=${PATH}:`pwd`/Spawn-light-0.6.0-db168408b0-Linux/bin
</pre>
<p>
and restart your Modelica environment. You may put the last line in your <code>${HOME}/.bashrc</code> file
Expand All @@ -69,10 +69,10 @@ to make the setting persistent when you log in the next time.
Download the binary from the link above.
</li>
<li>
Unzip <code>Spawn-light-0.6.0-3794215efe-win64.zip</code> at your desired location.
Unzip <code>Spawn-light-0.6.0-db168408b0-win64.zip</code> at your desired location.
</li>
<li>
Add the directory <code>xyz/Spawn-light-0.6.0-3794215efe-win64/bin</code>
Add the directory <code>xyz/Spawn-light-0.6.0-db168408b0-win64/bin</code>
to your <code>PATH</code> environment variable.
</li>
<li>
Expand All @@ -85,29 +85,29 @@ Restart your Modelica environment.
<h4>How is spawn invoked?</h4>
<p>
Modelica tries to invoke <code>spawn-0.6.0-3794215efe[.exe]</code> in this order:
Modelica tries to invoke <code>spawn-0.6.0-db168408b0[.exe]</code> in this order:
</p>
<ol>
<li>
On Linux, it searches for
<pre>
Buildings[ x.y.z]/Resources/bin/spawn-0.6.0-3794215efe/linux64/bin/spawn-0.6.0-3794215efe
Buildings[ x.y.z]/Resources/bin/spawn-0.6.0-db168408b0/linux64/bin/spawn-0.6.0-db168408b0
</pre>
and on Windows, it searches for
<pre>
Buildings[ x.y.z]/Resources/bin/spawn-0.6.0-3794215efe/win64/bin/spawn-0.6.0-3794215efe.exe
Buildings[ x.y.z]/Resources/bin/spawn-0.6.0-db168408b0/win64/bin/spawn-0.6.0-db168408b0.exe
</pre>
where <code>Buildings[ x.y.z]</code> is the installation folder of the Modelica Buildings Library.
This file is distributed with the Modelica Buildings Library installation,
together with all files needed to translate and simulate a model in a Modelica environment.
</li>
<li>
If not found, it searches on the environment variable <code>SPAWNPATH</code> for
<code>spawn-0.6.0-3794215efe[.exe]</code>.
<code>spawn-0.6.0-db168408b0[.exe]</code>.
</li>
<li>
If not found, it searches on the environment variable <code>PATH</code> for
<code>spawn-0.6.0-3794215efe[.exe]</code>.
<code>spawn-0.6.0-db168408b0[.exe]</code>.
</li>
</ol>
<p>
Expand Down

0 comments on commit 8b232ed

Please sign in to comment.