Merge pull request swiftlang#42 from apple/replace-swift-lang-with-swiftlang

shahmishal · web-flow · commit f0e3df68b937 · 2021-10-21T09:47:14.000-07:00
Update the filename from swift-lang to swiftlang
diff --git a/platforms/Linux/Fedora/34/Dockerfile b/platforms/Linux/Fedora/34/Dockerfile
@@ -10,14 +10,14 @@ RUN yum install -y rpmdevtools yum-utils
 
 # Add the spec
 RUN mkdir -p /root/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-ADD swift-lang.spec /root/rpmbuild/SPECS/swift-lang.spec
+ADD swiftlang.spec /root/rpmbuild/SPECS/swiftlang.spec
 
 
 # Install all the dependencies needed to build Swift from the spec file itself
-RUN yum-builddep -y /root/rpmbuild/SPECS/swift-lang.spec
+RUN yum-builddep -y /root/rpmbuild/SPECS/swiftlang.spec
 
 # Get the sources for Swift as defined in the spec file
-RUN spectool -g -R /root/rpmbuild/SPECS/swift-lang.spec
+RUN spectool -g -R /root/rpmbuild/SPECS/swiftlang.spec
 
 # Add the patches
 ADD patches/*.patch /root/rpmbuild/SOURCES/
diff --git a/platforms/Linux/Fedora/34/build_rpm.sh b/platforms/Linux/Fedora/34/build_rpm.sh
@@ -19,7 +19,7 @@ yum -y update
 # will have two files: a SRPM file which contains the source files
 # as well as a regular RPM file that can be installed via `dnf' or `yum'
 pushd $HOME/rpmbuild/SPECS
-rpmbuild -ba ./swift-lang.spec 2>&1 | tee $HOME/build-output.txt
+rpmbuild -ba ./swiftlang.spec 2>&1 | tee $HOME/build-output.txt
 popd
 
 # Include the build log which can be used to determine what went
diff --git a/platforms/Linux/Fedora/34/swiftlang.spec b/platforms/Linux/Fedora/34/swiftlang.spec
@@ -8,7 +8,7 @@
 %global swift_crypto_version 1.1.5
 %global ninja_version 1.10.2
 
-Name:           swift-lang
+Name:           swiftlang
 Version:        5.5
 Release:        1%{?dist}
 Summary:        Apple's Swift programming language
diff --git a/platforms/Linux/Fedora/35/Dockerfile b/platforms/Linux/Fedora/35/Dockerfile
@@ -10,14 +10,14 @@ RUN yum install -y rpmdevtools yum-utils
 
 # Add the spec
 RUN mkdir -p /root/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-ADD swift-lang.spec /root/rpmbuild/SPECS/swift-lang.spec
+ADD swiftlang.spec /root/rpmbuild/SPECS/swiftlang.spec
 
 
 # Install all the dependencies needed to build Swift from the spec file itself
-RUN yum-builddep -y /root/rpmbuild/SPECS/swift-lang.spec
+RUN yum-builddep -y /root/rpmbuild/SPECS/swiftlang.spec
 
 # Get the sources for Swift as defined in the spec file
-RUN spectool -g -R /root/rpmbuild/SPECS/swift-lang.spec
+RUN spectool -g -R /root/rpmbuild/SPECS/swiftlang.spec
 
 # Add the patches
 ADD patches/*.patch /root/rpmbuild/SOURCES/
diff --git a/platforms/Linux/Fedora/35/build_rpm.sh b/platforms/Linux/Fedora/35/build_rpm.sh
@@ -19,7 +19,7 @@ yum -y update
 # will have two files: a SRPM file which contains the source files
 # as well as a regular RPM file that can be installed via `dnf' or `yum'
 pushd $HOME/rpmbuild/SPECS
-rpmbuild -ba ./swift-lang.spec 2>&1 | tee $HOME/build-output.txt
+rpmbuild -ba ./swiftlang.spec 2>&1 | tee $HOME/build-output.txt
 popd
 
 # Include the build log which can be used to determine what went
diff --git a/platforms/Linux/Fedora/35/swiftlang.spec b/platforms/Linux/Fedora/35/swiftlang.spec
@@ -8,7 +8,7 @@
 %global swift_crypto_version 1.1.5
 %global ninja_version 1.10.2
 
-Name:           swift-lang
+Name:           swiftlang
 Version:        5.5
 Release:        1%{?dist}
 Summary:        Apple's Swift programming language
diff --git a/platforms/Linux/Fedora/README.md b/platforms/Linux/Fedora/README.md
@@ -23,7 +23,7 @@ Builds the container image
 ### `patches/*.patch`
 Any post-release patches that have not yet been merged upstream that are 
 temporarily necessary to build Swift. 
-### `swift-lang.spec`
+### `swiftlang.spec`
 The "recipe" the RPM packaging tools use to build Swift. 
 
 ## Building Swift Via Linux Containers
@@ -54,17 +54,17 @@ locally
 RPMs are built in the `$HOME/rpmbuild` directory, which has several subdirectories
 for specific purposes.
 1. `mkdir -p $HOME/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}`
-2. `cp swift-lang.spec $HOME/rpmbuild/SPECS`
+2. `cp swiftlang.spec $HOME/rpmbuild/SPECS`
 3. `cp *.patch $HOME/rpmbuild/SOURCES`
 #### Install all the dependencies necessary to build Swift:
-4. `sudo dnf builddep -y $HOME/rpmbuild/SPECS/swift-lang.spec`
+4. `sudo dnf builddep -y $HOME/rpmbuild/SPECS/swiftlang.spec`
 #### Download the Swift source tarballs:
-5. `spectool -g -R $HOME/rpmbuild/SPECS/swift-lang.spec`
+5. `spectool -g -R $HOME/rpmbuild/SPECS/swiftlang.spec`
 ### Building Swift
 The RPM tools perform both building and packaging. _This process may take several
 hours depending on the hardware Fedora is running on._
 
-`rpmbuild -ba $HOME/rpmbuild/SPECS/swift-lang.spec 2>&1 | tee $HOME/build-output.txt`
+`rpmbuild -ba $HOME/rpmbuild/SPECS/swiftlang.spec 2>&1 | tee $HOME/build-output.txt`
 
 If there were no errors, the resulting Swift RPM file will be located in 
 `$HOME/rpmbuild/RPMS/` in a subdirectory for the current processor architecture 
@@ -73,8 +73,8 @@ If there were no errors, the resulting Swift RPM file will be located in
 ## Installing Swift
 ### Name format
 If Swift was built successfully there should
-be a file with the name format similar to `swift-lang-5.5-1.fc34.x86_64.rpm` where
-`5.5` is the version of Swift specified in `swift-lang.spec`, `fc34` is the version
+be a file with the name format similar to `swiftlang-5.5-1.fc34.x86_64.rpm` where
+`5.5` is the version of Swift specified in `swiftlang.spec`, `fc34` is the version
 of Fedora that was used to build Swift, and `x86_64` is the processor architecture.
 
 ### Note about Fedora versions
@@ -85,6 +85,6 @@ a Swift RPM built for Fedora 34 can only be installed on Fedora 34.
 To install the Swift RPM, change to the directory that contains the RPM file and
 run `sudo dnf install` _the Swift RPM file_ e.g.
 
-`sudo dnf install ./swift-lang-5.5-1.fc34.x86_64.rpm`
+`sudo dnf install ./swiftlang-5.5-1.fc34.x86_64.rpm`
 
 
diff --git a/platforms/Linux/Fedora/rawhide/Dockerfile b/platforms/Linux/Fedora/rawhide/Dockerfile
@@ -10,14 +10,14 @@ RUN yum install -y rpmdevtools yum-utils
 
 # Add the spec
 RUN mkdir -p /root/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-ADD swift-lang.spec /root/rpmbuild/SPECS/swift-lang.spec
+ADD swiftlang.spec /root/rpmbuild/SPECS/swiftlang.spec
 
 
 # Install all the dependencies needed to build Swift from the spec file itself
-RUN yum-builddep -y /root/rpmbuild/SPECS/swift-lang.spec
+RUN yum-builddep -y /root/rpmbuild/SPECS/swiftlang.spec
 
 # Get the sources for Swift as defined in the spec file
-RUN spectool -g -R /root/rpmbuild/SPECS/swift-lang.spec
+RUN spectool -g -R /root/rpmbuild/SPECS/swiftlang.spec
 
 # Add the patches
 ADD patches/*.patch /root/rpmbuild/SOURCES/
diff --git a/platforms/Linux/Fedora/rawhide/build_rpm.sh b/platforms/Linux/Fedora/rawhide/build_rpm.sh
@@ -19,7 +19,7 @@ yum -y update
 # will have two files: a SRPM file which contains the source files
 # as well as a regular RPM file that can be installed via `dnf' or `yum'
 pushd $HOME/rpmbuild/SPECS
-rpmbuild -ba ./swift-lang.spec 2>&1 | tee $HOME/build-output.txt
+rpmbuild -ba ./swiftlang.spec 2>&1 | tee $HOME/build-output.txt
 popd
 
 # Include the build log which can be used to determine what went
diff --git a/platforms/Linux/Fedora/rawhide/swiftlang.spec b/platforms/Linux/Fedora/rawhide/swiftlang.spec
@@ -8,7 +8,7 @@
 %global swift_crypto_version 1.1.5
 %global ninja_version 1.10.2
 
-Name:           swift-lang
+Name:           swiftlang
 Version:        5.5
 Release:        1%{?dist}
 Summary:        Apple's Swift programming language
diff --git a/platforms/Linux/amazonlinux/2/Dockerfile b/platforms/Linux/amazonlinux/2/Dockerfile
@@ -18,6 +18,6 @@ RUN yum install -y rpmdevtools yum-utils createrepo
 RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
 
 # Optimization: Install all the dependencies needed to build Swift from the spec file itself
-ADD swift-lang.spec /tmp/swift-lang.spec
+ADD swiftlang.spec /tmp/swiftlang.spec
 RUN touch /tmp/metadata.inc # fake metadata is okay for this optimization
-RUN cd /tmp && yum-builddep -y swift-lang.spec
+RUN cd /tmp && yum-builddep -y swiftlang.spec
diff --git a/platforms/Linux/amazonlinux/2/build_rpm.sh b/platforms/Linux/amazonlinux/2/build_rpm.sh
@@ -23,21 +23,21 @@ yum update -y
 mkdir -p $HOME/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 
 # Add the spec
-cp swift-lang.spec $HOME/rpmbuild/SPECS/
+cp swiftlang.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
 # install all the dependencies needed to build Swift from the spec file itself
-yum-builddep -y ./swift-lang.spec
+yum-builddep -y ./swiftlang.spec
 # get the sources for Swift as defined in the spec file
-spectool -g -R ./swift-lang.spec
+spectool -g -R ./swiftlang.spec
 # Now we proceed to build Swift. If this is successful, we
 # will have two files: a SRPM file which contains the source files
 # as well as a regular RPM file that can be installed via `dnf' or `yum'
-rpmbuild -ba ./swift-lang.spec 2>&1 | tee /root/build-output.txt
+rpmbuild -ba ./swiftlang.spec 2>&1 | tee /root/build-output.txt
 popd
 
 # Include the build log which can be used to determine what went
diff --git a/platforms/Linux/amazonlinux/2/swiftlang.spec b/platforms/Linux/amazonlinux/2/swiftlang.spec
diff --git a/platforms/Linux/centos/7/Dockerfile b/platforms/Linux/centos/7/Dockerfile
@@ -18,6 +18,6 @@ RUN yum install -y rpmdevtools yum-utils createrepo
 RUN yum install -y epel-release centos-release-scl
 
 # Optimization: Install all the dependencies needed to build Swift from the spec file itself
-ADD swift-lang.spec /tmp/swift-lang.spec
+ADD swiftlang.spec /tmp/swiftlang.spec
 RUN touch /tmp/metadata.inc # fake metadata is okay for this optimization
-RUN cd /tmp && yum-builddep -y swift-lang.spec
+RUN cd /tmp && yum-builddep -y swiftlang.spec
diff --git a/platforms/Linux/centos/7/build_rpm.sh b/platforms/Linux/centos/7/build_rpm.sh
@@ -23,25 +23,25 @@ yum update -y
 mkdir -p $HOME/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 
 # Add the spec
-cp swift-lang.spec $HOME/rpmbuild/SPECS/
+cp swiftlang.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
 # install all the dependencies needed to build Swift from the spec file itself
-yum-builddep -y ./swift-lang.spec
+yum-builddep -y ./swiftlang.spec
 # Workaround to support clang-3.5 or a later version
 echo -e ". /opt/rh/sclo-git25/enable\n. /opt/rh/llvm-toolset-7/enable\n. /opt/rh/devtoolset-8/enable\n" >> $HOME/.bashrc
 source $HOME/.bashrc
 sed -i -e 's/\*__block/\*__libc_block/g' /usr/include/unistd.h
 # get the sources for Swift as defined in the spec file
-spectool -g -R ./swift-lang.spec
+spectool -g -R ./swiftlang.spec
 # Now we proceed to build Swift. If this is successful, we
 # will have two files: a SRPM file which contains the source files
 # as well as a regular RPM file that can be installed via `dnf' or `yum'
-rpmbuild -ba ./swift-lang.spec 2>&1 | tee /root/build-output.txt
+rpmbuild -ba ./swiftlang.spec 2>&1 | tee /root/build-output.txt
 popd
 
 # Include the build log which can be used to determine what went
diff --git a/platforms/Linux/centos/7/swiftlang.spec b/platforms/Linux/centos/7/swiftlang.spec
diff --git a/platforms/Linux/centos/8/Dockerfile b/platforms/Linux/centos/8/Dockerfile
@@ -19,6 +19,6 @@ RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.n
 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
+ADD swiftlang.spec /tmp/swiftlang.spec
 RUN touch /tmp/metadata.inc # fake metadata is okay for this optimization
-RUN cd /tmp && yum-builddep -y swift-lang.spec
+RUN cd /tmp && yum-builddep -y swiftlang.spec
diff --git a/platforms/Linux/centos/8/build_rpm.sh b/platforms/Linux/centos/8/build_rpm.sh
@@ -23,21 +23,21 @@ yum update -y
 mkdir -p $HOME/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 
 # Add the spec
-cp swift-lang.spec $HOME/rpmbuild/SPECS/
+cp swiftlang.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
 # install all the dependencies needed to build Swift from the spec file itself
-yum-builddep -y ./swift-lang.spec
+yum-builddep -y ./swiftlang.spec
 # get the sources for Swift as defined in the spec file
-spectool -g -R ./swift-lang.spec
+spectool -g -R ./swiftlang.spec
 # Now we proceed to build Swift. If this is successful, we
 # will have two files: a SRPM file which contains the source files
 # as well as a regular RPM file that can be installed via `dnf' or `yum'
-rpmbuild -ba ./swift-lang.spec 2>&1 | tee /root/build-output.txt
+rpmbuild -ba ./swiftlang.spec 2>&1 | tee /root/build-output.txt
 popd
 
 # Include the build log which can be used to determine what went
diff --git a/platforms/Linux/centos/8/swiftlang.spec b/platforms/Linux/centos/8/swiftlang.spec
