[libgda: 1/3] Misc corrections



commit 609e1caccb6b8be9cd38593e74fc37ffaa936f8f
Author: Pavlo Solntsev <p sun fun gmail com>
Date:   Sun Feb 3 22:47:51 2019 -0600

    Misc corrections
    
     - Removed unused file date.c
     - Removed unused meson option enable-ci-environment
     - Fixing correct revision for version 1 -> 91

 .gitlab-ci.yml               |  4 ++--
 date.c                       |  6 ------
 meson.build                  |  2 +-
 meson_options.txt            |  1 -
 tests/db/meson.build         |  3 +--
 tests/meson.build            | 11 +----------
 tests/meta-store/meson.build |  1 -
 7 files changed, 5 insertions(+), 23 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de9e78885..e5231c8a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
+  - meson _build --prefix=/usr -Denable-debug=true
   - cd _build
   - ninja
   - broadwayd &
@@ -168,4 +168,4 @@ pages:
   - mv doc/C/libgdaui/html public/C/libgdaui-6.0
   artifacts:
     paths:
-    - public
\ No newline at end of file
+    - public
diff --git a/meson.build b/meson.build
index 78829fc3a..c1e9b971a 100644
--- a/meson.build
+++ b/meson.build
@@ -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')
diff --git a/meson_options.txt b/meson_options.txt
index b0415ed0c..9a2f2f4e8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -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')
 
diff --git a/tests/db/meson.build b/tests/db/meson.build
index 20011c5d7..a6271d652 100644
--- a/tests/db/meson.build
+++ b/tests/db/meson.build
@@ -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: [
diff --git a/tests/meson.build b/tests/meson.build
index 11dd5af26..dede6ad79 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,13 +1,4 @@
 
-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
diff --git a/tests/meta-store/meson.build b/tests/meta-store/meson.build
index b8c6cb2d2..1bdf2de7b 100644
--- a/tests/meta-store/meson.build
+++ b/tests/meta-store/meson.build
@@ -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: [


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]