Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 32 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,38 @@ jobs:
cd ${RUNNER_WORKSPACE}/build-antimony
ctest -C ${{ matrix.platform.build_type }} --output-on-failure --verbose --extra-verbose --progress

# Only the windows-latest-release leg has a QTAntimony.exe built with
# the exact Qt version (5.15.2, see 'Install Qt' above) win32/antimonyInstaller.iss
# expects, so the installer is only packaged there. InstallDir points
# iscc at this leg's actual install prefix (see 'Configure CMake for
# Antimony' above) rather than the '..\install-release' sibling
# directory the .iss defaults to for local/manual runs.
- name: Install Inno Setup
if: matrix.platform.name == 'windows-latest-release'
shell: bash
run: choco install innosetup --no-progress -y

- name: Build QTAntimony installer
if: matrix.platform.name == 'windows-latest-release'
shell: bash
# MSYS_NO_PATHCONV=1: Git Bash auto-converts any argument that looks
# like a POSIX path (starts with '/') into a Windows path before
# handing it to a native .exe. iscc's /D switches start with '/' and
# aren't paths at all, so without this they get mangled and iscc
# fails with 'You may not specify more than one script filename.'
run: |
cd ${RUNNER_WORKSPACE}/build-antimony
ANTIMONY_VERSION=$(cat antimony_version.txt)
cd ${GITHUB_WORKSPACE}/win32
MSYS_NO_PATHCONV=1 iscc "/DInstallDir=${RUNNER_WORKSPACE}/install-antimony" "/DMyAppVersion=${ANTIMONY_VERSION}" antimonyInstaller.iss

- name: Upload QTAntimony installer
if: matrix.platform.name == 'windows-latest-release'
uses: actions/upload-artifact@main
with:
name: antimonyInstaller-windows
path: win32/antimonyInstaller_v*.exe

# Valgrind is Linux-only (no Windows support, weak/no Apple Silicon
# support), so this only runs on one leg of the matrix rather than
# across every platform/config combination.
Expand Down
10 changes: 10 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@ INCLUDE(CPack)

SET(LIBANTIMONY_VERSION_STRING "v${LIBANTIMONY_VERSION_MAJOR}.${LIBANTIMONY_VERSION_MINOR}${LIBANTIMONY_VERSION_PATCH}${LIBANTIMONY_VERSION_RELEASE}")

# Bare version (no leading 'v'), written to a file so tooling outside of
# CMake itself -- e.g. the GitHub Actions step that packages
# win32/antimonyInstaller.iss via 'iscc /DMyAppVersion=...' -- can pick up
# the current version without parsing this file.
SET(LIBANTIMONY_VERSION_STRING_BARE "${LIBANTIMONY_VERSION_MAJOR}.${LIBANTIMONY_VERSION_MINOR}${LIBANTIMONY_VERSION_PATCH}${LIBANTIMONY_VERSION_RELEASE}")
file(WRITE "${CMAKE_BINARY_DIR}/antimony_version.txt" "${LIBANTIMONY_VERSION_STRING_BARE}")


option(BUILD_SHARED_LIBS "Build shared library (Set to OFF to build static libraries)" ON)
set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build, options are: None (CMAKE_CXX_FLAGS or CMAKE_C_FLAGS are used), Debug, Release, RelWithDebInfo, MinSizeRel" )
Expand Down Expand Up @@ -660,6 +667,9 @@ if (WITH_QTANTIMONY)
set(MACOSX_BUNDLE_ICON_FILE ${QTANTIMONY_SRC_DIR}antimony.icns)
install(TARGETS QTAntimony DESTINATION bin)
install(FILES ${QTANTIMONY_SRC_DIR}antimony.ico ${QTANTIMONY_SRC_DIR}antimony_ico.png DESTINATION bin)
if (WIN32)
install(FILES ${CMAKE_SOURCE_DIR}/win32/README.txt DESTINATION bin)
endif (WIN32)

set_target_properties(QTAntimony PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/QTAntimony/$<0:>")

Expand Down
115 changes: 0 additions & 115 deletions win32/AntimonyPythonBindings.iss

This file was deleted.

18 changes: 8 additions & 10 deletions win32/README.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
To use these Windows executables:
* QTAntimony is a simple editor that can convert models between Antimony,
SBML, and CellML. It can read Antimony, SBML, and CellML files, and you
can edit any and translate between them. Do note that if you convert one
format to the other, modify the latter, then translate it back, you will
often lose information in the process--any annotation or unit definitions
in the SBML file will not survive the round-trip, for example. However,
it should be enough to get started with the language and start to
experiment.
* QTAntimony is a simple editor that can convert models between Antimony and
SBML. It can read Antimony and SBML files, and you can edit any and
translate between them. Do note that if you convert one format to the
other, modify the latter, then translate it back, you will often lose
information in the process--any annotation or unit definitions in the SBML
file will not survive the round-trip, for example. However, it should be
enough to get started with the language and start to experiment.

* While specific translators still exist, 'sbtranslate' can be used to
convert between formats that Antimony understands. The precompiled
binary can be used to convert files between Antimony, SBML, and CellML.
binary can be used to convert files between Antimony and SBML.

You must use at least one of the following options to set the output
format of this translator:
Expand All @@ -20,7 +19,6 @@ To use these Windows executables:
-o sbml-comp: Output all models in a single SBML file using the
'comp' package.
-o allsbml : Output each model and submodel as a separate SBML model
-o cellml : Output the 'main' model as CellML

Each file will be exported to the desired format separately. Multiple
output formats are possible; a separate '-o [format]' is needed for each
Expand Down
Loading
Loading