Commit bcb84d25 authored by Sergio Costas's avatar Sergio Costas

Updated to new autovala version

parent bbc91353
......@@ -54,6 +54,7 @@ add_subdirectory(po)
add_subdirectory(data/local)
add_subdirectory(terminus_gnome_shell)
add_subdirectory(data)
add_subdirectory(data/dbus)
add_subdirectory(src/vapidir)
add_subdirectory(data/icons)
add_subdirectory(data/interface)
......
meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),join_paths(get_option('prefix'),'share/autovala/cmake'),join_paths(meson.current_source_dir(),'data/cmake',''))
### CMakeLists automatically created with AutoVala
### Do not edit
SET(DBUS_PREFIX ${CMAKE_INSTALL_PREFIX})
EXECUTE_PROCESS( COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-source --target=${CMAKE_CURRENT_BINARY_DIR}/extras.gresource.xml.c ${CMAKE_CURRENT_SOURCE_DIR}/extras.gresource.xml)
EXECUTE_PROCESS( COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-header --target=${CMAKE_CURRENT_BINARY_DIR}/extras.gresource.xml.h ${CMAKE_CURRENT_SOURCE_DIR}/extras.gresource.xml)
ADD_CUSTOM_COMMAND (
......@@ -22,7 +21,5 @@ if( NOT ( ${CMAKE_INSTALL_PREFIX} MATCHES "^/home/" ) )
else()
MESSAGE(STATUS "Autostart file data/terminus_autorun.desktop will not be installed. You must create your own .desktop file and put it at ~/.config/autostart")
endif()
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/com.rastersoft.terminus.service.base ${CMAKE_CURRENT_BINARY_DIR}/com.rastersoft.terminus.service)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.rastersoft.terminus.service DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services/)
include(GSettings)
add_schema(org.rastersoft.terminus.gschema.xml)
### CMakeLists automatically created with AutoVala
### Do not edit
SET(DBUS_PREFIX ${CMAKE_INSTALL_PREFIX})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/com.rastersoft.terminus.service.base ${CMAKE_CURRENT_BINARY_DIR}/com.rastersoft.terminus.service)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.rastersoft.terminus.service DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services/)
project('terminus',['c','vala'])
GTK_3_20 = (get_option('GTK_3_20') != '')
add_global_arguments('-DGETTEXT_PACKAGE="terminus"',language: 'c')
gdk_3_0_dep = dependency('gdk-3.0')
gtk_3_0_dep = dependency('gtk+-3.0')
gee_0_8_dep = dependency('gee-0.8')
gio_2_0_dep = dependency('gio-2.0')
glib_2_0_dep = dependency('glib-2.0')
gobject_2_0_dep = dependency('gobject-2.0')
keybinder_3_0_dep = dependency('keybinder-3.0')
vte_2_91_dep = dependency('vte-2.91')
subdir('po')
cfg_dbus_data = configuration_data()
cfg_dbus_data.set ('DBUS_PREFIX',get_option('prefix'))
meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),join_paths(get_option('prefix'),'share/gnome-shell/extensions/showTerminusQuakeWindow@rastersoft.com'),join_paths(meson.current_source_dir(),'terminus_gnome_shell','extension.js'))
meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),join_paths(get_option('prefix'),'share/gnome-shell/extensions/showTerminusQuakeWindow@rastersoft.com'),join_paths(meson.current_source_dir(),'terminus_gnome_shell','metadata.json'))
extras_gresource_xml_generator = generator(find_program('glib-compile-resources'), arguments: [ '--sourcedir=@SOURCE_DIR@/data' , '--generate-source', '--target=@BUILD_DIR@/extras.gresource.xml.c', '@INPUT@'], output: '@PLAINNAME@.c')
extras_gresource_xml_file_c = extras_gresource_xml_generator.process(['data/extras.gresource.xml'])
meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),join_paths(get_option('prefix'),get_option('datadir'),'terminus'),join_paths(meson.current_source_dir(),'data/local','','*'))
meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),join_paths(get_option('prefix'),get_option('datadir'),'doc'),join_paths(meson.current_source_dir(),'doc','','*'))
installfile_1 = files('data/terminus_showhide.sh')
install_data(installfile_1, install_dir: get_option('bindir'))
install_data('data/terminus.desktop',install_dir:join_paths(get_option('prefix'),get_option('datadir'),'applications'))
if (get_option('prefix').startswith('/home/'))
message('Autostart file data/terminus_autorun.desktop will not be installed. You must create your own .desktop file and put it at ~/.config/autostart')
else
install_data('data/terminus_autorun.desktop',install_dir: '/etc/xdg/autostart')
endif
dbus_cfg_com_rastersoft_terminus_service_base = configure_file(input: 'data/dbus/com.rastersoft.terminus.service.base',output: 'com.rastersoft.terminus.service', configuration: cfg_dbus_data)
install_data(dbus_cfg_com_rastersoft_terminus_service_base,install_dir: join_paths(get_option('prefix'),get_option('datadir'),'dbus-1','services'))
install_data('data/org.rastersoft.terminus.gschema.xml', install_dir: join_paths(get_option('prefix'),get_option('datadir'), 'glib-2.0', 'schemas'))
meson.add_install_script('meson_scripts/install_schemas.py')
install_data('data/icons/terminus.svg',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/scalable/apps'))
subdir('src')
option('GTK_3_20',type : 'string', value: '')
#!/bin/sh
mkdir -p $DESTDIR/$1
if [[ -d $2 ]]; then
cp -a $2/* $DESTDIR/$1
else
cp -a $2 $DESTDIR/$1
fi
#!/usr/bin/env python3
import os
import subprocess
schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas')
if not os.environ.get('DESTDIR'):
print('Compiling gsettings schemas...')
subprocess.call(['glib-compile-schemas', schemadir])
\ No newline at end of file
i18n = import('i18n')
i18n.gettext('terminus', languages: ['es'])
......@@ -72,7 +72,8 @@ set (VALA_C ${VALA_C} checkwayland.c)
SET (VALA_C ${VALA_C} ${extras_gresource_xml_C_FILE})
add_executable(terminus ${VALA_C})
add_dependencies (terminus extras_gresource_xml)
set ( terminus_DEPENDENCIES ${terminus_DEPENDENCIES} extras_gresource_xml )
add_dependencies( terminus ${terminus_DEPENDENCIES} )
install(TARGETS
......
namespace Constants {
public const string DATADIR = "@DATADIR@";
public const string PKGDATADIR = "@PKGDATADIR@";
public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
public const string RELEASE_NAME = "@RELEASE_NAME@";
public const string VERSION = "@VERSION@";
#if UNITEST
public const string TESTSRCDIR = "@TESTSRCDIR@";
#endif
}
cfg_terminus = configuration_data()
cfg_terminus.set('DATADIR', join_paths(get_option('prefix'),get_option('datadir')))
cfg_terminus.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'),'terminus'))
cfg_terminus.set('GETTEXT_PACKAGE', 'terminus')
cfg_terminus.set('RELEASE_NAME', 'terminus')
cfg_terminus.set('PREFIX', get_option('prefix'))
cfg_terminus.set('VERSION', '0.9.1')
cfg_terminus.set('TESTSRCDIR', meson.source_root())
cfgfile_2 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_terminus)
terminus_deps = [gdk_3_0_dep]
terminus_deps += [gtk_3_0_dep]
terminus_deps += [gee_0_8_dep]
terminus_deps += [gio_2_0_dep]
terminus_deps += [glib_2_0_dep]
terminus_deps += [gobject_2_0_dep]
terminus_deps += [keybinder_3_0_dep]
terminus_deps += [vte_2_91_dep]
terminus_sources = [cfgfile_2]
terminus_sources += ['PanedPercentage.vala']
terminus_sources += ['base.vala']
terminus_sources += ['bindkeys.vala']
terminus_sources += ['container.vala']
terminus_sources += ['notetab.vala']
terminus_sources += ['settings.vala']
terminus_sources += ['terminal.vala']
terminus_sources += ['terminus.vala']
terminus_sources += ['window.vala']
terminus_sources += ['checkwayland.c']
terminus_sources += [extras_gresource_xml_file_c]
terminus_sources += [join_paths(meson.source_root(),'checkwayland.vapi')]
terminus_vala_args = ['--pkg','posix']
terminus_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapidir')]
terminus_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/extras.gresource.xml')]
terminus_c_args = []
if GTK_3_20
terminus_vala_args += ['-D', 'GTK_3_20']
terminus_c_args += ['-DGTK_3_20']
endif
executable('terminus',terminus_sources,dependencies: terminus_deps,vala_args: terminus_vala_args,c_args: terminus_c_args,install: true)
### AutoVala Project ###
autovala_version: 24
autovala_version: 26
project_name: terminus
vala_version: 0.30
......@@ -61,7 +61,7 @@ vala_check_package: gtk+-3.0
*autostart: data/terminus_autorun.desktop
*dbus_service: data/com.rastersoft.terminus.service.base
*dbus_service: data/dbus/com.rastersoft.terminus.service.base
*scheme: data/org.rastersoft.terminus.gschema.xml
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment