fix last merge - highlight support

[roobuilder] / meson.build

diff --git a/meson.build b/meson.build
index 0d27704..c5d929a 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -24,11 +24,12 @@ deps = [
    dependency('json-glib-1.0'),
    dependency('gobject-introspection-1.0'),
    dependency('libvala-0.56'),
-   dependency('libadwaita-1'),
    dependency('libxml-2.0'),
    valac.find_library('posix'),
-   dependency('roojspacker-1.4'),
    dependency('gtksourceview-5'),
+   dependency('libgda-5.0'),
+   dependency('jsonrpc-glib-1.0'),
+   dependency('gio-unix-2.0'),
 
 ]
  
@@ -42,7 +43,43 @@ conf.set('PROJECT_NAME', meson.project_name())
 
 add_project_arguments(['--vapidir',  meson.current_source_dir() / 'src/vapi'], language: 'vala')
 
- 
+
+
+install_data(
+       'pixmaps/16x16/apps/roobuilder.png',
+       install_dir:  get_option('datadir') + '/icons/hicolor/16x16/apps/'
+)
+
+install_data(
+       'pixmaps/22x22/apps/roobuilder.png',
+       install_dir:  get_option('datadir') + '/icons/hicolor/22x22/apps/'
+)
+
+install_data(
+       'pixmaps/24x24/apps/roobuilder.png',
+       install_dir:  get_option('datadir') + '/icons/hicolor/24x24/apps/'
+)
+
+install_data(
+       'pixmaps/32x32/apps/roobuilder.png',
+       install_dir:  get_option('datadir') + '/icons/hicolor/32x32/apps/'
+)
+
+install_data(
+       'pixmaps/48x48/apps/roobuilder.png',
+       install_dir:  get_option('datadir') + '/icons/hicolor/48x48/apps/'
+)
+
+gnome = import('gnome')
+gnome.post_install(gtk_update_icon_cache : true)
+
+
+
+install_data(
+       'roobuilder.desktop',
+       install_dir : get_option('datadir') + '/applications/'
+)
+
 
 roobuilder_src = files([
    'src/Builder4/About.vala',
@@ -68,37 +105,6 @@ roobuilder_src = files([
    'src/Builder4/WindowState.vala',
    'src/Palete/GirObject.vala',
    'src/Palete/Gir.vala',
-   'src/codegen/valaccodearraymodule.vala',
-   'src/codegen/valaccodeassignmentmodule.vala',
-   'src/codegen/valaccodeattribute.vala',
-   'src/codegen/valaccodebasemodule.vala',
-   'src/codegen/valaccodecompiler.vala',
-   'src/codegen/valaccodecontrolflowmodule.vala',
-   'src/codegen/valaccodedelegatemodule.vala',
-   'src/codegen/valaccodememberaccessmodule.vala',
-   'src/codegen/valaccodemethodcallmodule.vala',
-   'src/codegen/valaccodemethodmodule.vala',
-   'src/codegen/valaccodestructmodule.vala',
-   'src/codegen/valaccode.vala',
-   'src/codegen/valaclassregisterfunction.vala',
-   'src/codegen/valactype.vala',
-   'src/codegen/valaenumregisterfunction.vala',
-   'src/codegen/valagasyncmodule.vala',
-   'src/codegen/valagdbusclientmodule.vala',
-   'src/codegen/valagdbusservermodule.vala',
-   'src/codegen/valagdbusmodule.vala',
-   'src/codegen/valagerrormodule.vala',
-   'src/codegen/valagirwriter.vala',
-   'src/codegen/valaglibvalue.vala',
-   'src/codegen/valagobjectmodule.vala',
-   'src/codegen/valagsignalmodule.vala',
-   'src/codegen/valagtkmodule.vala',
-   'src/codegen/valagtypemodule.vala',
-   'src/codegen/valagvaluemodule.vala',
-   'src/codegen/valagvariantmodule.vala',
-   'src/codegen/valainterfaceregisterfunction.vala',
-   'src/codegen/valastructregisterfunction.vala',
-   'src/codegen/valatyperegisterfunction.vala',
    'src/JsRender/Dir.vala',
    'src/JsRender/Gtk.vala',
    'src/JsRender/JsonGen.vala',
@@ -116,68 +122,10 @@ roobuilder_src = files([
    'src/Palete/Gtk.vala',
    'src/Palete/Palete.vala',
    'src/Palete/Roo.vala',
-   'src/Palete/ValaSourceCompiler.vala',
-   'src/Palete/ValaSource.vala',
    'src/Palete/VapiParser.vala',
    'src/Builder4/WindowLeftTree.vala',
    'src/Builder4/PopoverAddProp.vala',
    'src/Builder4/PopoverFileDetails.vala',
-   'src/ccode/valaccode.vala',
-   'src/ccode/valaccodeassignment.vala',
-   'src/ccode/valaccodebinaryexpression.vala',
-   'src/ccode/valaccodeblock.vala',
-   'src/ccode/valaccodebreakstatement.vala',
-   'src/ccode/valaccodecasestatement.vala',
-   'src/ccode/valaccodecastexpression.vala',
-   'src/ccode/valaccodecommaexpression.vala',
-   'src/ccode/valaccodecomment.vala',
-   'src/ccode/valaccodeconditionalexpression.vala',
-   'src/ccode/valaccodeconstant.vala',
-   'src/ccode/valaccodeconstantidentifier.vala',
-   'src/ccode/valaccodecontinuestatement.vala',
-   'src/ccode/valaccodedeclaration.vala',
-   'src/ccode/valaccodedeclarator.vala',
-   'src/ccode/valaccodedefine.vala',
-   'src/ccode/valaccodedostatement.vala',
-   'src/ccode/valaccodeelementaccess.vala',
-   'src/ccode/valaccodeemptystatement.vala',
-   'src/ccode/valaccodeenum.vala',
-   'src/ccode/valaccodeenumvalue.vala',
-   'src/ccode/valaccodeexpression.vala',
-   'src/ccode/valaccodeexpressionstatement.vala',
-   'src/ccode/valaccodefile.vala',
-   'src/ccode/valaccodeforstatement.vala',
-   'src/ccode/valaccodefragment.vala',
-   'src/ccode/valaccodefunction.vala',
-   'src/ccode/valaccodefunctioncall.vala',
-   'src/ccode/valaccodefunctiondeclarator.vala',
-   'src/ccode/valaccodeggnucsection.vala',
-   'src/ccode/valaccodegotostatement.vala',
-   'src/ccode/valaccodeidentifier.vala',
-   'src/ccode/valaccodeifsection.vala',
-   'src/ccode/valaccodeifstatement.vala',
-   'src/ccode/valaccodeincludedirective.vala',
-   'src/ccode/valaccodeinitializerlist.vala',
-   'src/ccode/valaccodeinvalidexpression.vala',
-   'src/ccode/valaccodelabel.vala',
-   'src/ccode/valaccodelinedirective.vala',
-   'src/ccode/valaccodemacroreplacement.vala',
-   'src/ccode/valaccodememberaccess.vala',
-   'src/ccode/valaccodemodifiers.vala',
-   'src/ccode/valaccodenewline.vala',
-   'src/ccode/valaccodenode.vala',
-   'src/ccode/valaccodeoncesection.vala',
-   'src/ccode/valaccodeparameter.vala',
-   'src/ccode/valaccodeparenthesizedexpression.vala',
-   'src/ccode/valaccodereturnstatement.vala',
-   'src/ccode/valaccodestatement.vala',
-   'src/ccode/valaccodestruct.vala',
-   'src/ccode/valaccodeswitchstatement.vala',
-   'src/ccode/valaccodetypedefinition.vala',
-   'src/ccode/valaccodeunaryexpression.vala',
-   'src/ccode/valaccodevariabledeclarator.vala',
-   'src/ccode/valaccodewhilestatement.vala',
-   'src/ccode/valaccodewriter.vala',
    'src/Project/GtkValaSettings.vala',
    'src/Project/Project.vala',
    'src/Project/Gtk.vala',
@@ -187,10 +135,18 @@ roobuilder_src = files([
    'src/Resources.vala',
    'src/Spawn.vala',
    'src/Application.vala',
-   'src/Palete/ValaCompileRequest.vala',
-   'src/Palete/ValaCompileQueue.vala',
    'src/Palete/Javascript.vala',
    'src/Project/Meson.vala',
+   'src/Palete/RooDatabase.vala',
+   'src/Palete/LanguageClient.vala',
+   'src/Palete/LanguageClientVala.vala',
+   'src/Palete/LanguageClientJavascript.vala',
+   'src/Lsp.vala',
+   'src/Palete/LanguageClientDummy.vala',
+   'src/Palete/ValaCompileRequest.vala',
+   'src/JsRender/NodeWriter.vala',
+   'src/JsRender/NodeToValaExtended.vala',
+   'src/JsRender/NodeToValaWrapped.vala',
 ])
 
 roobuilder = executable('roobuilder',