From b4bda10e17465fa76d033715de4df2534b614ad5 Mon Sep 17 00:00:00 2001 From: Adriano dos Santos Fernandes Date: Tue, 30 Aug 2022 08:47:47 -0300 Subject: [PATCH] Change Posix/MacOS release filenames. --- .github/workflows/main.yml | 54 +++++++++++-------- appveyor.yml | 6 +-- builds/install/arch-specific/aix/Makefile.in | 50 ++++++++--------- .../install/arch-specific/darwin/Makefile.in | 2 +- builds/install/arch-specific/hpux/Makefile.in | 40 +++++++------- .../install/arch-specific/linux/Makefile.in | 10 ++-- .../arch-specific/linux/linuxLibrary.sh.in | 10 ++-- configure.ac | 9 ++-- 8 files changed, 97 insertions(+), 84 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3251e1470f..7435877cb8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,14 +23,14 @@ jobs: make tests -j4 make run_tests make dist - tar xzvf gen/Firebird-[0-9]*.tar.gz - (cd Firebird-[0-9]*; sudo ./install.sh -silent) + tar xzvf gen/Firebird-*-linux-x64.tar.gz + (cd Firebird-*-linux-x64; sudo ./install.sh -silent) - - name: Upload + - name: Upload installer uses: actions/upload-artifact@main with: name: firebird-ubuntu-20.04-clang-x64 - path: gen/Firebird-*.tar.gz + path: gen/Firebird-*-linux-x64.tar.gz build-linux-docker-x64: runs-on: ubuntu-20.04 @@ -44,11 +44,17 @@ jobs: - name: Build run: /entry.sh - - name: Upload + - name: Upload installer uses: actions/upload-artifact@main with: name: firebird-linux-x64 - path: gen/Firebird-*.tar.gz + path: gen/Firebird-*-linux-x64.tar.gz + + - name: Upload debug symbols + uses: actions/upload-artifact@main + with: + name: firebird-linux-x64-debugSymbols + path: gen/Firebird-*-linux-x64-debugSymbols.tar.gz - name: Snapshot - prepare id: snapshot_prepare @@ -69,7 +75,7 @@ jobs: fail-if-no-release: false fail-if-no-assets: false assets: | - Firebird-*amd64.tar.gz + Firebird-*-linux-x64*.tar.gz - name: Snapshot - release id: snapshot_release_try1 @@ -83,7 +89,7 @@ jobs: prerelease: true token: ${{ secrets.SNAPSHOT_RELEASE_TOKEN }} files: | - gen/Firebird-*amd64.tar.gz + gen/Firebird-*-linux-x64*.tar.gz - name: Snapshot - release (retry) uses: softprops/action-gh-release@v1 @@ -97,7 +103,7 @@ jobs: prerelease: true token: ${{ secrets.SNAPSHOT_RELEASE_TOKEN }} files: | - gen/Firebird-*amd64.tar.gz + gen/Firebird-*-linux-x64*.tar.gz build-linux-docker-x86: runs-on: ubuntu-20.04 @@ -112,11 +118,17 @@ jobs: cd builds/docker/linux/i586-x86_64 ./run-i586.sh - - name: Upload + - name: Upload installer uses: actions/upload-artifact@main with: name: firebird-linux-x86 - path: gen/Firebird-*.tar.gz + path: gen/Firebird-*-linux-x86.tar.gz + + - name: Upload debug symbols + uses: actions/upload-artifact@main + with: + name: firebird-linux-x86-debugSymbols + path: gen/Firebird-*-linux-x86-debugSymbols.tar.gz - name: Snapshot - prepare id: snapshot_prepare @@ -137,7 +149,7 @@ jobs: fail-if-no-release: false fail-if-no-assets: false assets: | - Firebird-*i586.tar.gz + Firebird-*-linux-x86*.tar.gz - name: Snapshot - release id: snapshot_release_try1 @@ -151,7 +163,7 @@ jobs: prerelease: true token: ${{ secrets.SNAPSHOT_RELEASE_TOKEN }} files: | - gen/Firebird-*i586.tar.gz + gen/Firebird-*-linux-x86*.tar.gz - name: Snapshot - release (retry) uses: softprops/action-gh-release@v1 @@ -165,7 +177,7 @@ jobs: prerelease: true token: ${{ secrets.SNAPSHOT_RELEASE_TOKEN }} files: | - gen/Firebird-*i586.tar.gz + gen/Firebird-*-linux-x86*.tar.gz build-alpine-x64: runs-on: ubuntu-20.04 @@ -186,13 +198,13 @@ jobs: make tests -j4 make run_tests make dist - tar xzvf gen/Firebird-[0-9]*.tar.gz + tar xzvf gen/Firebird-*-linux-x64.tar.gz - - name: Upload + - name: Upload installer uses: actions/upload-artifact@main with: name: firebird-alpine-x64 - path: gen/Firebird-*.tar.gz + path: gen/Firebird-*-linux-x64.tar.gz build-windows: runs-on: ${{ matrix.os }} @@ -474,7 +486,7 @@ jobs: mkdir gen/artifacts mv gen/Release/*.pkg gen/artifacts - - name: Upload + - name: Upload installer uses: actions/upload-artifact@main with: name: firebird-macos @@ -499,7 +511,7 @@ jobs: fail-if-no-release: false fail-if-no-assets: false assets: | - Firebird-*x86_64.pkg + Firebird-*-macos-x64*.pkg - name: Snapshot - release id: snapshot_release_try1 @@ -513,7 +525,7 @@ jobs: prerelease: true token: ${{ secrets.SNAPSHOT_RELEASE_TOKEN }} files: | - gen/artifacts/Firebird-*x86_64.pkg + gen/artifacts/Firebird-*-macos-x64*.pkg - name: Snapshot - release (retry) uses: softprops/action-gh-release@v1 @@ -527,4 +539,4 @@ jobs: prerelease: true token: ${{ secrets.SNAPSHOT_RELEASE_TOKEN }} files: | - gen/artifacts/Firebird-*x86_64.pkg + gen/artifacts/Firebird-*-macos-x64*.pkg diff --git a/appveyor.yml b/appveyor.yml index a5731c5a0e..64ef3fc1ac 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,9 +41,9 @@ install: - sh: ./autogen.sh --enable-binreloc --with-builtin-tomcrypt --prefix=/opt/firebird $BUILD_FLAG - sh: make -j4 - sh: make dist - - sh: (mkdir output; tar xzvf gen/Firebird-[0-9]*.tar.gz -C output) - - sh: (cd output/Firebird-[0-9]*; sudo ./install.sh -silent) - - sh: export ARTIFACTS_PATH=`find gen/Firebird-[0-9]*.tar.gz` + - sh: (mkdir output; tar xzvf gen/Firebird-*-linux-$PLATFORM.tar.gz -C output) + - sh: (cd output/Firebird-*-linux-$PLATFORM; sudo ./install.sh -silent) + - sh: export ARTIFACTS_PATH=`find gen/Firebird-*-linux-$PLATFORM.tar.gz` artifacts: - path: $(ARTIFACTS_PATH) diff --git a/builds/install/arch-specific/aix/Makefile.in b/builds/install/arch-specific/aix/Makefile.in index e86926532e..125c1fef4b 100644 --- a/builds/install/arch-specific/aix/Makefile.in +++ b/builds/install/arch-specific/aix/Makefile.in @@ -4,22 +4,22 @@ # version 2.1 of the License, or (at your option) any later version. # You may obtain a copy of the Licence at # http://www.gnu.org/licences/lgpl.html -# +# # As a special exception this file can also be included in modules -# with other source code as long as that source code has been -# released under an Open Source Initiative certificed licence. -# More information about OSI certification can be found at: -# http://www.opensource.org -# +# with other source code as long as that source code has been +# released under an Open Source Initiative certificed licence. +# More information about OSI certification can be found at: +# http://www.opensource.org +# # This module 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 Lesser General Public Licence for more details. -# -# This module was created by members of the firebird development -# team. All individual contributions remain the Copyright (C) of -# those individuals and all rights are reserved. Contributors to -# this file are either listed below or can be obtained from a CVS +# +# This module was created by members of the firebird development +# team. All individual contributions remain the Copyright (C) of +# those individuals and all rights are reserved. Contributors to +# this file are either listed below or can be obtained from a CVS # history command. # # Created by: Mark O'Donohue @@ -43,7 +43,7 @@ FIREBIRD=$(FirebirdInstallPrefix) export -n FIREBIRD export -n INTERBASE -.PHONY: install install-embedded dist packages depotfile tarfile +.PHONY: install install-embedded dist packages depotfile tarfile .PHONY: buildDepot buildTarDir buildImageDir buildRoot buildDebugInfo # Some of these targets are run from the root tree of the build. @@ -63,12 +63,12 @@ BuildVersion=$(FirebirdVersion).$(BuildNum) Version=$(BuildVersion)-$(PackageVersion) # This means something like: FirebirdCS-2.0.0-1.i386.tar -TarDir= Firebird-$(Version).$(CpuType) -TarFile=Firebird-$(Version).$(CpuType).tar -DepotFile=Firebird-$(Version).$(CpuType).depot -RPMFile=Firebird-$(Version).$(CpuType).rpm -DebugDir=Firebird-debuginfo-$(Version).$(CpuType) -DebugFile=Firebird-debuginfo-$(Version).$(CpuType).tar +TarDir= Firebird-$(Version)-linux-$(CpuType) +TarFile=Firebird-$(Version)-linux-$(CpuType).tar +DepotFile=Firebird-$(Version)-linux-$(CpuType).depot +RPMFile=Firebird-$(Version)-linux-$(CpuType).rpm +DebugDir=Firebird-$(Version)-linux-$(CpuType)-debugSymbols +DebugFile=Firebird-$(Version)-linux-$(CpuType)-debugSymbols.tar PkgSrcDir=$(InstallRoot)/$(ArchType) ScriptDir=$(GEN_ROOT)/install/scripts/ @@ -92,18 +92,18 @@ $(DebugFile) : buildImageDir (cd $(GEN_ROOT)/$(DebugDir); tar -cvf ../$(DebugFile) *) # objcopy --add-gnu-debuglink fails with binutils 2.14 or older -# its failure affects only GDB ability to pick up external debug -# symbols automatically. We may use eu-strip command from elfutils -# instead, but it doesn't work or compile with such distros +# its failure affects only GDB ability to pick up external debug +# symbols automatically. We may use eu-strip command from elfutils +# instead, but it doesn't work or compile with such distros # as Mandrake 9.0 not saying about older ones. New binutils -# seem to compile and work everywhere I tried, but we try to -# use eu-strip first since it is a part of default Red Hat 9 +# seem to compile and work everywhere I tried, but we try to +# use eu-strip first since it is a part of default Red Hat 9 # install and is available in binary form for Mandrake 9.1 and newer. # # 28-Dec-2003. Nickolay Samofatov # -# Do not use eu-strip any longer because version 0.89/AMD64 shipped with -# Mandrake 9.2 produces broken debuginfo packages and there is no easy way to +# Do not use eu-strip any longer because version 0.89/AMD64 shipped with +# Mandrake 9.2 produces broken debuginfo packages and there is no easy way to # detect the breakage. Binutils seem to be more reliable alternative to me. # # 05-Apr-2004. Nickolay Samofatov diff --git a/builds/install/arch-specific/darwin/Makefile.in b/builds/install/arch-specific/darwin/Makefile.in index 2020ebaccd..fbf225d3c2 100644 --- a/builds/install/arch-specific/darwin/Makefile.in +++ b/builds/install/arch-specific/darwin/Makefile.in @@ -22,7 +22,7 @@ FB_PLATFORM:=$(CpuType) package: package_firebird -package_firebird: INST_NM=Firebird-$(FB_MAJOR_VERS).$(FB_MINOR_VERS).$(FB_REV_NO)-$(FB_BUILD_NO)-$(FB_PLATFORM) +package_firebird: INST_NM=Firebird-$(FB_MAJOR_VERS).$(FB_MINOR_VERS).$(FB_REV_NO)-$(FB_BUILD_NO)-macos-$(FB_PLATFORM) package_firebird: sed -e 's/_FB_BUILD_SUFFIX_/$(FB_VER_SUFFIX)/g' \ -e 's/_SMFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_SM)/g' \ diff --git a/builds/install/arch-specific/hpux/Makefile.in b/builds/install/arch-specific/hpux/Makefile.in index 0b188c490f..b15b050e75 100644 --- a/builds/install/arch-specific/hpux/Makefile.in +++ b/builds/install/arch-specific/hpux/Makefile.in @@ -4,28 +4,28 @@ # version 2.1 of the License, or (at your option) any later version. # You may obtain a copy of the Licence at # http://www.gnu.org/licences/lgpl.html -# +# # As a special exception this file can also be included in modules -# with other source code as long as that source code has been -# released under an Open Source Initiative certificed licence. -# More information about OSI certification can be found at: -# http://www.opensource.org -# +# with other source code as long as that source code has been +# released under an Open Source Initiative certificed licence. +# More information about OSI certification can be found at: +# http://www.opensource.org +# # This module 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 Lesser General Public Licence for more details. -# -# This module was created by members of the firebird development -# team. All individual contributions remain the Copyright (C) of -# those individuals and all rights are reserved. Contributors to -# this file are either listed below or can be obtained from a CVS +# +# This module was created by members of the firebird development +# team. All individual contributions remain the Copyright (C) of +# those individuals and all rights are reserved. Contributors to +# this file are either listed below or can be obtained from a CVS # history command. # # Created by: Mark O'Donohue # # Contributor(s): -# +# # ROOT=.. @@ -46,7 +46,7 @@ FIREBIRD=$(FirebirdInstallPrefix) export -n FIREBIRD export -n INTERBASE -.PHONY: install dist packages depotfile tarfile +.PHONY: install dist packages depotfile tarfile .PHONY: buildDepot buildTarDir buildImageDir buildRoot buildDebugInfo # Some of these targets are run from the root tree of the build. @@ -73,13 +73,13 @@ Version=$(BuildVersion)-$(PackageVersion) # This means something like: FirebirdCS-2.0.0-1.i386.tar -TarDir= Firebird-$(Version).$(CpuType) -TarFile=Firebird-$(Version).$(CpuType).tar +TarDir= Firebird-$(Version)-linux-$(CpuType) +TarFile=Firebird-$(Version)-linux-$(CpuType).tar TgzFile=$(TarFile).gz -DepotFile=Firebird-$(Version).$(CpuType).depot -RPMFile=Firebird-$(Version).$(CpuType).rpm -#DebugDir=Firebird-debuginfo-$(Version).$(CpuType) -#DebugFile=Firebird-debuginfo-$(Version).$(CpuType).tar +DepotFile=Firebird-$(Version)-linux-$(CpuType).depot +RPMFile=Firebird-$(Version)-linux-$(CpuType).rpm +#DebugDir=Firebird-$(Version)-linux-$(CpuType)-debugSymbols +#DebugFile=Firebird-$(Version)-linux-$(CpuType)-debugSymbols.tar psfFile=firebird.psf PkgSrcDir=$(InstallRoot)/$(ArchType) @@ -97,7 +97,7 @@ packages: tarfile depotfile depotfile: buildRoot $(DepotFile) $(DepotFile): buildDepot - (cd $(GEN_ROOT); /usr/sbin/swpackage -d "| gzip -c > $(DepotFile).gz" -x media_type=tape -s $(psfFile)) + (cd $(GEN_ROOT); /usr/sbin/swpackage -d "| gzip -c > $(DepotFile).gz" -x media_type=tape -s $(psfFile)) tarfile: buildRoot $(TgzFile) diff --git a/builds/install/arch-specific/linux/Makefile.in b/builds/install/arch-specific/linux/Makefile.in index 6f0be55e32..347fbe13eb 100644 --- a/builds/install/arch-specific/linux/Makefile.in +++ b/builds/install/arch-specific/linux/Makefile.in @@ -19,7 +19,7 @@ # All Rights Reserved. # Contributor(s): ______________________________________. # -# +# # ROOT=.. @@ -53,10 +53,10 @@ Version=$(BuildVersion)-$(PackageVersion) # This means something like: FirebirdCS-*.0.0-*.i386.tar.gz -TarDir= Firebird-$(Version).$(CpuType) -TarFile=Firebird-$(Version).$(CpuType).tar.gz -DebugDir=Firebird-debuginfo-$(Version).$(CpuType) -DebugFile=Firebird-debuginfo-$(Version).$(CpuType).tar.gz +TarDir=Firebird-$(Version)-linux-$(CpuType) +TarFile=Firebird-$(Version)-linux-$(CpuType).tar.gz +DebugDir=Firebird-$(Version)-linux-$(CpuType)-debugSymbols +DebugFile=Firebird-$(Version)-linux-$(CpuType)-debugSymbols.tar.gz PkgSrcDir=$(InstallRoot)/$(ArchType) diff --git a/builds/install/arch-specific/linux/linuxLibrary.sh.in b/builds/install/arch-specific/linux/linuxLibrary.sh.in index 90569f4b9a..cbef0d1d41 100644 --- a/builds/install/arch-specific/linux/linuxLibrary.sh.in +++ b/builds/install/arch-specific/linux/linuxLibrary.sh.in @@ -348,22 +348,22 @@ EOF if [ "${fb_install_prefix}" = "${default_prefix}" ] then - # RedHat and Mandrake specific + # RedHat and Mandrake specific if [ -x /sbin/chkconfig ] then /sbin/chkconfig --add ${fb_startup_name} - # Gentoo specific + # Gentoo specific elif [ -x /sbin/rc-update ] then /sbin/rc-update add ${fb_startup_name} default - # Suse specific + # Suse specific elif [ -x /sbin/insserv ] then /sbin/insserv /etc/init.d/${fb_startup_name} - # One more way to register service - used in Debian + # One more way to register service - used in Debian elif [ -x /usr/sbin/update-rc.d ] then /usr/sbin/update-rc.d -f ${fb_startup_name} remove @@ -504,7 +504,7 @@ CorrectLibDir() { checkLibName() { grepFlag=-v - [ "@CPU_TYPE@" = "amd64" ] && grepFlag= + [ "@CPU_TYPE@" = "x64" ] && grepFlag= ldconfig -p | grep -w "${1}" | grep $grepFlag 'x86-64' } diff --git a/configure.ac b/configure.ac index 426bb24361..839b8459e5 100644 --- a/configure.ac +++ b/configure.ac @@ -95,7 +95,7 @@ case "$build" in XE_APPEND(-framework CoreFoundation,LIBS) EDITLINE_FLG=Y SHRLIB_EXT=dylib - CPU_TYPE=ARM64 + CPU_TYPE=arm64 EXPORT_SYMBOLS_STYLE=darwin RAW_DEVICES_FLG=N ;; @@ -109,7 +109,7 @@ case "$build" in XE_APPEND(-framework CoreFoundation,LIBS) EDITLINE_FLG=Y SHRLIB_EXT=dylib - CPU_TYPE=x86_64 + CPU_TYPE=x64 EXPORT_SYMBOLS_STYLE=darwin RAW_DEVICES_FLG=N ;; @@ -123,7 +123,7 @@ case "$build" in XE_APPEND(-framework CoreFoundation,LIBS) EDITLINE_FLG=Y SHRLIB_EXT=dylib - CPU_TYPE=i386 + CPU_TYPE=x86 EXPORT_SYMBOLS_STYLE=darwin ;; @@ -247,7 +247,7 @@ dnl CPU_TYPE=ppc64 EDITLINE_FLG=Y SHRLIB_EXT=so libdir=/usr/lib64 - CPU_TYPE=amd64 + CPU_TYPE=x64 ;; ia64*-*-linux*) @@ -343,6 +343,7 @@ dnl CPU_TYPE=ppc64 AC_DEFINE(LINUX) EDITLINE_FLG=Y SHRLIB_EXT=so + CPU_TYPE=x86 ;; s390x-*-linux*)