[stormlib] Add targets and streamline build (#7409)

* Add targets and streamline build

* Removed vendored dependencies

* add back definition

* updated version and removed duplication

* [stormlib] update cmakelists

* added unicode definitions

* added win32 guard clause

4 files changed, 287 insertions, 22 deletions

diff --git a/ports/stormlib/CMakeLists.txt b/ports/stormlib/CMakeLists.txt
new file mode 100644
index 000000000..6b0e2a66c
--- /dev/null
+++ b/ports/stormlib/CMakeLists.txt
@@ -0,0 +1,279 @@
+cmake_minimum_required(VERSION 3.9)

+project(stormlib)

+

+set(SRC_FILES

+	stormlib_dll/StormLib.def

+	src/adpcm/adpcm.cpp

+	src/huffman/huff.cpp

+	src/jenkins/lookup3.c

+	src/lzma/C/LzFind.c

+	src/lzma/C/LzmaDec.c

+	src/lzma/C/LzmaEnc.c

+	src/pklib/explode.c

+	src/pklib/implode.c

+	src/sparse/sparse.cpp

+	src/FileStream.cpp

+	src/SBaseCommon.cpp

+	src/SBaseDumpData.cpp

+	src/SBaseFileTable.cpp

+	src/SBaseSubTypes.cpp

+	src/SCompression.cpp

+	src/SFileAddFile.cpp

+	src/SFileAttributes.cpp

+	src/SFileCompactArchive.cpp

+	src/SFileCreateArchive.cpp

+	src/SFileExtractFile.cpp

+	src/SFileFindFile.cpp

+	src/SFileGetFileInfo.cpp

+	src/SFileListFile.cpp

+	src/SFileOpenArchive.cpp

+	src/SFileOpenFileEx.cpp

+	src/SFilePatchArchives.cpp

+	src/SFileReadFile.cpp

+	src/SFileVerify.cpp

+	src/libtomcrypt/src/pk/rsa/rsa_verify_simple.c

+	src/libtomcrypt/src/misc/crypt_libc.c

+)

+

+if(MSVC)

+    # This file is used to create a DLL on windows

+    # Use BUILD_SHARED_LIBS to create StormLib.dll

+    set(STORM_DEF_FILES

+           stormlib_dll/StormLib.def

+    )

+endif()

+

+set(TOMCRYPT_FILES

+	src/libtomcrypt/src/hashes/hash_memory.c

+	src/libtomcrypt/src/hashes/md5.c

+	src/libtomcrypt/src/hashes/sha1.c

+	src/libtomcrypt/src/math/ltm_desc.c

+	src/libtomcrypt/src/math/multi.c

+	src/libtomcrypt/src/math/rand_prime.c

+	src/libtomcrypt/src/misc/base64_decode.c

+	src/libtomcrypt/src/misc/crypt_argchk.c

+	src/libtomcrypt/src/misc/crypt_find_hash.c

+	src/libtomcrypt/src/misc/crypt_find_prng.c

+	src/libtomcrypt/src/misc/crypt_hash_descriptor.c

+	src/libtomcrypt/src/misc/crypt_hash_is_valid.c

+	src/libtomcrypt/src/misc/crypt_ltc_mp_descriptor.c

+	src/libtomcrypt/src/misc/crypt_prng_descriptor.c

+	src/libtomcrypt/src/misc/crypt_prng_is_valid.c

+	src/libtomcrypt/src/misc/crypt_register_hash.c

+	src/libtomcrypt/src/misc/crypt_register_prng.c

+	src/libtomcrypt/src/misc/zeromem.c

+	src/libtomcrypt/src/pk/asn1/der_decode_bit_string.c

+	src/libtomcrypt/src/pk/asn1/der_decode_boolean.c

+	src/libtomcrypt/src/pk/asn1/der_decode_choice.c

+	src/libtomcrypt/src/pk/asn1/der_decode_ia5_string.c

+	src/libtomcrypt/src/pk/asn1/der_decode_integer.c

+	src/libtomcrypt/src/pk/asn1/der_decode_object_identifier.c

+	src/libtomcrypt/src/pk/asn1/der_decode_octet_string.c

+	src/libtomcrypt/src/pk/asn1/der_decode_printable_string.c

+	src/libtomcrypt/src/pk/asn1/der_decode_sequence_ex.c

+	src/libtomcrypt/src/pk/asn1/der_decode_sequence_flexi.c

+	src/libtomcrypt/src/pk/asn1/der_decode_sequence_multi.c

+	src/libtomcrypt/src/pk/asn1/der_decode_short_integer.c

+	src/libtomcrypt/src/pk/asn1/der_decode_utctime.c

+	src/libtomcrypt/src/pk/asn1/der_decode_utf8_string.c

+	src/libtomcrypt/src/pk/asn1/der_encode_bit_string.c

+	src/libtomcrypt/src/pk/asn1/der_encode_boolean.c

+	src/libtomcrypt/src/pk/asn1/der_encode_ia5_string.c

+	src/libtomcrypt/src/pk/asn1/der_encode_integer.c

+	src/libtomcrypt/src/pk/asn1/der_encode_object_identifier.c

+	src/libtomcrypt/src/pk/asn1/der_encode_octet_string.c

+	src/libtomcrypt/src/pk/asn1/der_encode_printable_string.c

+	src/libtomcrypt/src/pk/asn1/der_encode_sequence_ex.c

+	src/libtomcrypt/src/pk/asn1/der_encode_sequence_multi.c

+	src/libtomcrypt/src/pk/asn1/der_encode_set.c

+	src/libtomcrypt/src/pk/asn1/der_encode_setof.c

+	src/libtomcrypt/src/pk/asn1/der_encode_short_integer.c

+	src/libtomcrypt/src/pk/asn1/der_encode_utctime.c

+	src/libtomcrypt/src/pk/asn1/der_encode_utf8_string.c

+	src/libtomcrypt/src/pk/asn1/der_length_bit_string.c

+	src/libtomcrypt/src/pk/asn1/der_length_boolean.c

+	src/libtomcrypt/src/pk/asn1/der_length_ia5_string.c

+	src/libtomcrypt/src/pk/asn1/der_length_integer.c

+	src/libtomcrypt/src/pk/asn1/der_length_object_identifier.c

+	src/libtomcrypt/src/pk/asn1/der_length_octet_string.c

+	src/libtomcrypt/src/pk/asn1/der_length_printable_string.c

+	src/libtomcrypt/src/pk/asn1/der_length_sequence.c

+	src/libtomcrypt/src/pk/asn1/der_length_utctime.c

+	src/libtomcrypt/src/pk/asn1/der_sequence_free.c

+	src/libtomcrypt/src/pk/asn1/der_length_utf8_string.c

+	src/libtomcrypt/src/pk/asn1/der_length_short_integer.c

+	src/libtomcrypt/src/pk/ecc/ltc_ecc_map.c

+	src/libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.c

+	src/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.c

+	src/libtomcrypt/src/pk/ecc/ltc_ecc_points.c

+	src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.c

+	src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.c

+	src/libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.c

+	src/libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.c

+	src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.c

+	src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_encode.c

+	src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.c

+	src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_encode.c

+	src/libtomcrypt/src/pk/rsa/rsa_exptmod.c

+	src/libtomcrypt/src/pk/rsa/rsa_free.c

+	src/libtomcrypt/src/pk/rsa/rsa_import.c

+	src/libtomcrypt/src/pk/rsa/rsa_make_key.c

+	src/libtomcrypt/src/pk/rsa/rsa_sign_hash.c

+	src/libtomcrypt/src/pk/rsa/rsa_verify_hash.c

+)

+

+set(TOMMATH_FILES

+	src/libtommath/bncore.c

+	src/libtommath/bn_fast_mp_invmod.c

+	src/libtommath/bn_fast_mp_montgomery_reduce.c

+	src/libtommath/bn_fast_s_mp_mul_digs.c

+	src/libtommath/bn_fast_s_mp_mul_high_digs.c

+	src/libtommath/bn_fast_s_mp_sqr.c

+	src/libtommath/bn_mp_2expt.c

+	src/libtommath/bn_mp_abs.c

+	src/libtommath/bn_mp_add.c

+	src/libtommath/bn_mp_addmod.c

+	src/libtommath/bn_mp_add_d.c

+	src/libtommath/bn_mp_and.c

+	src/libtommath/bn_mp_clamp.c

+	src/libtommath/bn_mp_clear.c

+	src/libtommath/bn_mp_clear_multi.c

+	src/libtommath/bn_mp_cmp.c

+	src/libtommath/bn_mp_cmp_d.c

+	src/libtommath/bn_mp_cmp_mag.c

+	src/libtommath/bn_mp_cnt_lsb.c

+	src/libtommath/bn_mp_copy.c

+	src/libtommath/bn_mp_count_bits.c

+	src/libtommath/bn_mp_div.c

+	src/libtommath/bn_mp_div_2.c

+	src/libtommath/bn_mp_div_2d.c

+	src/libtommath/bn_mp_div_3.c

+	src/libtommath/bn_mp_div_d.c

+	src/libtommath/bn_mp_dr_is_modulus.c

+	src/libtommath/bn_mp_dr_reduce.c

+	src/libtommath/bn_mp_dr_setup.c

+	src/libtommath/bn_mp_exch.c

+	src/libtommath/bn_mp_exptmod.c

+	src/libtommath/bn_mp_exptmod_fast.c

+	src/libtommath/bn_mp_expt_d.c

+	src/libtommath/bn_mp_exteuclid.c

+	src/libtommath/bn_mp_fread.c

+	src/libtommath/bn_mp_fwrite.c

+	src/libtommath/bn_mp_gcd.c

+	src/libtommath/bn_mp_get_int.c

+	src/libtommath/bn_mp_grow.c

+	src/libtommath/bn_mp_init.c

+	src/libtommath/bn_mp_init_copy.c

+	src/libtommath/bn_mp_init_multi.c

+	src/libtommath/bn_mp_init_set.c

+	src/libtommath/bn_mp_init_set_int.c

+	src/libtommath/bn_mp_init_size.c

+	src/libtommath/bn_mp_invmod.c

+	src/libtommath/bn_mp_invmod_slow.c

+	src/libtommath/bn_mp_is_square.c

+	src/libtommath/bn_mp_jacobi.c

+	src/libtommath/bn_mp_karatsuba_mul.c

+	src/libtommath/bn_mp_karatsuba_sqr.c

+	src/libtommath/bn_mp_lcm.c

+	src/libtommath/bn_mp_lshd.c

+	src/libtommath/bn_mp_mod.c

+	src/libtommath/bn_mp_mod_2d.c

+	src/libtommath/bn_mp_mod_d.c

+	src/libtommath/bn_mp_montgomery_calc_normalization.c

+	src/libtommath/bn_mp_montgomery_reduce.c

+	src/libtommath/bn_mp_montgomery_setup.c

+	src/libtommath/bn_mp_mul.c

+	src/libtommath/bn_mp_mulmod.c

+	src/libtommath/bn_mp_mul_2.c

+	src/libtommath/bn_mp_mul_2d.c

+	src/libtommath/bn_mp_mul_d.c

+	src/libtommath/bn_mp_neg.c

+	src/libtommath/bn_mp_n_root.c

+	src/libtommath/bn_mp_or.c

+	src/libtommath/bn_mp_prime_fermat.c

+	src/libtommath/bn_mp_prime_is_divisible.c

+	src/libtommath/bn_mp_prime_is_prime.c

+	src/libtommath/bn_mp_prime_miller_rabin.c

+	src/libtommath/bn_mp_prime_next_prime.c

+	src/libtommath/bn_mp_prime_rabin_miller_trials.c

+	src/libtommath/bn_mp_prime_random_ex.c

+	src/libtommath/bn_mp_radix_size.c

+	src/libtommath/bn_mp_radix_smap.c

+	src/libtommath/bn_mp_rand.c

+	src/libtommath/bn_mp_read_radix.c

+	src/libtommath/bn_mp_read_signed_bin.c

+	src/libtommath/bn_mp_read_unsigned_bin.c

+	src/libtommath/bn_mp_reduce.c

+	src/libtommath/bn_mp_reduce_2k.c

+	src/libtommath/bn_mp_reduce_2k_l.c

+	src/libtommath/bn_mp_reduce_2k_setup.c

+	src/libtommath/bn_mp_reduce_2k_setup_l.c

+	src/libtommath/bn_mp_reduce_is_2k.c

+	src/libtommath/bn_mp_reduce_is_2k_l.c

+	src/libtommath/bn_mp_reduce_setup.c

+	src/libtommath/bn_mp_rshd.c

+	src/libtommath/bn_mp_set.c

+	src/libtommath/bn_mp_set_int.c

+	src/libtommath/bn_mp_shrink.c

+	src/libtommath/bn_mp_signed_bin_size.c

+	src/libtommath/bn_mp_sqr.c

+	src/libtommath/bn_mp_sqrmod.c

+	src/libtommath/bn_mp_sqrt.c

+	src/libtommath/bn_mp_sub.c

+	src/libtommath/bn_mp_submod.c

+	src/libtommath/bn_mp_sub_d.c

+	src/libtommath/bn_mp_toom_mul.c

+	src/libtommath/bn_mp_toom_sqr.c

+	src/libtommath/bn_mp_toradix.c

+	src/libtommath/bn_mp_toradix_n.c

+	src/libtommath/bn_mp_to_signed_bin.c

+	src/libtommath/bn_mp_to_signed_bin_n.c

+	src/libtommath/bn_mp_to_unsigned_bin.c

+	src/libtommath/bn_mp_to_unsigned_bin_n.c

+	src/libtommath/bn_mp_unsigned_bin_size.c

+	src/libtommath/bn_mp_xor.c

+	src/libtommath/bn_mp_zero.c

+	src/libtommath/bn_prime_tab.c

+	src/libtommath/bn_reverse.c

+	src/libtommath/bn_s_mp_add.c

+	src/libtommath/bn_s_mp_exptmod.c

+	src/libtommath/bn_s_mp_mul_digs.c

+	src/libtommath/bn_s_mp_mul_high_digs.c

+	src/libtommath/bn_s_mp_sqr.c

+	src/libtommath/bn_s_mp_sub.c

+)

+

+find_package(ZLIB REQUIRED)

+find_package(BZip2 REQUIRED)

+

+if(WIN32)

+	set(LINK_LIBS wininet)

+endif()

+

+list(APPEND LINK_LIBS ZLIB::ZLIB BZip2::BZip2)

+

+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")

+	message(STATUS "Using FreeBSD port")

+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DO_LARGEFILE=0 -Dstat64=stat -Dlstat64=lstat -Dlseek64=lseek -Doff64_t=off_t -Dfstat64=fstat -Dftruncate64=ftruncate")

+endif()

+

+add_library(stormlib ${LIB_TYPE} ${SRC_FILES} ${TOMCRYPT_FILES} ${TOMMATH_FILES} ${STORM_DEF_FILES})

+add_definitions(-D__SYS_ZLIB -D__SYS_BZLIB)

+

+target_link_libraries(stormlib PRIVATE ${LINK_LIBS})

+

+target_compile_definitions(stormlib PRIVATE _7ZIP_ST BZ_STRICT_ANSI)

+

+if(WIN32)

+	target_compile_definitions(stormlib PRIVATE  UNICODE _UNICODE)

+endif()

+

+set_target_properties(stormlib PROPERTIES PUBLIC_HEADER "src/StormLib.h;src/StormPort.h")

+

+install(TARGETS stormlib EXPORT stormlibConfig

+		RUNTIME DESTINATION bin

+		ARCHIVE DESTINATION lib

+		LIBRARY DESTINATION lib

+)

+

+install(EXPORT stormlibConfig NAMESPACE stormlib:: DESTINATION share/stormlib)
\ No newline at end of file
diff --git a/ports/stormlib/CONTROL b/ports/stormlib/CONTROL
index 348e09616..beb6fd3c1 100644
--- a/ports/stormlib/CONTROL
+++ b/ports/stormlib/CONTROL
@@ -1,4 +1,4 @@
 Source: stormlib

-Version: 9.22

+Version: 2019-05-10

 Build-Depends: zlib, bzip2

 Description: StormLib is a library for opening and manipulating Blizzard MPQ files

diff --git a/ports/stormlib/disable-building-tests.patch b/ports/stormlib/disable-building-tests.patch
deleted file mode 100644
index fe0d7f70c..000000000
--- a/ports/stormlib/disable-building-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f5211b1..4025ea1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -358,10 +358,4 @@ install(TARGETS ${LIBRARY_NAME}
-
-     INCLUDE(CPack)
-
--if(STORM_BUILD_TESTS)
--    target_link_libraries(storm_test ${LIBRARY_NAME})
--    install(TARGETS storm_test DESTINATION bin)
--endif()
-
--add_executable(storm_test ${SRC_FILES} ${TOMCRYPT_FILES} ${TOMMATH_FILES} ${ZLIB_BZIP2_FILES} ${TEST_SRC_FILES})
--install(TARGETS storm_test RUNTIME DESTINATION bin)
diff --git a/ports/stormlib/portfile.cmake b/ports/stormlib/portfile.cmake
index 82e0aedf9..d0e9e36a4 100644
--- a/ports/stormlib/portfile.cmake
+++ b/ports/stormlib/portfile.cmake
@@ -3,15 +3,14 @@ include(vcpkg_common_functions)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO ladislav-zezula/StormLib

-    REF v9.22

-    SHA512 e08571fca21be2e853d390b8feda32001df810b8f4b60d36822a9de2a877f2be9d3dadacfeec181a2eb80e00b8fed66d0dc9a0d8d9e043e2959478a41ed4d13a

+    REF 2f0e0e69e6b3739d7c450ac3d38816aee45ac3c2

+    SHA512 54cbe4270963944edf3d75b845047add2b004e0d95b20b75a4c4790c2a12a41bf19cc4f55aaeaec697a0a913827e11cfabde2123b2b13730556310dd89eef1e9

     HEAD_REF master

 )

 

-vcpkg_apply_patches(

-    SOURCE_PATH ${SOURCE_PATH}

-    PATCHES

-    ${CMAKE_CURRENT_LIST_DIR}/disable-building-tests.patch

+file(COPY 

+    ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt

+    DESTINATION ${SOURCE_PATH}

 )

 

 vcpkg_configure_cmake(

@@ -20,5 +19,7 @@ vcpkg_configure_cmake(
 )

 

 vcpkg_install_cmake()

+

 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/stormlib RENAME copyright)

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

+vcpkg_fixup_cmake_targets()
\ No newline at end of file