From 96597836dbb8d0d8bda498ff650a3ebda9dcc4ab Mon Sep 17 00:00:00 2001 From: Phenom Date: Sun, 13 Sep 2015 17:57:08 +0200 Subject: [PATCH] Remove libssh and protobuf. --- win_build_libs/Makefile | 31 +----------------------- win_build_libs/build_ext.sh | 32 ------------------------- win_build_libs/libssh-0.5.4-fix.tar.gz | Bin 6452 -> 0 bytes 3 files changed, 1 insertion(+), 62 deletions(-) delete mode 100755 win_build_libs/libssh-0.5.4-fix.tar.gz diff --git a/win_build_libs/Makefile b/win_build_libs/Makefile index c170528d3..250008ac4 100755 --- a/win_build_libs/Makefile +++ b/win_build_libs/Makefile @@ -14,7 +14,7 @@ SQLCIPHER_VERSION=2.2.1 LIBMICROHTTPD_VERSION=0.9.42 FFMPEG_VERSION=2.7.2 -all: dirs zlib bzip2 miniupnpc openssl speex opencv libxml2 libxslt curl libssh protobuf sqlcipher libmicrohttpd ffmpeg copylibs +all: dirs zlib bzip2 miniupnpc openssl speex opencv libxml2 libxslt curl sqlcipher libmicrohttpd ffmpeg copylibs dirs: mkdir -p libs/include @@ -149,35 +149,6 @@ curl: curl-$(CURL_VERSION).tar.gz rm -r -f curl-$(CURL_VERSION) touch curl -libssh-$(LIBSSH_VERSION).tar.gz: - curl.exe -k https://red.libssh.org/attachments/download/41/libssh-0.5.4.tar.gz -o libssh-0.5.4.tar.gz - -libssh: libssh-$(LIBSSH_VERSION).tar.gz - tar xvf libssh-$(LIBSSH_VERSION).tar.gz - tar xvf libssh-$(LIBSSH_VERSION)-fix.tar.gz - mkdir -p libssh-$(LIBSSH_VERSION)/build - cd libssh-$(LIBSSH_VERSION)/build && cmake .. -G"MSYS Makefiles" -DWITH_STATIC_LIB:BOOL=ON -DZLIB_LIBRARY:FILEPATH="`pwd`/../../libs/lib/libz.a" -DZLIB_INCLUDE_DIR:PATH="`pwd`/../../libs/include" -DOPENSSL_LIBRARIES:FILEPATH="`pwd`/../../libs/lib/libcrypto.a" -DOPENSSL_INCLUDE_DIRS:PATH="`pwd`/../../libs/include" - cd libssh-$(LIBSSH_VERSION)/build && make - cp libssh-$(LIBSSH_VERSION)/build/src/libssh.a libs/lib/ - cp libssh-$(LIBSSH_VERSION)/build/src/threads/libssh_threads.a libs/lib/ - mkdir -p libs/include/libssh && cp libssh-$(LIBSSH_VERSION)/include/libssh/*.h libs/include/libssh/ - rm -r -f libssh-$(LIBSSH_VERSION) - touch libssh - -protobuf-$(PROTOBUF_VERSION).tar.gz: - curl.exe -k https://protobuf.googlecode.com/files/protobuf-2.4.1.tar.gz -o protobuf-2.4.1.tar.gz - -protobuf: protobuf-$(PROTOBUF_VERSION).tar.gz - tar xvf protobuf-$(PROTOBUF_VERSION).tar.gz - cd protobuf-$(PROTOBUF_VERSION) && ./configure --disable-shared - #cd protobuf-$(PROTOBUF_VERSION) && make install exec_prefix="`pwd`/../libs" - cd protobuf-$(PROTOBUF_VERSION) && make - mkdir -p libs/include/protobuf && cp -r protobuf-$(PROTOBUF_VERSION)/src/google/ libs/include/protobuf/ - cp protobuf-$(PROTOBUF_VERSION)/src/.libs/libprotobuf.a libs/lib/ - cp protobuf-$(PROTOBUF_VERSION)/src/protoc.exe libs/bin/ - rm -r -f protobuf-$(PROTOBUF_VERSION) - touch protobuf - tcl$(TCL_VERSION)-src.tar.gz: curl.exe -L http://prdownloads.sourceforge.net/tcl/tcl$(TCL_VERSION)-src.tar.gz -o tcl$(TCL_VERSION)-src.tar.gz diff --git a/win_build_libs/build_ext.sh b/win_build_libs/build_ext.sh index bcb555094..6c3721cdd 100755 --- a/win_build_libs/build_ext.sh +++ b/win_build_libs/build_ext.sh @@ -130,38 +130,6 @@ if [ -s curl-7.34.0.tar.gz ]; then rm -r -f curl-7.34.0 fi -[ -s libssh-0.5.4.tar.gz ] || curl -k https://red.libssh.org/attachments/download/41/libssh-0.5.4.tar.gz -o libssh-0.5.4.tar.gz -if [ -s libssh-0.5.4.tar.gz ]; then - tar xvf libssh-0.5.4.tar.gz - tar xvf libssh-0.5.4-fix.tar.gz - cd libssh-0.5.4 - mkdir -p build - cd build - cmake .. -G"MSYS Makefiles" -DWITH_STATIC_LIB:BOOL=ON -DZLIB_LIBRARY:FILEPATH="`pwd`/../../libs/lib/libz.a" -DZLIB_INCLUDE_DIR:PATH="`pwd`/../../libs/include" -DOPENSSL_LIBRARIES:FILEPATH="`pwd`/../../libs/lib/libcrypto.a" -DOPENSSL_INCLUDE_DIRS:PATH="`pwd`/../../libs/include" - make - cp src/libssh.a ../../libs/lib/ - cp src/threads/libssh_threads.a ../../libs/lib/ - cd .. - rm -r -f build - mkdir -p ../libs/include/libssh && cp include/libssh/*.h ../libs/include/libssh/ - cd .. - rm -r -f libssh-0.5.4 -fi - -[ -s protobuf-2.4.1.tar.gz ] || curl -k https://protobuf.googlecode.com/files/protobuf-2.4.1.tar.gz -o protobuf-2.4.1.tar.gz -if [ -s protobuf-2.4.1.tar.gz ]; then - tar xvf protobuf-2.4.1.tar.gz - cd protobuf-2.4.1 - ./configure --disable-shared - #make install exec_prefix="`pwd`/../libs" - make - mkdir -p ../libs/include/protobuf && cp -r src/google/ ../libs/include/protobuf/ - cp src/.libs/libprotobuf.a ../libs/lib/ - cp src/protoc.exe ../libs/bin/ - cd .. - rm -r -f protobuf-2.4.1 -fi - [ -s tcl8.6.2-src.tar.gz ] || curl -L http://prdownloads.sourceforge.net/tcl/tcl8.6.2-src.tar.gz -o tcl8.6.2-src.tar.gz [ -s sqlcipher-2.2.1.tar.gz ] || curl -L -k https://github.com/sqlcipher/sqlcipher/archive/v2.2.1.tar.gz -o sqlcipher-2.2.1.tar.gz if [ -s tcl8.6.2-src.tar.gz -a -s sqlcipher-2.2.1.tar.gz ]; then diff --git a/win_build_libs/libssh-0.5.4-fix.tar.gz b/win_build_libs/libssh-0.5.4-fix.tar.gz deleted file mode 100755 index 0189c5a064be669f8db3008c75e7247ba5d1c8d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6452 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