Skip to content

Commit 0c0ecfb

Browse files
committed
Merge branch 'sk/test-rate-rule-converter-rigorously' into development
2 parents 084c60e + ded3ae7 commit 0c0ecfb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+9516
-2104
lines changed

.github/workflows/brief.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ on:
99
- "VERSION.txt"
1010
- "!.github/**"
1111
- ".github/workflows/brief.yml"
12+
13+
1214
env:
1315
BUILD_TYPE: Release
1416

@@ -103,6 +105,7 @@ jobs:
103105
shell: bash
104106
run: |
105107
brew install check swig ccache
108+
brew install --cask mono-mdk
106109
echo PYTHON_LINKING_OPTION="-DPYTHON_USE_DYNAMIC_LOOKUP=ON" >> "${GITHUB_ENV}"
107110
108111
### setup ccache, not on Windows ###

.github/workflows/extensive.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ jobs:
160160
shell: bash
161161
run: |
162162
brew install check swig xerces-c expat ccache
163+
brew install --cask mono-mdk
163164
echo PYTHON_LINKING_OPTION="-DPYTHON_USE_DYNAMIC_LOOKUP=ON" >> "${GITHUB_ENV}"
164165
165166
- name: Unix R options

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
###############################################################################
22
#
3-
# Description : CMake build script for libSBML
3+
# Description : CMake build script for libSBML
44
# Original author(s): Frank Bergmann <fbergman@caltech.edu>
55
# Organization : California Institute of Technology
66
#
@@ -595,6 +595,10 @@ if(WITH_CSHARP)
595595
endif()
596596
endif()
597597

598+
if(NOT CSHARP_COMPILER)
599+
message(FATAL_ERROR "CSHARP_COMPILER is not found, please ensure that gmcs, csc, or mcs is installed.")
600+
endif()
601+
598602
endif(WITH_CSHARP)
599603

600604

examples/c++/inferReactions.cpp

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,28 @@
4747
using namespace std;
4848
LIBSBML_CPP_NAMESPACE_USE
4949

50+
51+
#ifdef DEBUG_INFER_REACTIONS
52+
#include <intrin.h>
53+
#include <windows.h>
54+
#endif // DEBUG_INFER_REACTIONS
55+
5056
int
5157
main (int argc, char *argv[])
5258
{
53-
59+
60+
#ifdef DEBUG_INFER_REACTIONS
61+
// Wait for debugger to attach
62+
while (!IsDebuggerPresent())
63+
{
64+
Sleep(100); // Sleep for 100 milliseconds
65+
}
66+
67+
// at this point for debugging purposes throw the VS abort dialog so we can
68+
// easily attach to the process
69+
__debugbreak();
70+
#endif // DEBUG_INFER_REACTIONS
71+
5472
if (argc != 3)
5573
{
5674
cout
@@ -64,6 +82,7 @@ main (int argc, char *argv[])
6482
return 1;
6583
}
6684

85+
6786
const char* inputFile = argv[1];
6887
const char* outputFile = argv[2];
6988

src/bindings/csharp/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ set(LIBSBML_CSHARP_BINDING_NATIVE_LIBRARY_NAME "libsbmlcs" CACHE STRING
4040
"The name of the native library file to generate. This can be changed to avoid conflicts with other applications using another version of the library.")
4141
mark_as_advanced(LIBSBML_CSHARP_BINDING_NATIVE_LIBRARY_NAME)
4242

43+
if(NOT CSHARP_COMPILER)
44+
message(FATAL_ERROR "CSHARP_COMPILER is not set")
45+
endif()
4346

4447
####################################################################
4548
#

0 commit comments

Comments
 (0)