Win unify scripts 01 (#30)

mj-xmr · Dec 9, 2021 · ed1c43e · ed1c43e
1 parent 143cad7
commit ed1c43e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -139,14 +139,14 @@ jobs:
     - uses: eine/setup-msys2@v2
       with:
         update: true
-        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
+        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
     - name: prepare environment
       run: util/prep-env.sh
 # TODO: Use python later
-#    - name: install dependencies
-#      run: util/deps-pull.sh
-#    - name: build & install the unmanaged dependencies
-#      run: util/deps-build.sh
+    - name: install dependencies
+      run: util/deps-pull.sh
+    - name: build & install the unmanaged dependencies
+      run: util/deps-build.sh
     - name: build
       run: ./ci-default --unity
     - name: run demo

diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ Supported Operating Systems and features:
 | Ubuntu 20.04  | ✓  | ✓   | ✓     |  ✓ | ✓  |
 | Mac OSX 11    | ✓  |     | ✓     |  ✓ |    |
 | Mac OSX 10.15 | ✓  |     | ✓     |  ✓ |    |
-| ~~Windows~~ (soon)  |    |     |       |    |    |
+| Windows       | ✓  | ✓   |       |  ✓ |    |
 
 Glossary:
 - CI = [Continuous Integration](https://github.com/mj-xmr/tsqsim/actions)

diff --git a/util/deps-pull.sh b/util/deps-pull.sh
@@ -8,12 +8,13 @@ if [ "$(uname)" == "Darwin" ]; then
 	fi
 	#HOMEBREW_NO_AUTO_UPDATE=1 brew install qt5
 	#brew link -v qt5 --force
-	HOMEBREW_NO_AUTO_UPDATE=1 brew install boost openssl ccache gnuplot eigen gsl unittest-cpp
+	HOMEBREW_NO_AUTO_UPDATE=1 brew install boost ccache gnuplot eigen gsl unittest-cpp # openssl zmq
 	# TODO: install qt instead of qt5, after moving to latest QCustomPlot. Then the "--prefix" and "link" aren't needed.
-elif [ "$(uname)" == "MinGw" ]; then
-	echo "TODO: install deps"	
+elif [ "$(uname)" == "Linux" ]; then
+	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
 else
-	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
+	echo "TODO: install deps"	
+	# TODO: implement MinGW	
 fi
-# TODO: implement MinGW
+