From 4a91cf982eb844d857fbd2ea340fac5c54787c4c Mon Sep 17 00:00:00 2001 From: mario4tier Date: Wed, 27 Nov 2024 00:52:51 -0500 Subject: [PATCH] Fix CI for recent ta_lib to ta-lib renames for static libs --- install.sh => install | 0 scripts/package.py | 12 ++++++------ src/Makefile.am | 4 ++-- src/tools/ta_regtest/Makefile.am | 2 +- ta-lib.pc.in | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) rename install.sh => install (100%) diff --git a/install.sh b/install similarity index 100% rename from install.sh rename to install diff --git a/scripts/package.py b/scripts/package.py index 24c07eeb2..93dc43351 100755 --- a/scripts/package.py +++ b/scripts/package.py @@ -9,9 +9,9 @@ # # For windows: ta-lib--win64.zip # with contents: -# lib/ta_lib.dll (dynamic library) -# lib/ta_lib.lib (import library) -# lib/ta_lib_static.lib (static library) +# lib/ta-lib.dll (dynamic library) +# lib/ta-lib.lib (import library) +# lib/ta-lib-static.lib (static library) # include/*.h (all necessary headers) # # How to run it? @@ -85,9 +85,9 @@ def package_windows(root_dir: str, version: str): # Copy the built files to the temporary package directory try: - shutil.copy('ta_lib.dll', os.path.join(package_temp_dir, 'lib')) - shutil.copy('ta_lib.lib', os.path.join(package_temp_dir, 'lib')) - shutil.copy('ta_lib_static.lib', os.path.join(package_temp_dir, 'lib')) + shutil.copy('ta-lib.dll', os.path.join(package_temp_dir, 'lib')) + shutil.copy('ta-lib.lib', os.path.join(package_temp_dir, 'lib')) + shutil.copy('ta-lib-static.lib', os.path.join(package_temp_dir, 'lib')) for header in glob.glob(os.path.join(root_dir, 'include', '*.h')): shutil.copy(header, os.path.join(package_temp_dir, 'include')) except subprocess.CalledProcessError as e: diff --git a/src/Makefile.am b/src/Makefile.am index 844277b06..0ef437226 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,9 +1,9 @@ AUTOMAKE_OPTIONS = foreign 1.4 SUBDIRS = ta_abstract ta_common ta_func -lib_LTLIBRARIES = libta_lib.la +lib_LTLIBRARIES = libta-lib.la -libta_lib_la_SOURCES = +libta_lib_la_SOURCES = libta_lib_la_LIBADD = \ ta_abstract/libta_abstract.la \ diff --git a/src/tools/ta_regtest/Makefile.am b/src/tools/ta_regtest/Makefile.am index ecd8f6d0e..929dacfda 100644 --- a/src/tools/ta_regtest/Makefile.am +++ b/src/tools/ta_regtest/Makefile.am @@ -37,7 +37,7 @@ ta_regtest_CPPFLAGS = -I../../ta_func \ -I../../ta_common \ -I../../ta_abstract ta_regtest_LDFLAGS = -no-undefined -ta_regtest_LDADD = ../../libta_lib.la $(LIBM) +ta_regtest_LDADD = ../../libta-lib.la $(LIBM) all-local: ta_regtest $(LIBTOOL) --mode=execute ../post-build-bin.sh ta_regtest diff --git a/ta-lib.pc.in b/ta-lib.pc.in index 274ffa9e0..b0a8ebd30 100644 --- a/ta-lib.pc.in +++ b/ta-lib.pc.in @@ -8,4 +8,4 @@ Description: TA-Lib : Technical Analysis Library URL: https://github.com/TA-Lib/ta-lib Version: @PACKAGE_VERSION@ Cflags: -I${includedir} -Libs: -L${libdir} -lta_lib +Libs: -L${libdir} -lta-lib