From 0e865ce2f38094a434596afcb3a8d06e3f18f1ed Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Wed, 13 Jun 2018 13:01:27 +0200
Subject: Remove unused build-native.bat

---
 main/misc/build-native.bat       | 77 ----------------------------------------
 main/src/main/cpp/CMakeLists.txt |  2 +-
 2 files changed, 1 insertion(+), 78 deletions(-)
 delete mode 100644 main/misc/build-native.bat

(limited to 'main')

diff --git a/main/misc/build-native.bat b/main/misc/build-native.bat
deleted file mode 100644
index 8f1323e5..00000000
--- a/main/misc/build-native.bat
+++ /dev/null
@@ -1,77 +0,0 @@
-@echo off
-
-setlocal EnableDelayedExpansion
-
-if not exist openvpn\.git (
-    set lasterror=Cannot find .git directory in openvpn, aborting
-    goto :error
-) else (
-    cd openvpn
-
-    set head=HEAD
-    for /F "tokens=3 delims=/" %%F in ('git rev-parse --symbolic-full-name HEAD') do (
-        set head=%%F
-    )
-
-    git rev-parse --short=16 HEAD > commit.tmp
-    set /p commit=<commit.tmp
-    del commit.tmp
-
-    set revision=%head%-%commit%
-
-    echo #define CONFIGURE_GIT_REVISION "%revision%"> config-version.h.tmp
-
-    git diff-files --name-status -r --ignore-submodules --quiet -- > flags.tmp || echo +> flags.tmp
-    git diff-index --cached  --quiet --ignore-submodules HEAD > flags.tmp || echo *>> flags.tmp
-    set /p flags=<flags.tmp
-    del flags.tmp
-
-    echo #define CONFIGURE_GIT_FLAGS "%flags%">> config-version.h.tmp
-
-    fc /b config-version.h.tmp config-version.h 1>nul 2>nul
-    if not errorlevel 1 goto keep
-
-    echo replacing config-version.h
-    copy config-version.h.tmp config-version.h
-
-:keep
-    del config-version.h.tmp
-
-    cd ..
-)
-
-if [%1] == [] (
-    call ndk-build USE_SHORT_COMMANDS=1 -j 8 USE_BREAKPAD=0
-) else (
-    call ndk-build USE_SHORT_COMMANDS=1 %*
-)
-
-if not errorlevel 0 goto error
-
-if exist ovpnlibs rmdir /Q /S ovpnlibs
-
-cd libs
-mkdir ..\ovpnlibs
-mkdir ..\ovpnlibs\assets
-mkdir ..\ovpnlibs\jniLibs
-
-for /D %%f in (*) do (
-    copy %%f\nopie_openvpn ..\ovpnlibs\assets\nopie_openvpn.%%f
-    copy %%f\pie_openvpn ..\ovpnlibs\assets\pie_openvpn.%%f
-
-    rem Remove compiled openssl libs, will use platform .so libs
-    rem Reduces size of apk
-    del /Q %%f\libcrypto.so
-    del /Q %%f\libssl.so
-
-    mkdir ..\ovpnlibs\jniLibs\%%f\
-    copy %%f\*.so  ..\ovpnlibs\jniLibs\%%f\
-)
-
-goto :exit
-
-:error
-echo(%lasterror%
-exit /b %errorlevel%
-
-:exit
\ No newline at end of file
diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt
index 823c350a..150f21d9 100644
--- a/main/src/main/cpp/CMakeLists.txt
+++ b/main/src/main/cpp/CMakeLists.txt
@@ -22,7 +22,7 @@ include(openssl.cmake)
 # Super hacky way to determine flavour
 #-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=/Users/arne/software/icsopenvpn/main/build/intermediates/cmake/normal/debug/obj/arm64-v8a
 if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*noovpn3.*/")
-    FIND_PACKAGE(SWIG 3.0)
+    FIND_PACKAGE(SWIG 3.0 REQUIRED)
 
     add_subdirectory(mbedtls)
     add_custom_command(OUTPUT "ovpncli_wrap.cxx"
-- 
cgit v1.2.3