GNOME.org
 

[gjs: 1/3] build: Remove Autotools build system

commit 072ffd6d7f184f35d953d5d0257c66a84c385458
Author: Philip Chimento <philip chimento gmail com>
Date:   Sat Nov 23 16:26:05 2019 -0800

    build: Remove Autotools build system
    
    We've had one release with both Meson and Autotools, and now it's time
    to remove Autotools and the remaining CI jobs that use it.

 .gitlab-ci.yml                   |  61 ------
 AUTHORS                          |   0
 ChangeLog                        |   0
 Makefile-examples.am             |   6 -
 Makefile-insttest.am             |  65 -------
 Makefile-test.am                 | 354 ----------------------------------
 Makefile.am                      | 272 --------------------------
 README                           |   1 -
 autogen.sh                       |  33 ----
 configure.ac                     | 403 ---------------------------------------
 git.mk                           | 359 ----------------------------------
 gjs-1.0.pc.in                    |  18 --
 gjs-modules-srcs.mk              |  34 ----
 gjs-srcs.mk                      | 113 -----------
 m4/code_coverage.m4              | 191 -------------------
 m4/extensions.m4                 | 183 ------------------
 m4/timer_time.m4                 |  44 -----
 meson.build                      |  12 --
 test/extra/do_environment.sh     |  13 --
 test/test-ci.sh                  |  27 ---
 verbump.py                       |  47 -----
 win32/Makefile.vc                |  66 -------
 win32/build-rules-msvc.mak       | 149 ---------------
 win32/config-msvc.mak            | 118 ------------
 win32/config.h.win32.in          |  92 ---------
 win32/create-lists-msvc.mak      | 107 -----------
 win32/create-lists.bat           |  42 ----
 win32/detectenv-msvc.mak         | 150 ---------------
 win32/generate-msvc.mak          |  24 ---
 win32/gjs-introspection-msvc.mak |  34 ----
 win32/info-msvc.mak              |  93 ---------
 win32/install.mak                |  18 --
 win32/introspection-msvc.mak     |  73 -------
 33 files changed, 3202 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd3a24bc..b09863af 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,6 @@ stages:
 - manual
 - deploy
 
