Merge pull request swiftlang#33 from tomerd/metadata

externalize RPM metadata and make it version based

platforms/Linux/centos/8/Dockerfile

@@ -14,10 +14,11 @@ RUN yum -y update
 # RPM and yum development tools
 RUN yum install -y rpmdevtools yum-utils
 
-# Configure powertools
+# Configure epel and powertools
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 RUN yum config-manager --set-enabled powertools
 
 # Optimization: Install all the dependencies needed to build Swift from the spec file itself
 ADD swift-lang.spec /tmp/swift-lang.spec
-RUN yum-builddep -y /tmp/swift-lang.spec
+RUN touch /tmp/metadata.inc # fake metadata is okay for this optimization
+RUN cd /tmp && yum-builddep -y swift-lang.spec

platforms/Linux/centos/8/readme.md → platforms/Linux/centos/8/README.md

@@ -28,6 +28,4 @@ note this still uses the docker cache, so will rebuild only if the version of th
 
 
 ### Open Issues / TODO
-* the swift release version should be an argument?
-* the versions of source packages (eg yams) should come from an external file, likely one per swift release version
 * the list of build requirements (BuildRequires) and especially requirements (Requires) should come from an external file, likely one per swift release version (which we can use it to also drive documentation)

platforms/Linux/centos/8/build_rpm.sh

@@ -8,7 +8,7 @@
 
 #!/usr/bin/env bash
 
-set +ex
+set -ex
 
 OUTDIR=/output
 if [[ ! -d "$OUTDIR" ]]; then
@@ -23,8 +23,10 @@ yum update -y
 mkdir -p $HOME/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 
 # Add the spec
