firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:00:38 +01:00
Code Issues

Change Posix/MacOS release filenames.

Browse Source
This commit is contained in:
Adriano dos Santos Fernandes 2022-08-30 08:47:47 -03:00
parent d10a82ea65
commit b4bda10e17
8 changed files with 97 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
.github/workflows/main.yml vendored
View File

@ -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

6
appveyor.yml
View File

@ -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)

12
builds/install/arch-specific/aix/Makefile.in
View File

@ -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/

2
builds/install/arch-specific/darwin/Makefile.in
View File

@ -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' \

12
builds/install/arch-specific/hpux/Makefile.in
View File

@ -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)

8
builds/install/arch-specific/linux/Makefile.in
View File

@ -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)

2
builds/install/arch-specific/linux/linuxLibrary.sh.in
View File

@ -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'
}

9
configure.ac
View File

@ -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*)