shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

make work for windows

Browse Source
This commit is contained in:
Conor Patrick 2019-02-16 21:27:56 -05:00
parent 0d2e03a5a9
commit 190ecc8fd8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -28,5 +28,4 @@ RUN ln -s /opt/conda/bin/python3 /usr/local/bin/python3
RUN ln -s /opt/conda/bin/python3 /usr/local/bin/python RUN ln -s /opt/conda/bin/python3 /usr/local/bin/python
# 3. Source code # 3. Source code
RUN git clone --recurse-submodules https://github.com/solokeys/solo /solo RUN git clone --recurse-submodules https://github.com/solokeys/solo /solo --config core.autocrlf=input

4
Makefile
View File

@ -78,7 +78,9 @@ DOCKER_IMAGE := "solokeys/solo-firmware:local"
SOLO_VERSIONISH := "master" SOLO_VERSIONISH := "master"
docker-build: docker-build:
docker build -t $(DOCKER_IMAGE) . docker build -t $(DOCKER_IMAGE) .
docker run --rm -v$(PWD)/builds:/builds -v$(PWD)/in-docker-build.sh:/in-docker-build.sh $(DOCKER_IMAGE) /in-docker-build.sh $(SOLO_VERSIONISH) docker run --rm -v "$(CURDIR)/builds:/builds" \
-v "$(CURDIR)/in-docker-build.sh:/in-docker-build.sh" \
$(DOCKER_IMAGE) /in-docker-build.sh $(SOLO_VERSIONISH)
CPPCHECK_FLAGS=--quiet --error-exitcode=2 CPPCHECK_FLAGS=--quiet --error-exitcode=2