-cp swift-lang.spec $HOME/rpmbuild/SPECS/swift-lang.spec
-# Add the patches
+cp swift-lang.spec $HOME/rpmbuild/SPECS/
+# Add the metadata for this swift version
+cp /shared/metadata.inc $HOME/rpmbuild/SPECS/
+# Add any patches
 cp patches/*.patch $HOME/rpmbuild/SOURCES/
 
 pushd $HOME/rpmbuild/SPECS

platforms/Linux/centos/8/docker-compose.yaml

@@ -6,6 +6,12 @@
 # See http://swift.org/LICENSE.txt for license information
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
+# this setup is designed to build the RPM with docker
+# usage:
+# docker-compose -f platforms/Linux/centos/8/docker-compose.yaml build
+# to shell into the container for debugging purposes:
+# docker-compose -f platforms/Linux/centos/8/docker-compose.yaml run build
+
 version: "2"
 
 services:
@@ -24,6 +30,7 @@ services:
       - seccomp:unconfined
     volumes:
       - .:/code:z
+      - ../../shared/RPM:/shared:ro
       - ./.output:/output:z
     working_dir: /code
     cap_drop:

platforms/Linux/centos/8/swift-lang.spec

@@ -1,36 +1,31 @@
+%include metadata.inc
+
 %global debug_package %{nil}
-%global swifttag 5.5-RELEASE
-%global swiftbuild swift-source
-%global icu_version 65-1
-%global yams_version 4.0.2
-%global swift_argument_parser_version 0.4.3
-%global swift_crypto_version 1.1.5
-%global ninja_version 1.10.2
-
-Name:           swift-lang
-Version:        5.5
+
+Name:           %{package_name}
+Version:        %{package_version}
 Release:        1%{?dist}
-Summary:        Apple's Swift programming language
-License:        Apache 2.0
-URL:            https://swift.org
-
-Source0:        https://github.com/apple/swift/archive/swift-%{swifttag}.tar.gz#/swift.tar.gz
-Source1:        https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swifttag}.tar.gz#/corelibs-libdispatch.tar.gz
-Source2:        https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swifttag}.tar.gz#/corelibs-foundation.tar.gz
-Source3:        https://github.com/apple/swift-integration-tests/archive/swift-%{swifttag}.tar.gz#/swift-integration-tests.tar.gz
-Source4:        https://github.com/apple/swift-corelibs-xctest/archive/swift-%{swifttag}.tar.gz#/corelibs-xctest.tar.gz
-Source5:        https://github.com/apple/swift-package-manager/archive/swift-%{swifttag}.tar.gz#/package-manager.tar.gz
-Source6:        https://github.com/apple/swift-llbuild/archive/swift-%{swifttag}.tar.gz#/llbuild.tar.gz
-Source7:        https://github.com/apple/swift-cmark/archive/swift-%{swifttag}.tar.gz#/cmark.tar.gz
-Source8:        https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swifttag}.tar.gz#/swift-xcode-playground-support.tar.gz
-Source9:        https://github.com/apple/sourcekit-lsp/archive/swift-%{swifttag}.tar.gz#/sourcekit-lsp.tar.gz
-Source10:       https://github.com/apple/indexstore-db/archive/swift-%{swifttag}.tar.gz#/indexstore-db.tar.gz
-Source11:       https://github.com/apple/llvm-project/archive/swift-%{swifttag}.tar.gz#/llvm-project.tar.gz
-Source12:       https://github.com/apple/swift-tools-support-core/archive/swift-%{swifttag}.tar.gz#/swift-tools-support-core.tar.gz
+Summary:        %{package_summary}
+License:        %{package_license}
+URL:            %{package_url}
+
+Source0:        https://github.com/apple/swift/archive/swift-%{swift_version}.tar.gz#/swift.tar.gz
+Source1:        https://github.com/apple/swift-corelibs-libdispatch/archive/swift-%{swift_version}.tar.gz#/corelibs-libdispatch.tar.gz
+Source2:        https://github.com/apple/swift-corelibs-foundation/archive/swift-%{swift_version}.tar.gz#/corelibs-foundation.tar.gz
+Source3:        https://github.com/apple/swift-integration-tests/archive/swift-%{swift_version}.tar.gz#/swift-integration-tests.tar.gz
+Source4:        https://github.com/apple/swift-corelibs-xctest/archive/swift-%{swift_version}.tar.gz#/corelibs-xctest.tar.gz
+Source5:        https://github.com/apple/swift-package-manager/archive/swift-%{swift_version}.tar.gz#/package-manager.tar.gz
+Source6:        https://github.com/apple/swift-llbuild/archive/swift-%{swift_version}.tar.gz#/llbuild.tar.gz
+Source7:        https://github.com/apple/swift-cmark/archive/swift-%{swift_version}.tar.gz#/cmark.tar.gz
+Source8:        https://github.com/apple/swift-xcode-playground-support/archive/swift-%{swift_version}.tar.gz#/swift-xcode-playground-support.tar.gz
+Source9:        https://github.com/apple/sourcekit-lsp/archive/swift-%{swift_version}.tar.gz#/sourcekit-lsp.tar.gz
+Source10:       https://github.com/apple/indexstore-db/archive/swift-%{swift_version}.tar.gz#/indexstore-db.tar.gz
+Source11:       https://github.com/apple/llvm-project/archive/swift-%{swift_version}.tar.gz#/llvm-project.tar.gz
+Source12:       https://github.com/apple/swift-tools-support-core/archive/swift-%{swift_version}.tar.gz#/swift-tools-support-core.tar.gz
 Source13:       https://github.com/apple/swift-argument-parser/archive/%{swift_argument_parser_version}.tar.gz#/swift-argument-parser.tar.gz
-Source14:       https://github.com/apple/swift-driver/archive/swift-%{swifttag}.tar.gz#/swift-driver.tar.gz
+Source14:       https://github.com/apple/swift-driver/archive/swift-%{swift_version}.tar.gz#/swift-driver.tar.gz
 Source15:       https://github.com/unicode-org/icu/archive/release-%{icu_version}.tar.gz#/icu.tar.gz
-Source16:       https://github.com/apple/swift-syntax/archive/swift-%{swifttag}.zip#/swift-syntax.tar.gz
+Source16:       https://github.com/apple/swift-syntax/archive/swift-%{swift_version}.zip#/swift-syntax.tar.gz
 Source17:       https://github.com/jpsim/Yams/archive/%{yams_version}.zip#/yams.tar.gz
 Source18:       https://github.com/apple/swift-crypto/archive/refs/tags/%{swift_crypto_version}.tar.gz#/swift-crypto.tar.gz
 Source19:       https://github.com/ninja-build/ninja/archive/refs/tags/v%{ninja_version}.tar.gz#/ninja.tar.gz
@@ -96,26 +91,26 @@ importantly, Swift is designed to make writing and maintaining
 correct programs easier for the developer.
 
 %prep
-%setup -q -c -n %{swiftbuild} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19
+%setup -q -c -n %{swift_source_location} -a 0 -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -a 13 -a 14 -a 15 -a 16 -a 17 -a 18 -a 19
 # The Swift build script requires directories to be named
 # in a specific way so renaming the source directories is
 # necessary
-mv swift-cmark-swift-%{swifttag} cmark
-mv swift-corelibs-foundation-swift-%{swifttag} swift-corelibs-foundation
-mv swift-corelibs-libdispatch-swift-%{swifttag} swift-corelibs-libdispatch
-mv swift-corelibs-xctest-swift-%{swifttag} swift-corelibs-xctest
-mv swift-integration-tests-swift-%{swifttag} swift-integration-tests
-mv swift-llbuild-swift-%{swifttag} llbuild
-mv swift-package-manager-swift-%{swifttag} swiftpm
-mv swift-swift-%{swifttag} swift
-mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-support
-mv sourcekit-lsp-swift-%{swifttag} sourcekit-lsp
-mv indexstore-db-swift-%{swifttag} indexstore-db
-mv llvm-project-swift-%{swifttag} llvm-project
-mv swift-syntax-swift-%{swifttag} swift-syntax
-mv swift-tools-support-core-swift-%{swifttag} swift-tools-support-core
+mv swift-cmark-swift-%{swift_version} cmark
+mv swift-corelibs-foundation-swift-%{swift_version} swift-corelibs-foundation
+mv swift-corelibs-libdispatch-swift-%{swift_version} swift-corelibs-libdispatch
+mv swift-corelibs-xctest-swift-%{swift_version} swift-corelibs-xctest
+mv swift-integration-tests-swift-%{swift_version} swift-integration-tests
+mv swift-llbuild-swift-%{swift_version} llbuild
+mv swift-package-manager-swift-%{swift_version} swiftpm
+mv swift-swift-%{swift_version} swift
+mv swift-xcode-playground-support-swift-%{swift_version} swift-xcode-playground-support
+mv sourcekit-lsp-swift-%{swift_version} sourcekit-lsp
+mv indexstore-db-swift-%{swift_version} indexstore-db
+mv llvm-project-swift-%{swift_version} llvm-project
+mv swift-syntax-swift-%{swift_version} swift-syntax
+mv swift-tools-support-core-swift-%{swift_version} swift-tools-support-core
 mv swift-argument-parser-%{swift_argument_parser_version} swift-argument-parser
-mv swift-driver-swift-%{swifttag} swift-driver
+mv swift-driver-swift-%{swift_version} swift-driver
 mv swift-crypto-%{swift_crypto_version} swift-crypto
 mv ninja-%{ninja_version} ninja
 

platforms/Linux/shared/RPM/metadata.inc

@@ -0,0 +1,20 @@
+# package metadata
+
+%global package_name      swiftlang
+%global package_version   5.5.0
+%global package_summary   The Swift programming language
+%global package_license   Apache 2.0
+%global package_url       https://swift.org
+
+# versions
+
+%global swift_version 5.5-RELEASE
+%global icu_version 65-1
+%global yams_version 4.0.2
+%global swift_argument_parser_version 0.4.3
+%global swift_crypto_version 1.1.5
+%global ninja_version 1.10.2
+
+# locations
+
+%global swift_source_location swift-source