Commit Graph

202 Commits (15a7e4670a8f580545c95e14101f852c9d947998)
 

Author SHA1 Message Date
Slávek Banko 15a7e4670a
Add a global option to force colored output from compiler.
Taken from https://medium.com/@alasher/colored-c-compiler-output-with-ninja-clang-gcc-10bfe7f2b949

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 0459cbaf3e)
4 years ago
Slávek Banko 4397680ce9
tde_create_tarball: SOURCEDIR can be specified as relative.
If the list of files is obtained internally in a macro,
it will be sorted. This prevents unexpected order of files
- improves certainty for reproducible builds.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit fb4f389731)
4 years ago
Slávek Banko cd66012f18
tde_create_translated_desktop: Allow generating a translated desktop
file that will not be installed directly.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 63b5532a29)
5 years ago
Slávek Banko 31a11575ca
tde_create_translated_desktop: Fix CMP0054 warning in case of special
desktop file name that could be the same as the keyword.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 9f86304bdd)
5 years ago
Slávek Banko 80ab8717cc
tde_create_translated_desktop: Fix processing when using configure_file.
Although the processing with configure_file was done properly,
the original source file was used instead of the processed one
to merge the translations.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 3bbc0e4d62)
5 years ago
Slávek Banko 47e0e2b4ab
tde_create_translated_desktop: Add the ability to process multiple source
files to be installed in the same destination folder.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 7592371d26)
5 years ago
Slávek Banko 05e7242b4e
tde_create_translated_desktop: PO_DIR can be specified as relative.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 1baa4cbbd1)
5 years ago
Slávek Banko b69bc31c49
tde_create_translated_desktop: Process the source file using configure_file
if it has a ".cmake" extension.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 690e7a7ec3)
5 years ago
Slávek Banko a01b484d37
tde_create_translated_desktop: Add the ability to call for the same source
file installed in another location.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 8d4479fbcc)
5 years ago
aneejit1 95f07c5d48
Remove use of LINGUAS file to prevent writes to the source directory
This is for the resolution of bug 3133

Signed-off-by: aneejit1 <aneejit1@gmail.com>
(cherry picked from commit 8cf356884f)
5 years ago
Slávek Banko da63fb4ac7
Remove adding dependencies that were previously needed
to build tdelibs as such.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 1254cb9250)
5 years ago
Slávek Banko a39c6e4f8e
Fix FTBS if CMAKE_BUILD_TYPE is not set.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4d52ea2c67)
5 years ago
Slávek Banko dca5663488
Set the LINK_INTERFACE_LIBRARIES and INTERFACE_LINK_LIBRARIES
properties not only for the default, but also for the specific
build type.

This resolve FTBFS when using private linking if the build is
of type Debug.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e769cc0003)
5 years ago
Slávek Banko f639188b4d
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 be1fee9567
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 5715cbbaba
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 2bd725d956
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 76b9e6c8e1
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 0af47d3441
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 242e41b0dd
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 350a4291ce
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 cc66475995
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 81c6a60fac
Write metadata to libraries and executables using the post-build command,
except when building tdelibs, where a separate target will be used and
writing metadata will be the last step.

This also resolve TDE/tdelibs#80.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 374fcabb18)
5 years ago
Slávek Banko 74122e5d1f
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 6351298434
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 083913c406
Write metadata to libraries and binaries as a last step.
This prevents concurrency of writing metadata and linking
with other libraries, which could cause FTBFS.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e72aabadf5)
5 years ago
Slávek Banko e2a19928ed
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 5aa76deb8f
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 94d67073e5
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 6b58614fc4
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 51ace81f20
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 ca47fa8330
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 66dda475f9
Store ELF metadata as a separate target instead of the POST_BUILD command.
This allows naturally storing ELF metadata also in tdelibs.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 48b1e42b64)
5 years ago
Slávek Banko 61682145da
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 7363ed42ff
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 23558fd690
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 89b5f26297
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 f0659a0437
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 ca613e7db0
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 e4ea4fb5f0
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 152ea86f76
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 e0f71ec8c7
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 e4232ffcdf
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 b3510baa2d
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 c51d14850f
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 6853feb760
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 47eede594a
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 0bf16de005
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 cfc1242197
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 177a2281dd
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