status-im
/
nimbus-eth1
mirror of https://github.com/status-im/nimbus-eth1.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Windows: copy all DLLs to vendor/nim-beacon-chain/build/

This commit is contained in:
Ștefan Talpalaru 2019-04-12 14:12:27 +02:00
parent f7cef508b1
commit b212d2ee21
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -225,8 +225,6 @@ ctags:
ifeq ($(OS), Windows_NT) ifeq ($(OS), Windows_NT)
# no tabs allowed for indentation here # no tabs allowed for indentation here
SQLITE_ARCHIVE_32 := sqlite-dll-win32-x86-3240000.zip
SQLITE_ARCHIVE_64 := sqlite-dll-win64-x64-3240000.zip
# the AppVeyor 32-build is done on a 64-bit image, so we need to override the architecture detection # the AppVeyor 32-build is done on a 64-bit image, so we need to override the architecture detection
ifeq ($(ARCH_OVERRIDE), x86) ifeq ($(ARCH_OVERRIDE), x86)
@ -245,17 +243,12 @@ ifeq ($(OS), Windows_NT)
endif endif
ifeq ($(ARCH), x86) ifeq ($(ARCH), x86)
SQLITE_ARCHIVE := $(SQLITE_ARCHIVE_32)
SQLITE_SUFFIX := _32
ROCKSDB_DIR := x86 ROCKSDB_DIR := x86
endif endif
ifeq ($(ARCH), x64) ifeq ($(ARCH), x64)
SQLITE_ARCHIVE := $(SQLITE_ARCHIVE_64)
SQLITE_SUFFIX := _64
ROCKSDB_DIR := x64 ROCKSDB_DIR := x64
endif endif
SQLITE_URL := https://www.sqlite.org/2018/$(SQLITE_ARCHIVE)
ROCKSDB_ARCHIVE := nimbus-deps.zip ROCKSDB_ARCHIVE := nimbus-deps.zip
ROCKSDB_URL := https://github.com/status-im/nimbus-deps/releases/download/nimbus-deps/$(ROCKSDB_ARCHIVE) ROCKSDB_URL := https://github.com/status-im/nimbus-deps/releases/download/nimbus-deps/$(ROCKSDB_ARCHIVE)
CURL := curl -O -L CURL := curl -O -L
@ -264,12 +257,13 @@ ifeq ($(OS), Windows_NT)
#- back to tabs #- back to tabs
#- copied from .appveyor.yml #- copied from .appveyor.yml
#- this is why we can't delete the whole "build" dir in the "clean" target #- this is why we can't delete the whole "build" dir in the "clean" target
fetch-dlls: | build fetch-dlls: | build deps
cd build && \ cd build && \
$(CURL) $(SQLITE_URL) && \
$(CURL) $(ROCKSDB_URL) && \ $(CURL) $(ROCKSDB_URL) && \
$(UNZIP) $(SQLITE_ARCHIVE) && \ $(CURL) https://nim-lang.org/download/dlls.zip && \
cp -a sqlite3.dll sqlite3$(SQLITE_SUFFIX).dll && \
$(UNZIP) $(ROCKSDB_ARCHIVE) && \ $(UNZIP) $(ROCKSDB_ARCHIVE) && \
cp -a $(ROCKSDB_DIR)/*.dll . cp -a $(ROCKSDB_DIR)/*.dll . && \
$(UNZIP) dlls.zip && \
mkdir -p vendor/nim-beacon-chain/build && \
cp -a *.dll vendor/nim-beacon-chain/build/
endif endif