diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/README b/README new file mode 100644 index 0000000..50c7ff8 --- /dev/null +++ b/README @@ -0,0 +1,37 @@ +The colorgcc is a perl script written by Jamie Moyers to colorize the +terminal output of C++, CC, CCACHE, G++, GCC so error messages can be +found within longer compiler outputs. + +Homepage: + + http://schlueters.de/colorgcc.html + +Usage: + +Call the compiler name with the 'color-' prefix, eg: + + color-gcc + color-g++ + color-cc + color-c++ + +That's it. Alternatively you may want to create following handy aliases: + + alias gcc='color-gcc' + alias g++='color-g++' + alias cc='color-cc' + alias c++='color-c++' + +The default settings can be overridden with ~/.colorgccrc. See the +comments in the packaged sample config file for more information. + +Note: + +colorgcc will only emit color codes if: + + (1) Its STDOUT is a tty and + (2) the value of $TERM is not listed in the "nocolor" option. + +If colorgcc colorizes the output, the compiler's STDERR will be combined +with STDOUT. Otherwise, colorgcc just passes the output from the +compiler through without modification. diff --git a/colorgcc.spec b/colorgcc.spec index eb39b62..25de8cf 100644 --- a/colorgcc.spec +++ b/colorgcc.spec @@ -1,8 +1,9 @@ Summary: Script to colorize the compiler output Name: colorgcc Version: 1.4.5 -Release: 28%{?dist} -License: GPL-1.0-or-later +Release: 1%{?dist} +License: GPL+ +Group: Development/Tools Url: http://schlueters.de/colorgcc.html Source0: https://github.com/colorgcc/colorgcc/archive/%{version}.tar.gz BuildArch: noarch @@ -18,8 +19,8 @@ CCACHE, G++, GCC so error messages can be found within longer compiler outputs. %prep %setup mv ./colorgccrc.txt ./colorgccrc.sample -%patch -P0 -p1 -%patch -P1 -p1 +%patch0 -p1 +%patch1 -p1 %install mkdir -p $RPM_BUILD_ROOT/%{_bindir} @@ -41,6 +42,7 @@ for n in cc gcc g++ c++ ; do done %files +%defattr(-,root,root,-) %{_bindir}/color-gcc %{_bindir}/color-g++ %{_bindir}/color-cc @@ -59,76 +61,11 @@ done %doc README colorgccrc.sample %changelog -* Wed Jul 23 2025 Fedora Release Engineering - 1.4.5-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 1.4.5-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 1.4.5-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jun 17 2024 Miroslav Suchý - 1.4.5-25 -- convert license to SPDX - -* Sun Mar 10 2024 Martin Cermak - 1.4.5-24 -- NVR bump and rebuild for CI gating changes - -* Wed Jan 24 2024 Fedora Release Engineering - 1.4.5-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.4.5-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 1.4.5-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Mar 29 2023 Martin Cermak - 1.4.5-20 -- NVR bump and rebuild for CI gating changes - -* Thu Jan 19 2023 Fedora Release Engineering - 1.4.5-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1.4.5-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 1.4.5-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 1.4.5-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.4.5-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Nov 26 2020 Martin Cermak 1.4.5-13 -- NVR bump and rebuild for CI gating changes - -* Mon Jul 27 2020 Fedora Release Engineering - 1.4.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 1.4.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 1.4.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jan 31 2019 Fedora Release Engineering - 1.4.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 1.4.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 1.4.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Dec 8 2017 Martin Cermak 1.4.5-3 +* Fri Dec 8 2017 Martin Cermak 1.4.5-1 +- Rebase to 1.4.5 per bz1402003 - Provide convenience symlinks per bz1402003#c10 - Update README -* Wed Dec 6 2017 Martin Cermak 1.4.5-1 -- Rebase to 1.4.5 per bz1402003 - * Wed Jul 26 2017 Fedora Release Engineering - 1.3.2-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 8b52293..0000000 --- a/gating.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_stable -subject_type: koji_build -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} ---- !Policy -product_versions: - - rhel-8 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} ---- !Policy -product_versions: - - rhel-9 -decision_context: osci_compose_gate -rules: - - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional} diff --git a/plans/ci.fmf b/plans/ci.fmf deleted file mode 100644 index 1ad2c12..0000000 --- a/plans/ci.fmf +++ /dev/null @@ -1,6 +0,0 @@ -summary: CI Gating Plan -discover: - how: fmf - directory: tests -execute: - how: beakerlib diff --git a/tests/Sanity/smoke/Makefile b/tests/Sanity/smoke/Makefile deleted file mode 100644 index 8cf4641..0000000 --- a/tests/Sanity/smoke/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /tools/colorgcc/Sanity/basic -# Description: basic smoke test -# Author: Martin Cermak -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2020 Red Hat, Inc. -# -# This program is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/tools/colorgcc/Sanity/basic -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - test -x runtest.sh || chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Martin Cermak " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: basic smoke test" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 48h" >> $(METADATA) - @echo "RunFor: colorgcc" >> $(METADATA) - @echo "Requires: colorgcc gcc" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2+" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5 -RHEL6 -RHEL7" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/Sanity/smoke/PURPOSE b/tests/Sanity/smoke/PURPOSE deleted file mode 100644 index bf19f89..0000000 --- a/tests/Sanity/smoke/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -PURPOSE of /tools/colorgcc/Sanity/basic -Description: basic smoke test -Author: Martin Cermak diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf deleted file mode 100644 index 0c5aa8b..0000000 --- a/tests/Sanity/smoke/main.fmf +++ /dev/null @@ -1,14 +0,0 @@ -summary: basic smoke test -description: '' -contact: -- Martin Cermak -component: -- colorgcc -test: ./runtest.sh -framework: beakerlib -recommend: -- colorgcc -- gcc -duration: 48h -extra-summary: /tools/colorgcc/Sanity/basic -extra-task: /tools/colorgcc/Sanity/basic diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh deleted file mode 100755 index 708bfe8..0000000 --- a/tests/Sanity/smoke/runtest.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /tools/colorgcc/Sanity/basic -# Description: basic smoke test -# Author: Martin Cermak -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2020 Red Hat, Inc. -# -# This program is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see http://www.gnu.org/licenses/. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="colorgcc" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlPhaseEnd - - rlPhaseStartTest - rlRun "echo -e 'int main() {\nreturn 0;\n}' | color-gcc -xc -o /dev/null -" - rlRun "echo -e 'int main() {\nreturn 0\n}' | color-gcc -xc -o /dev/null - |& fgrep ':2:9: error'" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd