Commit 152728de authored by Daniel Espinosa Ortiz's avatar Daniel Espinosa Ortiz

Merge branch 'pavlosun/libgda-wip/miscfix'

parents 79ba4b50 609e1cac
......@@ -127,7 +127,7 @@ meson_build:
script:
- export PGPASSWORD=$POSTGRES_PASSWORD
- psql -h "postgres" -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c "SELECT 'OK' AS status;"
- meson _build --prefix=/usr -Denable-ci-environment=true -Denable-debug=true -Denable-gtk-doc=true
- meson _build --prefix=/usr -Denable-debug=true -Denable-gtk-doc=true
- cd _build
- ninja
- broadwayd &
......@@ -168,4 +168,4 @@ pages:
- mv doc/C/libgdaui/html public/C/libgdaui-6.0
artifacts:
paths:
- public
- public
\ No newline at end of file
#include <glib.h>
gint main (void) {
GDateTime *dt = g_date_time_new_now_utc ();
g_print (g_date_time_format (dt, "%F"));
}
......@@ -22,7 +22,7 @@ project_api_name = '"' + meson.project_name() + '-' + project_api_version + '"'
project_package = meson.project_name() + '-' + project_api_version
gda_current = '5'
gda_revision ='1'
gda_revision ='91'
gda_age = '1'
compiler = meson.get_compiler('c')
......
......@@ -14,7 +14,6 @@ option('system-sqlite', type : 'boolean', value : true, description : 'Use SQLit
option('with-examples', type : 'boolean', value : false, description : 'Compile examples [default=false')
option('system-sqlcipher', type : 'boolean', value : true, description : 'Use SQLCipher installed on the system [default=false')
option('enable-tools', type : 'boolean', value : false, description : 'Enable build GUI Tools')
option('enable-ci-environment', type : 'boolean', value : false, description : 'Enable Continous Integration Environment test')
option('glade-catalog-dir', type : 'string', value : '', description : 'Use the given directory to install glade catalog files. If glade is not available this option is ignored. If it is not given the valaue from pkg-config will be used')
option('glade-pixmap-dir', type : 'string', value : '', description : 'Use the given directory to install glade pixmap files. If glade is not available this option is ignored. If it is not given the valaue from pkg-config will be used')
option('enable-gtk-doc', type : 'boolean', value : false, description : 'Enable documentation generation [default = false]')
......
......@@ -159,8 +159,7 @@ tcpg = executable('check-db-catalog-postgresql',
'-include',
meson.build_root() + '/config.h',
'-DCHECK_FILES="'+meson.source_root()+'"',
'-DTOP_BUILD_DIR="'+meson.build_root()+'"',
ci_args
'-DTOP_BUILD_DIR="'+meson.build_root()+'"'
],
link_with: libgda,
dependencies: [
......
ci_args = []
if get_option('enable-ci-environment')
ci_args += [
'-DCI_ENVIRONMENT'
]
endif
test_headers = files([
'raw-ddl-creator.h'
])
......@@ -293,4 +284,4 @@ subdir('value-holders')
subdir('db')
if enable_ui
subdir('ui')
endif
\ No newline at end of file
endif
......@@ -56,7 +56,6 @@ tchkmstspg = executable('check_meta_store_postgresql',
'-include',
meson.build_root() + '/config.h',
'-DTOP_SRC_DIR="'+meson.source_root()+'"',
ci_args
],
link_with: libgda,
dependencies: [
......
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