lttoolbox -= deps; lttoolbox vcpkg (issue #5); Combined m4 version de…

…tection
apertium · May 7, 2020 · d95c345 · d95c345
1 parent 8544b65
commit d95c345
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 7 deletions.
diff --git a/get-version.pl b/get-version.pl
@@ -116,7 +116,11 @@ BEGIN
 
 my $data = file_get_contents($opts{file});
 my $version = '';
-if ($data =~ m@_VERSION_MAJOR = (\d+);.*?_VERSION_MINOR = (\d+);.*?_VERSION_PATCH = (\d+);@s) {
+if ($data =~ m@_VERSION_MAJOR\], \[(\d+)\].*?_VERSION_MINOR\], \[(\d+)\].*?_VERSION_PATCH\], \[(\d+)\]@s) {
+   print STDERR "Found m4 _VERSION_MAJOR/MINOR/PATCH version\n";
+   $version = "$1.$2.$3";
+}
+elsif ($data =~ m@_VERSION_MAJOR = (\d+);.*?_VERSION_MINOR = (\d+);.*?_VERSION_PATCH = (\d+);@s) {
    print STDERR "Found _VERSION_MAJOR/MINOR/PATCH version\n";
    $version = "$1.$2.$3";
 }

diff --git a/tools/lttoolbox/debian/control b/tools/lttoolbox/debian/control
@@ -10,18 +10,13 @@ Build-Depends: automake,
                dh-autoreconf,
                dh-exec,
                dh-python,
-               flex,
-               gawk,
-               libpcre3-dev,
                libtool,
                libxml2-dev,
                libxml2-utils,
                pkg-config,
                python3-dev,
                python3-setuptools,
-               swig,
-               xsltproc,
-               zlib1g-dev
+               swig
 Standards-Version: 4.5.0
 Homepage: https://apertium.org/
 Vcs-Git: https://salsa.debian.org/science-team/lttoolbox.git

diff --git a/tools/lttoolbox/vcpkg/CONTROL b/tools/lttoolbox/vcpkg/CONTROL
@@ -0,0 +1,5 @@
+Source: lttoolbox
+Version: 3.5.2
+Homepage: https://github.com/apertium/lttoolbox
+Description: Finite state compiler, processor and helper tools used by apertium.
+Build-Depends: libxml2, getopt
diff --git a/tools/lttoolbox/vcpkg/portfile.cmake b/tools/lttoolbox/vcpkg/portfile.cmake
@@ -0,0 +1,30 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+	OUT_SOURCE_PATH SOURCE_PATH
+	REPO apertium/lttoolbox
+	REF 841a0e9a032438d78f5b3ee6aa298daf9f9d0838
+	SHA512 fdc94bad9e42427c26ecfa055df9a19135716be09716214394530e626273d2221ee14c4eb4f8d7cce6aeb01222e6e0e34531e19f0954c8f0faa5f5f85547996c
+	HEAD_REF master
+)
+
+vcpkg_find_acquire_program(PYTHON3)
+set(VCPKG_PYTHON_EXECUTABLE "${PYTHON3}")
+
+vcpkg_configure_cmake(
+	SOURCE_PATH ${SOURCE_PATH}
+	PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/lttoolbox RENAME copyright)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/lttoolbox)
+file(GLOB exes RELATIVE ${CURRENT_PACKAGES_DIR}/bin/ ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+foreach(exe ${exes})
+	file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/${exe})
+	file(RENAME ${CURRENT_PACKAGES_DIR}/bin/${exe} ${CURRENT_PACKAGES_DIR}/tools/lttoolbox/${exe})
+endforeach()