Accepting request 1009610 from home:AndreasStieger:branches:devel:tools:building

SCons 4.4.0

OBS-URL: https://build.opensuse.org/request/show/1009610
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/scons?expand=0&rev=90
This commit is contained in:
Martin Pluskal 2022-10-12 10:30:05 +00:00 committed by Git OBS Bridge
parent ef0e60cd4c
commit 7dd09ba98d
7 changed files with 35 additions and 464 deletions

3
SCons-4.4.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3d43b2303a924816ea0e1b345ff04c9b3e27b53eadf0f26012fc0c29b019685f
size 3096863

View File

@ -1,339 +0,0 @@
src/engine/SCons/ActionTests.py
src/engine/SCons/dblite.py
src/engine/SCons/EnvironmentValuesTest.py
src/engine/SCons/Node/FS.py
src/engine/SCons/Options/__init__.py
src/engine/SCons/Platform/aix.py
src/engine/SCons/Platform/cygwin.py
src/engine/SCons/Platform/darwin.py
src/engine/SCons/Platform/hpux.py
src/engine/SCons/Platform/irix.py
src/engine/SCons/Platform/os2.py
src/engine/SCons/Platform/sunos.py
src/engine/SCons/SConfTests.py
src/engine/SCons/Script/__init__.py
src/engine/SCons/Script/SConscript.py
src/engine/SCons/Tool/aixcc.py
src/engine/SCons/Tool/aixf77.py
src/engine/SCons/Tool/aixlink.py
src/engine/SCons/Tool/applelink.py
src/engine/SCons/Tool/cvf.py
src/engine/SCons/Tool/cyglink.py
src/engine/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/docbook.py
src/engine/SCons/Tool/docbook/docbook-xsl-1.76.1/extensions/xslt.py
src/engine/SCons/Tool/f03.py
src/engine/SCons/Tool/f08.py
src/engine/SCons/Tool/f95.py
src/engine/SCons/Tool/gcc.py
src/engine/SCons/Tool/gfortran.py
src/engine/SCons/Tool/gnulink.py
src/engine/SCons/Tool/gxx.py
src/engine/SCons/Tool/hpcc.py
src/engine/SCons/Tool/hplink.py
src/engine/SCons/Tool/icc.py
src/engine/SCons/Tool/ifl.py
src/engine/SCons/Tool/ifort.py
src/engine/SCons/Tool/midl.py
src/engine/SCons/Tool/MSCommon/arch.py
src/engine/SCons/Tool/MSCommon/netframework.py
src/engine/SCons/Tool/MSCommon/sdk.py
src/engine/SCons/Tool/MSCommon/vc.py
src/engine/SCons/Tool/MSCommon/vs.py
src/engine/SCons/Tool/mslib.py
src/engine/SCons/Tool/mslink.py
src/engine/SCons/Tool/mssdk.py
src/engine/SCons/Tool/msvc.py
src/engine/SCons/Tool/msvs.py
src/engine/SCons/Tool/sgicc.py
src/engine/SCons/Tool/sgilink.py
src/engine/SCons/Tool/suncc.py
src/engine/SCons/Tool/sunf77.py
src/engine/SCons/Tool/sunf90.py
src/engine/SCons/Tool/sunf95.py
src/engine/SCons/Tool/sunlink.py
src/engine/SCons/Tool/textfile.py
src/engine/SCons/Tool/386asm.py
src/engine/SCons/UtilTests.py
src/engine/SCons/Variables/__init__.py
src/script/scons-configure-cache.py
src/script/sconsign.py
src/script/scons-time.py
src/setup.py
src/test_files.py
src/test_interrupts.py
src/test_pychecker.py
src/test_setup.py
src/test_strings.py
test/Actions/pre-post-fixture/work4/build.py
test/AS/fixture/myas_args.py
test/AS/fixture/myas.py
test/AS/ml.py
test/AS/nasm.py
test/CC/CCVERSION-fixture/versioned.py
test/Configure/implicit-cache.py
test/CPPDEFINES/scan.py
test/D/AllAtOnce/sconstest-dmd.py
test/D/AllAtOnce/sconstest-gdc.py
test/D/AllAtOnce/sconstest-ldc.py
test/D/CoreScanner/sconstest-dmd.py
test/D/CoreScanner/sconstest-gdc.py
test/D/CoreScanner/sconstest-ldc.py
test/D/DMD.py
test/D/DMD2_Alt.py
test/D/DMD2.py
test/Deprecated/SourceSignatures/no-csigs.py
test/D/GDC_Alt.py
test/D/GDC.py
test/D/HelloWorld/CompileAndLinkOneStep/sconstest-dmd.py
test/D/HelloWorld/CompileAndLinkOneStep/sconstest-gdc.py
test/D/HelloWorld/CompileAndLinkOneStep/sconstest-ldc.py
test/D/HelloWorld/CompileThenLinkTwoSteps/sconstest-dmd.py
test/D/HelloWorld/CompileThenLinkTwoSteps/sconstest-gdc.py
test/D/HelloWorld/CompileThenLinkTwoSteps/sconstest-ldc.py
test/D/HSTeoh/sconstest-arLibIssue_dmd.py
test/D/HSTeoh/sconstest-arLibIssue_gdc.py
test/D/HSTeoh/sconstest-arLibIssue_ldc.py
test/D/HSTeoh/sconstest-libCompileOptions_dmd.py
test/D/HSTeoh/sconstest-libCompileOptions_gdc.py
test/D/HSTeoh/sconstest-libCompileOptions_ldc.py
test/D/HSTeoh/sconstest-linkingProblem_dmd.py
test/D/HSTeoh/sconstest-linkingProblem_gdc.py
test/D/HSTeoh/sconstest-linkingProblem_ldc.py
test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_dmd.py
test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_gdc.py
test/D/HSTeoh/sconstest-singleStringCannotBeMultipleOptions_ldc.py
test/D/Issues/2939_Ariovistus/sconstest-correctLinkOptions_dmd.py
test/D/Issues/2939_Ariovistus/sconstest-correctLinkOptions_gdc.py
test/D/Issues/2939_Ariovistus/sconstest-correctLinkOptions_ldc.py
test/D/Issues/2940_Ariovistus/sconstest-correctLinkOptions_dmd.py
test/D/Issues/2940_Ariovistus/sconstest-correctLinkOptions_gdc.py
test/D/Issues/2940_Ariovistus/sconstest-correctLinkOptions_ldc.py
test/D/LDC_Alt.py
test/D/LDC.py
test/D/MixedDAndC/sconstest-dmd.py
test/D/MixedDAndC/sconstest-gdc.py
test/D/MixedDAndC/sconstest-ldc.py
test/Docbook/basedir/htmlhelp/htmlhelp_cmd.py
test/Docbook/basedir/htmlhelp/htmlhelp.py
test/Docbook/basedir/htmlchunked/htmlchunked_cmd.py
test/Docbook/basedir/htmlchunked/htmlchunked.py
test/Docbook/basedir/slideshtml/slideshtml_cmd.py
test/Docbook/basedir/slideshtml/slideshtml.py
test/Docbook/basic/epub/epub_cmd.py
test/Docbook/basic/htmlhelp/htmlhelp_cmd.py
test/Docbook/basic/html/html_cmd.py
test/Docbook/basic/htmlchunked/htmlchunked_cmd.py
test/Docbook/basic/slideshtml/slideshtml_cmd.py
test/Docbook/basic/slideshtml/slideshtml.py
test/Docbook/basic/xinclude/xinclude.py
test/Docbook/dependencies/xinclude/xinclude.py
test/Docbook/rootname/htmlhelp/htmlhelp.py
test/Docbook/rootname/htmlchunked/htmlchunked.py
test/Docbook/rootname/slideshtml/slideshtml.py
test/D/Scanner.py
test/D/SharedObjects/sconstest-dmd.py
test/D/SharedObjects/sconstest-gdc.py
test/D/SharedObjects/sconstest-ldc.py
test/DVIPDF/makeindex.py
test/DVIPS/DVIPS.py
test/Errors/preparation.py
test/fixture/mycompile.py
test/fixture/mylink.py
test/fixture/myrewrite.py
test/Fortran/fixture/myfortran_flags.py
test/Fortran/fixture/myfortran.py
test/Fortran/FORTRANPATH.py
test/Fortran/F77PATH.py
test/Fortran/F90PATH.py
test/IDL/midl.py
test/Install/non-ascii-name.py
test/Intel/icpc-link.py
test/Interactive/implicit-VariantDir.py
test/Interactive/variant_dir.py
test/Java/DerivedSourceTest.py
test/Java/JARFLAGS.py
test/Java/JARCHDIR.py
test/Java/JAR.py
test/Java/JAVABOOTCLASSPATH.py
test/Java/JAVACFLAGS.py
test/Java/JAVACLASSPATH.py
test/Java/JAVAH.py
test/Java/JAVASOURCEPATH.py
test/Java/Java-1.4.py
test/Java/Java-1.5.py
test/Java/Java-1.6.py
test/Java/multi-step.py
test/Java/nested-classes.py
test/Java/no-JARCHDIR.py
test/Java/RMIC.py
test/Java/source-files.py
test/Java/swig-dependencies.py
test/LEX/live.py
test/long-lines/signature.py
test/Parallel/failed-build.py
test/virtualenv/unactivated/virtualenv_unactivated_python.py
test/virtualenv/activated/virtualenv_detect_virtualenv.py
test/virtualenv/activated/virtualenv_activated_python.py
test/virtualenv/activated/option/ignore-virtualenv.py
test/virtualenv/activated/option/enable-virtualenv.py
test/MSVC/MSVC_BATCH-spaces-targetdir.py
test/Java/Java-1.8.py
test/Fortran/gfortran.py
test/MinGW/MinGWSharedLibrary.py
test/MinGW/WINDOWS_INSERT_DEF.py
test/MSVC/batch-longlines.py
test/MSVC/embed-manifest.py
test/MSVC/hierarchical.py
test/MSVC/msvc.py
test/MSVC/MSVC_UWP_APP.py
test/MSVC/multiple-pdb.py
test/MSVC/pdb-manifest.py
test/MSVC/pdb-VariantDir-path.py
test/MSVC/pch-basics.py
test/MSVC/PCH-source.py
test/MSVC/pch-spaces-subdir.py
test/MSVC/PCHSTOP-errors.py
test/MSVC/query_vcbat.py
test/MSVC/TARGET_ARCH.py
test/MSVS/common-prefix.py
test/MSVS/CPPPATH-Dirs.py
test/MSVS/runfile.py
test/MSVS/vs-10.0-exec.py
test/MSVS/vs-10.0Exp-exec.py
test/MSVS/vs-10.0-scc-files.py
test/MSVS/vs-10.0-scc-legacy-files.py
test/MSVS/vs-11.0-exec.py
test/MSVS/vs-11.0Exp-exec.py
test/MSVS/vs-11.0-scc-files.py
test/MSVS/vs-11.0-scc-legacy-files.py
test/MSVS/vs-14.0-exec.py
test/MSVS/vs-14.0Exp-exec.py
test/MSVS/vs-14.0-scc-files.py
test/MSVS/vs-14.0-scc-legacy-files.py
test/MSVS/vs-6.0-exec.py
test/MSVS/vs-7.0-exec.py
test/MSVS/vs-7.0-scc-files.py
test/MSVS/vs-7.0-scc-legacy-files.py
test/MSVS/vs-7.1-exec.py
test/MSVS/vs-7.1-scc-files.py
test/MSVS/vs-7.1-scc-legacy-files.py
test/MSVS/vs-8.0-exec.py
test/MSVS/vs-8.0Exp-exec.py
test/MSVS/vs-8.0-scc-files.py
test/MSVS/vs-8.0-scc-legacy-files.py
test/MSVS/vs-9.0-exec.py
test/MSVS/vs-9.0Exp-exec.py
test/MSVS/vs-9.0-scc-files.py
test/MSVS/vs-9.0-scc-legacy-files.py
test/option--tree.py
test/packaging/ipkg.py
test/packaging/msi/explicit-target.py
test/packaging/msi/file-placement.py
test/packaging/msi/package.py
test/packaging/multiple-packages-at-once.py
test/packaging/option--package-type.py
test/packaging/rpm/cleanup.py
test/packaging/rpm/internationalization.py
test/packaging/rpm/multipackage.py
test/packaging/rpm/package.py
test/packaging/rpm/tagging.py
test/packaging/zip.py
test/PharLap.py
test/print_statement.py
test/QT/copied-env.py
test/QT/CPPPATH-appended.py
test/QT/CPPPATH.py
test/QT/generated-ui.py
test/QT/installed.py
test/QT/manual.py
test/QT/moc-from-header.py
test/QT/QTFLAGS.py
test/QT/source-from-ui.py
test/QT/Tool.py
test/QT/up-to-date.py
test/Repository/JavaH.py
test/Repository/Java.py
test/Repository/RMIC.py
test/Rpcgen/live.py
test/SConsignFile/use-dbhash.py
test/SConsignFile/use-dbm.py
test/SConsignFile/use-dumbdbm.py
test/SConsignFile/use-gdbm.py
test/sconsign/script/bad.py
test/sconsign/script/Configure.py
test/sconsign/script/dblite.py
test/sconsign/script/no-SConsignFile.py
test/sconsign/script/SConsignFile.py
test/sconsign/script/Signatures.py
test/scons-time/run/aegis.py
test/scons-time/run/config/python.py
test/scons-time/run/option/python.py
test/SWIG/build-dir.py
test/SWIG/generated_swigfile.py
test/SWIG/implicit-dependencies.py
test/SWIG/live.py
test/SWIG/module-deduced-name.py
test/SWIG/module-parens.py
test/SWIG/module-quoted.py
test/SWIG/module-spaces.py
test/SWIG/noproxy.py
test/SWIG/recursive-includes-cpp.py
test/SWIG/remove-modules.py
test/SWIG/subdir.py
test/SWIG/SWIGOUTDIR.py
test/SWIG/SWIGOUTDIR-python.py
test/SWIG/SWIGPATH.py
test/SWIG/SWIG.py
test/TEX/auxiliaries.py
test/TEX/biber_biblatex.py
test/TEX/biber_biblatex2.py
test/TEX/biblatex_plain.py
test/TEX/biblatex.py
test/TEX/bibliography.py
test/TEX/bibtex-latex-rerun.py
test/TEX/clean.py
test/TEX/configure.py
test/TEX/dryrun.py
test/TEX/eps_graphics.py
test/TEX/eps_graphics2.py
test/TEX/generated_files.py
test/TEX/glossaries.py
test/TEX/glossary.py
test/TEX/input_docClass.py
test/TEX/lstinputlisting.py
test/TEX/makeindex.py
test/TEX/multibib.py
test/TEX/multi-line_include_options.py
test/TEX/multiple_include.py
test/TEX/multiple_include_subdir.py
test/TEX/multi-run.py
test/TEX/newglossary.py
test/TEX/nomencl.py
test/TEX/PDF_single_source.py
test/TEX/recursive_scanner_dependencies_import.py
test/TEX/recursive_scanner_dependencies_input.py
test/TEX/rename_result.py
test/TEX/subdir-as-include.py
test/TEX/subdir-input.py
test/TEX/subdir_variantdir_include.py
test/TEX/subdir_variantdir_include2.py
test/TEX/subdir_variantdir_input.py
test/TEX/synctex.py
test/TEX/TEX.py
test/TEX/usepackage.py
test/TEX/variant_dir_bibunit.py
test/TEX/variant_dir_dup0.py
test/TEX/variant_dir_newglossary.py
test/TEX/variant_dir.py
test/TEX/variant_dir_style_dup0.py
test/timestamp-fallback.py
test/toolpath/relative_import/image/tools/TestTool1/__init__.py
test/toolpath/relative_import/image/tools/TestTool1/TestTool1_2/__init__.py
test/Win32/bad-drive.py
test/Win32/default-drive.py
test/Win32/file-is-type-not-func.py
test/Win32/mingw.py
test/Win32/scons-bat-error.py
test/Win32/win32pathmadness.py
test/YACC/YACC-fixture/myyacc.py
test/YACC/YACCFLAGS-fixture/myyacc.py

