Commit Graph

160 Commits (fd16e820bfced9857cb545f28c560c2152582475)

Author SHA1 Message Date
Slávek Banko fd16e820bf
tde_add_library: Add the ability to link libraries as private.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d504c98bb7)
5 years ago
Slávek Banko e28a7be8ab
Move templates to a separate directory and rename to the tde_ prefix.
Create the TDE_CMAKE_ROOT and TDE_CMAKE_TEMPLATES variables.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 2a847be412)
5 years ago
Slávek Banko aa52709a28
tde_create_translated_desktop: For working files in a binary directory,
use the relative path according to the source directory instead of the
base file names. This will prevent potential base file name collisions
and allow the creation of common rules.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit c3b52f0e80)
5 years ago
Slávek Banko b3a51ff373
Update TDEL10n module
+ Add *.theme and eventsrc to files known as desktop style.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 55cdb3a75e)
5 years ago
Slávek Banko 5d7886e19b
tde_create_dcop_kidl: Use dcopildng as the default instead of dcopidl.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e4b370839f)
5 years ago
Slávek Banko 857d5da6c5
Update TDEL10n module
+ Add --from-code=UTF-8 to xgettext call.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f5b58cdd21)
5 years ago
Slávek Banko 954af801d5
FindTDE: Conditional import of exported tdelibs targets.
This prevents multiple attempts to import exported tdelibs targets,
which would cause a collision if find_package( TDE ) is called
repeatedly for some reason.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e51ecbd591)
5 years ago
Slávek Banko e3088bed3c
tde_create_handbook: Add an optional SOURCE_BASEDIR argument.
Using the optional SOURCE_BASEDIR argument, it is possible to use
tde_create_handbook in CMakeLists.txt from a folder other than the
folder containing the documentation itself.

This will allow the creation of common rules for generating documentation
for all languages that are currently available, without the need to
create CMakeLists.txt in the directory of each individual language.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f7a3d5c3e2)
5 years ago
Slávek Banko b303fed508
tde_create_translated_desktop: Use output name only during installation.
In the cmake binary directory, the name of the working file must
be used according to the source file to avoid possible collisions
if the source directory contains multiple desktop files installed
as a ".directory" file in multiple destination directories.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 3b6509cacf)
5 years ago
Slávek Banko 2756f9fab6
tde_create_translated_desktop: Force the use of intltool-merge.
Because some of our desktop files contain underscores in variable
names (for example eventsrc), which is not an allowed character
for names of entries in desktop style files, we can't use msgfmt,
so we need intltool-merge.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 34e3154c44)
5 years ago
Slávek Banko 98b2d6cbdc
Update TDEL10n module
+ Fix comment replacement and flag addition for _translatorinfo.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f6f7bfc007)
5 years ago
Slávek Banko d9fc349162
Add caching of variables from checks results and add conditions
to avoid unnecessary repetition of checks.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 778522d104)
5 years ago
Slávek Banko dfbf5fa376
Update TDEL10n module
+ For _translatorinfo strings, replace the references
  to an intentionally non-existent source file and use
  instead comments explaining the purpose of these strings.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4ced9fd928)
5 years ago
Slávek Banko 9ca5274ccb
Replace the remaining KDE3 macros.
+ Targets are created to generate files, not just commands.
+ Generating kidl files is created as a separate targets.
+ Headers are added to the list of generated files.
+ This allows for more accurate dependency determination.
+ This prevents files generation from being repeated.
+ This prevents the occasional FTBFS during a parallel build.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 5cd16d6fb9)
5 years ago
Slávek Banko cc6a5a29b4
tde_create_translated_desktop: Allow spaces around the equal sign.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e8a95f169e)
5 years ago
Slávek Banko 472254305d
tde_create_handbook: Improve build message.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 9138b8f339)
5 years ago
Slávek Banko 9c9c7f29db
Create symlink for base soname for libraries with release number in the name
as a separate target instead of POST_BUILD command. This prevents the
command from being executed multiple times and thus FTBFS.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e22f5ace4a)
5 years ago
Slávek Banko 3a661f4737
Avoid storing "_version-NOTFOUND" in ELF metadata.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 184d1c2a4d)
5 years ago
Slávek Banko fc3b20eb18
tde_read_src_metadata: Typo correction.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 3d16bad245)
5 years ago
Slávek Banko dbef499b21
tde_create_translated_desktop: Use full name for target.
This solves the case where the desktop file name is not unique
throughout the project.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit fd7d9c535e)
5 years ago
Slávek Banko ada3f01f8d
tde_create_translated_desktop: Cleaning the LINGUAS file
that is generated for merging desktop file translations
will not be performed as a POST BUILD command, but as a
separate target.

This solves premature file deletion if multiple desktop
files use a common translation folder.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 7183c21e08)
5 years ago
Slávek Banko 8e691f890e
tde_create_tarball: Add options to ensure reproducibility.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 6574bc5ae9)
5 years ago
Slávek Banko 3d90cd2d6e
Update TDEL10n module
+ Simplify entering a catalog name for placement in a directory of the same name.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 1f4d4093ad)
5 years ago
Slávek Banko 6884ec954f
Update TDEL10n module
+ Add a function to prepare for extracting strings from desktop files.
-- xgettext creates an incorrect reference to the source file line
-- xgettext does not allow the keyword to be used as a comment

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f07fe12daf)
5 years ago
Slávek Banko 0d52d83696
Add support for creation of translated desktop files during build.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit c6b47aacd5)
5 years ago
Slávek Banko a86292d71a
Update TDEL10n module
+ Pick *.directory, *.kcsrc and *.themerc files as desktop style files.
+ Add the ability to specify source files explicitly as desktop style.
+ Override default keywords for desktop style files to exclude Icon.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit aa852adcd2)
5 years ago
Slávek Banko c838406b19
Use the source package date or the source git repository date
instead of the current build date. The use of a stable date
is necessary to achieve reproducible builds.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 589e29d020)
5 years ago
Slávek Banko 70ee060ff7
Add support for embedding libraries when building on SunOS.
Based on the work of Denis Kozadaev on DilOS.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit ad602fcd91)
5 years ago
Slávek Banko 5f81a57938
Remove -fvisibility-inlines-hidden from CMAKE_C_FLAGS
because this is only valid for C++.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8668335711)
5 years ago
Slávek Banko 26ef5dbcaf
Update TDEL10n module
+ Add new options to function tde_l10n_prepare_xml
-- preserve / remove multiple line breaks
-- this fix the extraction from tips files

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 5121b9a41d)
6 years ago
Slávek Banko d5ad455414
Use cache for TQt executables paths.
This allows these values to be pre-defined
- for example, to optimize cross-build.

This resolves issue #28.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 74654feb3b)
6 years ago
Slávek Banko 121d2a0e72
Update tde_add_check_executable macro
+ Add support for test arguments.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8aa2f7199e)
6 years ago
Slávek Banko 754594e16e
Fix installation of base soname for libraries with release number in the name.
This resolves regression from prior commit.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit ab096402b3)
6 years ago
Slávek Banko 7d465f8f02
Add a function that determines the filename of the library
for the target. This replaces get_target_property( LOCATION )
that is deprecated due to CMP0026.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 0a40752779)
6 years ago
Slávek Banko 84071b3095
Update tde_setup_gcc_visibility macro
+ In the test include kdemacros.h with detected full path to avoid FTBFS.
+ Do not test gcc visibility on TDE unless the current module uses TDE.
+ Do not test gcc visibility on TQt unless the current module uses TQt.
+ Improve test for gcc visibility on TQt to make it more accurate.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f8254e1561)
6 years ago
Slávek Banko c07c746718
Update tde_setup_dbus macro
+ Old versions of dbus do not include a definition for system_bus_services_dir.
+ The value for system_bus_services_dir is derived from session_bus_services_dir.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d02522eda1)
6 years ago
Slávek Banko 310fec7a51
Add tde_setup_dbus macro.
This resolves issue #20.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit ac342e63c6)
6 years ago
Slávek Banko 28fed6ab1a
Add tde_setup_largefiles macro.
The macro sets the necessary definitions so that the default libc
filesystem interface will be for large files on all architectures.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8d8c763683)
6 years ago
Slávek Banko 41ea631198
Use tde_setup_msgfmt in tde_create_translation if needed.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4512d95ca6)
6 years ago
Slávek Banko 2eca8d0a10
Add tde_setup_msgfmt macro.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 6c8bd13328)
6 years ago
Slávek Banko 14520c762c
Add tde_setup_gcc_visibility macro.
For the GCC visibility setting, a test is performed
whether the system is UNIX-type and also whether TQt
and tdelibs are built with GCC visibility support.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit b034c47597)
6 years ago
Slávek Banko 05ed76c79d
Update TDEL10n module
+ Use IS_ABSOLUTE ${file} instead of ${file} MATCHES "^/".

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8a3bf7134b)
6 years ago
Slávek Banko f43bab5f15
Update tde_create_tarball macro
+ Use external tar for ensure files owner in tarball.
+ Add an option to specify compression program.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit d9d9396324)
6 years ago
Slávek Banko d3232e0c86
Fix tde_create_tarball macro
+ The destination path for the installation was not properly used.
+ Dependency on source files was wrong when SOURCEDIR was used.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit ea81c7295c)
6 years ago
Slávek Banko 34a74a33cf
Update TDEL10n module
+ Add ability to skip the contents of selected <property> tags.
+ Fixed incorrect processing of the unpaired tags.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 5c09613711)
6 years ago
Slávek Banko b18d54755e
Add tde_create_tarball macro.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 6f9d42cd99)
6 years ago
Slávek Banko 7d2860cb2e
Update TDEL10n module
+ Add ability to specify a template with strings that should not be extracted.
+ Fixed detection of required programs.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 6246f2b46a)
6 years ago
Slávek Banko e121001521
Update TDEL10n module
+ Added ability to extract strings from documentation.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 99d63e8212)
6 years ago
Slávek Banko 69a0ed7650
Update TDEL10n module
+ Use excludes also on files for extracting attributes.
+ Add ability to extract multiple attributes for one source_spec.
+ Add function to prepare attributes from XML files for xgettext.
+ Use tde_l10n_prepare_xmlattr function instead of extractattr script.
+ Handle working files for multiple extractions from the same source file.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit a1f62e6239)
6 years ago
Slávek Banko 29fdccdcce
Update TDEL10n module
+ Add option to determine comments to extract.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit fb7e1dfc82)
6 years ago