Compare commits

..

No commits in common. "c9795fe01adfdbca2b3c8a551009f97ae4695409" and "e80c8b5d86ab96bf231cdf5616a1f7d601e0c208" have entirely different histories.

11 changed files with 9 additions and 46 deletions

2
.gitignore vendored
View File

@ -7,5 +7,3 @@
/wdmtg.files /wdmtg.files
/wdmtg.creator* /wdmtg.creator*
/wdmtg.includes /wdmtg.includes
/wdmtg.cflags
/wdmtg.cxxflags

View File

@ -63,8 +63,8 @@ install (TARGETS ${PROJECT_NAME} DESTINATION bin)
# CPack # CPack
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Activity tracker") set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Activity tracker")
set (CPACK_PACKAGE_VENDOR "Premysl Eric Janouch") set (CPACK_PACKAGE_VENDOR "Přemysl Janouch")
set (CPACK_PACKAGE_CONTACT "Přemysl Eric Janouch <p@janouch.name>") set (CPACK_PACKAGE_CONTACT "Přemysl Janouch <p@janouch.name>")
set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
set (CPACK_PACKAGE_VERSION ${project_VERSION}) set (CPACK_PACKAGE_VERSION ${project_VERSION})
set (CPACK_GENERATOR "TGZ;ZIP") set (CPACK_GENERATOR "TGZ;ZIP")

View File

@ -1,4 +1,4 @@
Copyright (c) 2016 - 2020, Přemysl Eric Janouch <p@janouch.name> Copyright (c) 2016, Přemysl Janouch <p@janouch.name>
Permission to use, copy, modify, and/or distribute this software for any Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted. purpose with or without fee is hereby granted.

View File

@ -6,7 +6,7 @@
# VALA_VERSION # VALA_VERSION
#============================================================================= #=============================================================================
# Copyright (c) 2011, 2016, Přemysl Eric Janouch <p@janouch.name> # Copyright (c) 2011, 2016, Přemysl Janouch <p@janouch.name>
# #
# Permission to use, copy, modify, and/or distribute this software for any # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted. # purpose with or without fee is hereby granted.

View File

@ -14,7 +14,7 @@
# #
#============================================================================= #=============================================================================
# Copyright (c) 2011, 2016, Přemysl Eric Janouch <p@janouch.name> # Copyright (c) 2011, 2016, Přemysl Janouch <p@janouch.name>
# #
# Permission to use, copy, modify, and/or distribute this software for any # Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted. # purpose with or without fee is hereby granted.

View File

@ -1,8 +1,8 @@
[CCode (cprefix = "", lower_case_cprefix = "")] [CCode (cprefix = "", lower_case_cprefix = "")]
namespace Config namespace Config
{ {
public const string PROJECT_NAME = "@CMAKE_PROJECT_NAME@"; public const string PROJECT_NAME = "${CMAKE_PROJECT_NAME}";
public const string PROJECT_VERSION = "@project_VERSION@"; public const string PROJECT_VERSION = "${project_VERSION}";
public const string SHARE_DIR = "@project_SHARE_DIR@"; public const string SHARE_DIR = "@project_SHARE_DIR@";
} }

View File

@ -1,33 +0,0 @@
project('wdmtg', 'vala', 'c', default_options : ['c_std=gnu99'],
version : '0.1.0')
add_project_arguments(['--vapidir', meson.current_source_dir()],
language: 'vala')
conf = configuration_data()
conf.set('CMAKE_PROJECT_NAME', meson.project_name())
conf.set('project_VERSION', meson.project_version())
configure_file(
input : 'config.vala.in',
output : 'config.vala',
configuration : conf,
)
dependencies = [
dependency('gtk+-3.0'),
dependency('gmodule-2.0'),
dependency('gio-2.0'),
dependency('gee-0.8'),
dependency('sqlite3'),
dependency('x11'),
# Ours
dependency('xext'),
dependency('xextproto'),
]
sources = files(
'wdmtg.vala',
meson.current_build_dir() / 'config.vala',
)
executable('wdmtg', sources,
install : true,
dependencies : dependencies)

View File

@ -1,7 +1,7 @@
// //
// wdmtg.vala: activity tracker // wdmtg.vala: activity tracker
// //
// Copyright (c) 2016 - 2020, Přemysl Eric Janouch <p@janouch.name> // Copyright (c) 2016, Přemysl Janouch <p@janouch.name>
// //
// Permission to use, copy, modify, and/or distribute this software for any // Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted. // purpose with or without fee is hereby granted.

View File

@ -1 +0,0 @@
x11

View File

@ -1,7 +1,7 @@
// //
// xext.vapi: various extensions to the x11 vapi // xext.vapi: various extensions to the x11 vapi
// //
// Copyright (c) 2016 - 2020, Přemysl Eric Janouch <p.janouch@gmail.com> // Copyright (c) 2016, Přemysl Janouch <p.janouch@gmail.com>
// //
// Permission to use, copy, modify, and/or distribute this software for any // Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted. // purpose with or without fee is hereby granted.

View File

@ -1 +0,0 @@
// https://github.com/mesonbuild/meson/issues/1195