View File

@ -1,24 +0,0 @@
---
setup.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/src/setup.py
+++ b/src/setup.py
@@ -376,7 +376,7 @@ class install_data(_install_data):
if is_win32:
dir = 'Doc'
else:
- dir = os.path.join('man', 'man1')
+ dir = os.path.join('share', 'man', 'man1')
self.data_files = [(dir, man_pages)]
man_dir = os.path.join(self.install_dir, dir)
msg = "Installed SCons man pages into %s" % man_dir
@@ -496,7 +496,7 @@ arguments = {
'docbook-xsl-1.76.1/xhtml/*',
'docbook-xsl-1.76.1/xhtml-1_1/*',
'utils/*']},
- 'data_files': [('man/man1', man_pages)],
+ 'data_files': [('share/man/man1', man_pages)],
'scripts': scripts,
'cmdclass': {'install': install,
'install_lib': install_lib,

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9a2860edea0f86e6c46778fd7bb57dfbd14c330e561ccdbe6200503e4c2c9966
size 5638986

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a36633c90cb9cc15ffda686658fdf3aa83b294241429966e78dae42c3f7a432c
size 156775

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Mon Oct 10 19:57:09 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
- SCons 4.4.0:
* new functionality, including updated compile tool support,
the ability to override the file modification timestamp for
zip files, using a custom hash function, updated ninja
support, experimental features via the --experimental flag
* many bugfixes, including improved shared library handling,
fixes for Fortan and many build tools
- drop scons-3.0.0-fix-install.patch in favour of spec construct
- switch to smaller tarball, simplifying spec file and build
-------------------------------------------------------------------
Fri Jan 3 19:23:47 CET 2020 - Matej Cepl <mcepl@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package scons
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,55 +16,20 @@
#
%define modname scons
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "test"
%define psuffix -test
%bcond_without test
%else
%define psuffix %{nil}
%bcond_with test
%endif
Name: scons%{psuffix}
Version: 3.1.2
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define pythons python3
Name: scons
Version: 4.4.0
Release: 0
Summary: Replacement for Make
License: MIT
Group: Development/Tools/Building
URL: https://www.scons.org/
Source0: http://prdownloads.sourceforge.net/scons/%{modname}-src-%{version}.tar.gz
#http://www.scons.org/doc/%%{version}/HTML/scons-user.html
Source1: scons-user.html-%{version}.tar.bz2
# Adjust to exclude all failing tests
Source2: grep-filter-list.txt
# Local modification
Patch8: scons-3.0.0-fix-install.patch
Source: http://prdownloads.sourceforge.net/scons/SCons-%{version}.tar.gz
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: grep
BuildRequires: python3-base >= 3.5
BuildRequires: python3-lxml
BuildRequires: python3-setuptools
Requires: python3-base >= 3.5
%if %{with test}
# texlive texlive-latex3 biber texmaker ghostscript
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
# For tests
BuildRequires: clang
BuildRequires: docbook-xsl-pdf2index
BuildRequires: docbook5-xsl-stylesheets
BuildRequires: gcc-c++
BuildRequires: git
BuildRequires: libtool
BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: libxslt-tools
BuildRequires: pcre-devel
BuildRequires: subversion
BuildRequires: swig
BuildRequires: xmlgraphics-fop
%endif
BuildRequires: python-rpm-macros
BuildArch: noarch
%description
SCons is a make replacement that provides a range of enhanced features,
@ -74,66 +39,25 @@ provides itself as well as the features. SCons allows you to use the
full power of Python to control compilation.
%prep
%setup -q -n %{modname}-src-%{version} -a1
%autopatch -p1
%autosetup -p1 -n SCons-%{version}
sed -i -e '/QT_LIBPATH = os.path.join.*QTDIR/s/lib/%{_lib}/' \
src/engine/SCons/Tool/qt.py
sed -i 's|%{_bindir}/env python|%{_bindir}/python3|' src/script/*
cp %{SOURCE2} grep-filter-list.txt
chmod -x src/CHANGES.txt README.rst src/RELEASE.txt
# the test is marked skipped but fails; and all are windows based so
# we can safely ignore them
rm -r test/MSVC/
rm -r test/MSVS/
rm -r test/Win32/
rm test/fixture/no_msvc/no_regs_sconstruct.py
rm test/fixture/no_msvc/no_msvcs_sconstruct.py
rm test/LEX/live_mingw.py
rm test/Decider/MD5-winonly-firstbuild.py
SCons/Tool/qt.py
%build
python3 bootstrap.py build/scons
cd build/scons
%python3_build
%python_build
%install
%if !%{with test}
cd build/scons
ls -lh build/lib
%python3_install \
--standard-lib \
--no-install-bat \
--no-version-script \
--install-scripts=%{_bindir} \
--record installed_files.txt
%fdupes %{buildroot}%{python3_sitelib}
%endif
%python_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
mkdir -p %{buildroot}%{_mandir}/man1
mv -v %{buildroot}%{_prefix}/*.1 %{buildroot}%{_mandir}/man1
%check
%if %{with test}
%ifnarch aarch64 armv7l ppc64 ppc64le s390x
TEMP_FILE=$(mktemp --tmpdir %{modname}-test.XXXXXX)
trap 'rm -f -- "$TEMP_FILE"' INT TERM HUP EXIT
find src/ test/ -name \*.py \
| grep -F -v -f grep-filter-list.txt >$TEMP_FILE
python3 runtest.py -f $TEMP_FILE
%else
echo "Skiping tests on this architecture due to failures"
%endif
%endif
%if !%{with test}
%files
%license LICENSE
%doc src/CHANGES.txt README.rst src/RELEASE.txt
%doc scons-user.html
%{_bindir}/*
%{python3_sitelib}/SCons
%{python3_sitelib}/%{modname}*.egg-info
%{_mandir}/man1/*%{ext_man}
%endif
%{python_sitelib}/SCons
%{python_sitelib}/SCons-%{version}-py*.egg-info
%{_mandir}/man1/*.1%{?ext_man}
%changelog