Skip to content

Commit ed1c43e

Browse files
authored
Win unify scripts 01 (#30)
1 parent 143cad7 commit ed1c43e

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,14 +139,14 @@ jobs:
139139
- uses: eine/setup-msys2@v2
140140
with:
141141
update: true
142-
install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-ccache mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-eigen3 mingw-w64-x86_64-unittest-cpp mingw-w64-x86_64-boost mingw-w64-x86_64-gsl git
142+
install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-ccache mingw-w64-x86_64-eigen3 mingw-w64-x86_64-unittest-cpp mingw-w64-x86_64-boost mingw-w64-x86_64-gsl git # mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq
143143
- name: prepare environment
144144
run: util/prep-env.sh
145145
# TODO: Use python later
146-
# - name: install dependencies
147-
# run: util/deps-pull.sh
148-
# - name: build & install the unmanaged dependencies
149-
# run: util/deps-build.sh
146+
- name: install dependencies
147+
run: util/deps-pull.sh
148+
- name: build & install the unmanaged dependencies
149+
run: util/deps-build.sh
150150
- name: build
151151
run: ./ci-default --unity
152152
- name: run demo

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Supported Operating Systems and features:
4343
| Ubuntu 20.04 ||||||
4444
| Mac OSX 11 || ||| |
4545
| Mac OSX 10.15 || ||| |
46-
| ~~Windows~~ (soon) | | | | | |
46+
| Windows | || | | |
4747

4848
Glossary:
4949
- CI = [Continuous Integration](https://github.com/mj-xmr/tsqsim/actions)

util/deps-pull.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ if [ "$(uname)" == "Darwin" ]; then
88
fi
99
#HOMEBREW_NO_AUTO_UPDATE=1 brew install qt5
1010
#brew link -v qt5 --force
11-
HOMEBREW_NO_AUTO_UPDATE=1 brew install boost openssl ccache gnuplot eigen gsl unittest-cpp
11+
HOMEBREW_NO_AUTO_UPDATE=1 brew install boost ccache gnuplot eigen gsl unittest-cpp # openssl zmq
1212
# TODO: install qt instead of qt5, after moving to latest QCustomPlot. Then the "--prefix" and "link" aren't needed.
13-
elif [ "$(uname)" == "MinGw" ]; then
14-
echo "TODO: install deps"
13+
elif [ "$(uname)" == "Linux" ]; then
14+
sudo apt update; sudo apt -y install build-essential cmake ccache gnuplot libeigen3-dev libunittest++-dev libgsl-dev libboost-system-dev libboost-filesystem-dev libboost-iostreams-dev libboost-serialization-dev libboost-program-options-dev libboost-date-time-dev libboost-atomic-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools # libssl-dev
1515
else
16-
sudo apt update; sudo apt -y install build-essential cmake ccache gnuplot libssl-dev libeigen3-dev libunittest++-dev libgsl-dev libboost-system-dev libboost-filesystem-dev libboost-iostreams-dev libboost-serialization-dev libboost-program-options-dev libboost-date-time-dev libboost-atomic-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools
16+
echo "TODO: install deps"
17+
# TODO: implement MinGW
1718
fi
18-
# TODO: implement MinGW
19+
1920

0 commit comments

Comments
 (0)