Remove ENABLE_APK_LOADING=NO option

Author: ytsutano

CMakeLists.txt

@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 2.8.11)
 
 project(axmldec C CXX)
-option(ENABLE_APK_LOADING "enable loading from an APK file" ON)
 set(AXMLDEC_VERSION_MAJOR 1)
 set(AXMLDEC_VERSION_MINOR 2)
 set(AXMLDEC_VERSION_PATCH 0)
@@ -50,6 +49,7 @@ add_executable(axmldec
     lib/jitana/util/axml_parser.cpp
 )
 
+# Boost.
 set(BOOST_MIN_VERSION "1.53.0")
 find_package(Boost ${BOOST_MIN_VERSION}
     COMPONENTS system iostreams program_options locale REQUIRED)
@@ -60,25 +60,22 @@ add_definitions(
 )
 target_link_libraries(axmldec ${Boost_LIBRARIES})
 
-if(ENABLE_APK_LOADING)
-    find_package(ZLIB REQUIRED)
-    include_directories(${ZLIB_INCLUDE_DIR})
+# Zlib.
+find_package(ZLIB REQUIRED)
+include_directories(${ZLIB_INCLUDE_DIR})
 
-    add_definitions(
-        -DENABLE_APK_LOADING=1
-    )
-    add_library(minizip STATIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/external/minizip/unzip.c
-        ${CMAKE_CURRENT_SOURCE_DIR}/external/minizip/ioapi.c
-    )
-    set_target_properties(minizip PROPERTIES
-        COMPILE_DEFINITIONS "NOUNCRYPT;NOCRYPT")
-    target_link_libraries(minizip ${ZLIB_LIBRARIES})
-    set(MINIZIP_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external/minizip)
-    set(MINIZIP_LIBRARIES minizip)
-    include_directories(SYSTEM ${MINIZIP_INCLUDE_DIR})
-    target_link_libraries(axmldec ${MINIZIP_LIBRARIES})
-endif()
+# MiniZip.
+add_library(minizip STATIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/external/minizip/unzip.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/external/minizip/ioapi.c
+)
+set_target_properties(minizip PROPERTIES
+    COMPILE_DEFINITIONS "NOUNCRYPT;NOCRYPT")
+target_link_libraries(minizip ${ZLIB_LIBRARIES})
+set(MINIZIP_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external/minizip)
+set(MINIZIP_LIBRARIES minizip)
+include_directories(SYSTEM ${MINIZIP_INCLUDE_DIR})
+target_link_libraries(axmldec ${MINIZIP_LIBRARIES})
 
 #-------------------------------------------------------------------------------
 # Install

README.md

@@ -84,12 +84,9 @@ axmldec com.example.app.apk | xmllint --xpath 'string(/manifest/@package)' -
 
 3. Compile axmldec:
     ```sh
-    cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_APK_LOADING=YES . && make
+    cmake -DCMAKE_BUILD_TYPE=Release . && make
     ```
 
-    You can specify `-DENABLE_APK_LOADING=NO` to disable APK loading. In this
-    case, zlib is not required.
-
 ## 5 Developer
 
 - [Yutaka Tsutano] at University of Nebraska-Lincoln.

main.cpp

@@ -25,9 +25,7 @@
 #include <boost/property_tree/xml_parser.hpp>
 #include <boost/program_options.hpp>
 
-#ifdef ENABLE_APK_LOADING
 #include <unzip.h>
-#endif
 
 namespace boost_pt = boost::property_tree;
 
@@ -49,7 +47,6 @@ struct imemstream : virtual membuf, std::istream {
 
 std::vector<char> extract_manifest(const std::string& input_filename)
 {
-#ifdef ENABLE_APK_LOADING
     auto* apk = unzOpen(input_filename.c_str());
     if (apk == nullptr) {
         throw std::runtime_error("not an APK file");
@@ -92,10 +89,6 @@ std::vector<char> extract_manifest(const std::string& input_filename)
     unzClose(apk);
 
     return content;
-#else
-    (void)input_filename;
-    throw std::runtime_error("axmldec is compiled without APK loading support");
-#endif
 }
 
 void write_xml(const std::string& output_filename, const boost_pt::ptree& pt)
@@ -173,12 +166,6 @@ int main(int argc, char** argv)
             std::cout << "." << AXMLDEC_VERSION_MINOR;
             std::cout << "." << AXMLDEC_VERSION_PATCH;
             std::cout << " (" << AXMLDEC_BUILD_TIMESTAMP << ")\n";
-            std::cout << "APK loading support: ";
-#ifdef ENABLE_APK_LOADING
-            std::cout << "enabled\n";
-#else
-            std::cout << "disabled\n";
-#endif
             std::cout << "Copyright (C) 2017 Yutaka Tsutano.\n";
             return 0;
         }