revert d9aad16

Author: unxed

.cirrus.yml

@@ -2,7 +2,7 @@ freebsd_test_task:
     freebsd_instance:
         image_family: freebsd-14-0
     name: cirrus/FreeBSD
-    install_script: pkg install -y cmake git pkgconf bash wx32-gtk3 libssh openssl libnfs neon libarchive samba416 uchardet libxml2 aws-sdk-cpp
+    install_script: pkg install -y cmake git pkgconf bash wx32-gtk3 libssh openssl libnfs neon libarchive samba416 uchardet libxml2
     script: mkdir build && cd build && cmake .. && make -j $(getconf _NPROCESSORS_ONLN) && ./install/far2l --help
 
 macos_test_task:

.travis.yml

@@ -5,10 +5,6 @@ matrix:
   include:
     - os: osx
       osx_image: xcode12
-      before_install:
-        - git clone https://github.com/microsoft/vcpkg.git
-        - ./vcpkg/bootstrap-vcpkg.sh
-        - ./vcpkg/vcpkg install aws-sdk-cpp
     - os: linux
       dist: xenial
       sudo: required
@@ -30,12 +26,8 @@ matrix:
             - libarchive-dev
             - ninja-build
       env: CXX=g++-5
-      before_install:
-        - git clone https://github.com/microsoft/vcpkg.git
-        - ./vcpkg/bootstrap-vcpkg.sh
-        - ./vcpkg/vcpkg install aws-sdk-cpp
       install:
-        - if [ "$CXX" = "g++" ]; then export CXX="g++-5" CC="gcc-5"; fi
+            - if [ "$CXX" = "g++" ]; then export CXX="g++-5" CC="gcc-5"; fi
     - os: linux
       dist: xenial
       sudo: required
@@ -57,12 +49,8 @@ matrix:
             - libarchive-dev
             - ninja-build
       env: CXX=g++-6
-      before_install:
-        - git clone https://github.com/microsoft/vcpkg.git
-        - ./vcpkg/bootstrap-vcpkg.sh
-        - ./vcpkg/vcpkg install aws-sdk-cpp
       install:
-        - if [ "$CXX" = "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi
+            - if [ "$CXX" = "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi
     - os: linux
       dist: xenial
       sudo: required
@@ -85,12 +73,8 @@ matrix:
             - libarchive-dev
             - ninja-build
       env: CXX=clang++-3.6
-      before_install:
-        - git clone https://github.com/microsoft/vcpkg.git
-        - ./vcpkg/bootstrap-vcpkg.sh
-        - ./vcpkg/vcpkg install aws-sdk-cpp
       install:
-        - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.6" CC="clang-3.6"; fi
+            - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.6" CC="clang-3.6"; fi
     - os: linux
       dist: xenial
       sudo: required
@@ -114,12 +98,8 @@ matrix:
             - zlib1g-dev
             - ninja-build
       env: CXX=clang++-3.7
-      before_install:
-        - git clone https://github.com/microsoft/vcpkg.git
-        - ./vcpkg/bootstrap-vcpkg.sh
-        - ./vcpkg/vcpkg install aws-sdk-cpp
       install:
-        - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
+            - if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.7" CC="clang-3.7"; fi
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink python@2 ; fi
@@ -132,6 +112,5 @@ before_install:
 script:
   - mkdir build
   - cd build
-  - cmake -G Ninja .. -DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake
-  - ninja -v
+  - cmake -G Ninja .. && ninja -v
   - cd install && zip -r ../far2l-${TRAVIS_COMMIT}.zip * && cd -

Brewfile

@@ -10,5 +10,3 @@ brew "uchardet"
 brew "wget"
 brew "wxwidgets"
 brew "libxml2"
-brew "libxml2"
-brew "aws-sdk-cpp"

NetRocks/CMakeLists.txt

@@ -23,7 +23,6 @@ src/UI/Settings/ExtraSiteSettings.cpp
 src/UI/Settings/ProxySettings.cpp
 src/UI/Settings/ConfigureProtocolSFTPSCP.cpp
 src/UI/Settings/ConfigureProtocolFTP.cpp
-src/UI/Settings/ConfigureProtocolAWS.cpp
 src/UI/Settings/ConfigureProtocolSMB.cpp
 src/UI/Settings/ConfigureProtocolNFS.cpp
 src/UI/Settings/ConfigureProtocolWebDAV.cpp
@@ -84,8 +83,6 @@ add_executable (NetRocks-SHELL
 # get rid of warning: dynamic exception specifications are deprecated in C++11
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated")
 
-find_package(AWSSDK REQUIRED COMPONENTS s3)
-
 target_link_libraries(NetRocks-FILE utils)
 target_include_directories(NetRocks-FILE PRIVATE src)
 set_target_properties(NetRocks-FILE
@@ -180,27 +177,6 @@ if (LIBNEON_FOUND AND ((NOT DEFINED NR_WEBDAV) OR NR_WEBDAV))
         SUFFIX ".broker")
 endif ()
 
-message(STATUS "TEST: ${AWSSDK_FOUND}")
-if (AWSSDK_FOUND AND ((NOT DEFINED NR_AWS) OR NR_AWS))
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_AWS")
-    add_executable (NetRocks-AWS
-        ${PROTOCOL_SOURCES}
-        src/Protocol/AWS/AWSFile.cpp
-        src/Protocol/AWS/AWSFileWriter.cpp
-        src/Protocol/AWS/AWSFileReader.cpp
-        src/Protocol/AWS/S3Repository.cpp
-        src/Protocol/AWS/ProtocolAWS.cpp
-    )
-    target_include_directories(NetRocks-AWS PRIVATE src ${AWSSDK_INCLUDE_DIR})
-    target_link_libraries(NetRocks-AWS utils ${AWSSDK_LINK_LIBRARIES})
-
-    set_target_properties(NetRocks-AWS
-        PROPERTIES
-        RUNTIME_OUTPUT_DIRECTORY "${INSTALL_DIR}/Plugins/NetRocks/plug"
-        PREFIX ""
-        SUFFIX ".broker")
-endif ()
-
     add_executable (NetRocks-FTP
         ${PROTOCOL_SOURCES}
         src/Protocol/FTP/ProtocolFTP.cpp

NetRocks/configs/plug/bel.lng

@@ -316,13 +316,3 @@
 "Не выкарыстоўваць праксіфікатар"
 "Выкарыстоўваны &праксіфікатар:"
 "&Рэдагаваць канфігурацыю праксіфікатара"
-
-"Ховішча AWS S3"
-"Карыстальніцкі агент"
-"Рэгіён"
-"Выкарыстоўваць праксы"
-"Хост праксы"
-"Порт праксы"
-"Пракса з аўтэнтыфікацыяй"
-"Імя карыстальніка праксы"
-"Пароль праксы"

NetRocks/configs/plug/eng.lng

@@ -316,13 +316,3 @@
 "Not using proxifier"
 "&Proxifier kind to use:"
 "&Edit proxifier configuration"
-
-"AWS S3 Storage"
-"User agent"
-"Region"
-"Use proxy"
-"Proxy host"
-"Proxy port"
-"Auth proxy"
-"Proxy username"
-"Proxy password"

NetRocks/configs/plug/rus.lng

@@ -316,13 +316,3 @@
 "Не использовать проксификатор"
 "Используемый &проксификатор:"
 "&Редактировать конфигурацию проксификатора"
-
-"Хранилище AWS S3"
-"Пользовательский агент"
-"Регион"
-"Использовать прокси"
-"Хост прокси"
-"Порт прокси"
-"Прокси с аутентификацией"
-"Имя пользователя прокси"
-"Пароль прокси"