-.Autotools files: &autotools_files  [configure, Makefile, ./*.log, ./*.trs, ./installed-tests/scripts/*.log, 
./installed-tests/scripts/*.trs]
-
 .coverage: &coverage
   image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs60
   variables:
@@ -29,40 +27,6 @@ stages:
       - _coverage/html
       - _coverage_build/meson-logs/*log.txt
 
-# Autotools build
-.autotools: &autotools
-  when: on_success
-  artifacts:
-    name: log
-    when: always
-    paths: &autotools_files
-
-  script:
-    # GitLab is keeping some files between jobs. Remove them.
-    - rm -rf configure Makefile *.log analysis
-
-    # Build GJS
-    - test/test-ci.sh GJS
-
-    # Run installed extra tests
-    - 'if [[ $BUILD_OPTS == *"--enable-installed-tests"* ]]; then
-         $(pwd)/test/test-ci.sh GJS_EXTRA;
-       fi
-    '
-
-    # Run valgrind
-    - 'if [[ $BUILD_OPTS == *"--enable-valgrind"* ]]; then
-         $(pwd)/test/test-ci.sh VALGRIND;
-       fi
-    '
-
-    # Run the script tests again (to assure they are working)
-    - 'if [[ -n "${SCRIPTCHECK}" ]]; then
-         $(pwd)/test/test-ci.sh SH_CHECKS;
-       fi
-    '
-
-# Meson build
 .build: &build
   when: on_success
   artifacts:
@@ -131,20 +95,6 @@ build_minimal:
   except:
     - schedules
 
-build_autotools:
-  <<: *autotools
-  stage: test
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs60
-  variables:
-    TASK_ID: "fedora-x86_64-gcc-autotools-check"
-    BUILD_OPTS: >-
-      CPPFLAGS='-DGJS_VERBOSE_ENABLE_PROPS=1 -DGJS_VERBOSE_ENABLE_MARSHAL=1 -DGJS_VERBOSE_ENABLE_LIFECYCLE=1 
-DGJS_VERBOSE_ENABLE_GI_USAGE=1 -DGJS_VERBOSE_ENABLE_GCLOSURE=1 -DGJS_VERBOSE_ENABLE_GSIGNAL=1'
-      --with-cairo --enable-readline --enable-profiler
-      --enable-dtrace --enable-systemtap
-    TEST: check
-  except:
-    - schedules
-
 # Generates
 # The Code Coverage Report
 coverage-automatic:
@@ -273,17 +223,6 @@ sanitizer_clang:
   except:
     - schedules
 
-distcheck:
-  <<: *autotools
-  stage: manual
-  image: registry.gitlab.gnome.org/gnome/gjs:fedora.mozjs60
-  variables:
-    TASK_ID: "fedora-x86_64-gcc-default-default-distcheck"
-    TEST: "distcheck"
-  when: manual
-  except:
-    - schedules
-
 installed_tests:
   <<: *build
   stage: manual
diff --git a/meson.build b/meson.build
index 193c9964..d843e9f2 100644
--- a/meson.build
+++ b/meson.build
@@ -285,18 +285,6 @@ header_conf.set('_GNU_SOURCE', 1)
 
 configure_file(output: 'config.h', configuration: header_conf)
 
-### Generate config.h for win32 ################################################
-
-win32_header_conf = configuration_data()
-win32_header_conf.set('GJS_VERSION', int_version)
-win32_header_conf.set('PACKAGE', meson.project_name())
-win32_header_conf.set('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/gjs')
-win32_header_conf.set('PACKAGE_NAME', meson.project_name())
-win32_header_conf.set('PACKAGE_VERSION', meson.project_version())
-win32_header_conf.set('PACKAGE_TARNAME', meson.project_name())
-configure_file(input: 'win32/config.h.win32.in', output: 'config.h.win32',
-    configuration: win32_header_conf)
-
 ### Check for environment ######################################################
 
 if cxx.get_id() == 'msvc'
diff --git a/test/extra/do_environment.sh b/test/extra/do_environment.sh
index 514d48ce..871114ee 100755
--- a/test/extra/do_environment.sh
+++ b/test/extra/do_environment.sh
@@ -1,18 +1,5 @@
 #!/bin/sh -e
 
-do_Configure_MainBuild () {
-    do_Print_Labels 'Set Main Build Configuration'
-
-    autogenargs="--enable-compile-warnings=yes"
-
-    if test -n "$BUILD_OPTS"; then
-        autogenargs="$autogenargs $BUILD_OPTS"
-    fi
-    export ci_autogenargs="$autogenargs"
-
-    echo '-- Done --'
-}
-
 do_Print_Labels () {
     if test -n "$1"; then
         label_len=${#1}
diff --git a/test/test-ci.sh b/test/test-ci.sh
index 864393e2..52e2fa9e 100755
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@ -103,33 +103,6 @@ if test "$1" = "SETUP"; then
     do_Print_Labels 'Show GJS git information'
     git log --pretty=format:"%h %cd %s" -1
 
-elif test "$1" = "GJS"; then
-    do_Set_Env
-    do_Show_Info
-
-    do_Configure_MainBuild
-
-    # Build and test the latest commit (merged or from a merge/pull request) of
-    # Javascript Bindings for GNOME (gjs)
-    do_Print_Labels 'Show GJS git information'
-    git log --pretty=format:"%h %cd %s" -1
-
-    do_Print_Labels 'Do the GJS build'
-
-    export AM_DISTCHECK_CONFIGURE_FLAGS="--enable-compile-warnings=yes"
-
-    # Regular (autotools only) build
-    echo "Autogen options: $ci_autogenargs"
-    eval ./autogen.sh "$ci_autogenargs"
-
-    make -sj 2>&1
-
-    if test "$TEST" = "distcheck"; then
-        xvfb-run -a make -s distcheck
-    elif test "$TEST" = "check"; then
-        xvfb-run -a make -s check
-    fi
-
 elif test "$1" = "BUILD"; then
     do_Set_Env
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]