mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-02-02 10:00:38 +01:00
Merge pull request #7284 from FirebirdSQL/work/release-filenames
Change release filenames as the following examples
This commit is contained in:
Adriano dos Santos Fernandes
GitHub
commit
14fc962ed3
125
.github/workflows/main.yml
vendored
125
.github/workflows/main.yml
vendored
@ -8,7 +8,8 @@ jobs:
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 10
|
||||
|
||||
@ -23,32 +24,39 @@ 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
|
||||
container: asfernandes/firebird-builder:x86_64-5
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 10
|
||||
|
||||
- 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
|
||||
@ -60,7 +68,7 @@ jobs:
|
||||
echo "::set-output name=snapshot_name::${{ github.ref_name }}"
|
||||
|
||||
- name: Snapshot - delete old assets
|
||||
uses: asfernandes/delete-release-assets@v2
|
||||
uses: mknejp/delete-release-assets@v1
|
||||
if: steps.snapshot_prepare.outputs.snapshot_name
|
||||
with:
|
||||
repository: FirebirdSQL/snapshots
|
||||
@ -69,7 +77,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 +91,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,13 +105,14 @@ 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
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 10
|
||||
|
||||
@ -112,11 +121,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 +152,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 +166,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,14 +180,15 @@ 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
|
||||
container: alpine:3.14
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 10
|
||||
|
||||
@ -186,13 +202,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 }}
|
||||
@ -208,7 +224,8 @@ jobs:
|
||||
platform: [x64, x86]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 10
|
||||
|
||||
@ -229,31 +246,24 @@ jobs:
|
||||
set INNO6_SETUP_PATH=C:\Program Files (x86)\Inno Setup 6
|
||||
if "%PLATFORM%" == "x64" set FB_VS_ARCH=amd64
|
||||
if "%PLATFORM%" == "x64" set FB_PROCESSOR_ARCHITECTURE=AMD64
|
||||
if "%PLATFORM%" == "x64" set FB_OUTPUT_SUFFIX=x64
|
||||
if "%PLATFORM%" == "x86" set FB_VS_ARCH=x86
|
||||
if "%PLATFORM%" == "x86" set FB_PROCESSOR_ARCHITECTURE=x86
|
||||
if "%PLATFORM%" == "x86" set FB_OUTPUT_SUFFIX=win32
|
||||
call "%VS_SCRIPT%" -arch=%FB_VS_ARCH%
|
||||
cd builds\win32
|
||||
call run_all.bat
|
||||
call run_tests.bat
|
||||
|
||||
- name: Extract zip
|
||||
shell: cmd
|
||||
run: |
|
||||
7z x builds\install_images\*.zip -ooutput
|
||||
|
||||
- name: Upload zip
|
||||
uses: actions/upload-artifact@main
|
||||
with:
|
||||
name: firebird-windows-vs-${{ env.VS_VERSION }}-${{ matrix.platform }}-zip
|
||||
path: output
|
||||
path: builds/install_images/Firebird-*-windows-${{ matrix.platform }}.zip
|
||||
|
||||
- name: Upload installer
|
||||
uses: actions/upload-artifact@main
|
||||
with:
|
||||
name: firebird-windows-vs-${{ env.VS_VERSION }}-${{ matrix.platform }}-installer
|
||||
path: builds/install_images/*.exe
|
||||
path: builds/install_images/*-windows-${{ matrix.platform }}.exe
|
||||
|
||||
build-windows-docker:
|
||||
runs-on: windows-2022
|
||||
@ -266,7 +276,8 @@ jobs:
|
||||
platform: [x64, x86]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 10
|
||||
|
||||
@ -276,30 +287,35 @@ jobs:
|
||||
env:
|
||||
PLATFORM: ${{ matrix.platform }}
|
||||
run: |
|
||||
if "%PLATFORM%" == "x64" set FB_OUTPUT_SUFFIX=x64
|
||||
if "%PLATFORM%" == "x86" set FB_OUTPUT_SUFFIX=Win32
|
||||
echo ::set-output name=arch_suffix::%FB_OUTPUT_SUFFIX%
|
||||
echo ::set-output name=arch_suffix::%PLATFORM%
|
||||
mkdir builds\install_images
|
||||
cd builds\docker\windows
|
||||
call build.bat
|
||||
call run.bat C:\fbscripts\build-%PLATFORM%.bat
|
||||
|
||||
- name: Extract zip
|
||||
shell: cmd
|
||||
run: |
|
||||
7z x builds\install_images\*-${{ steps.build.outputs.arch_suffix }}.zip -ooutput
|
||||
|
||||
- name: Upload zip
|
||||
uses: actions/upload-artifact@main
|
||||
with:
|
||||
name: firebird-windows-${{ matrix.platform }}-zip
|
||||
path: output
|
||||
path: builds/install_images/Firebird-*-windows-${{ matrix.platform }}.zip
|
||||
|
||||
- name: Upload zip (withDebugSymbols)
|
||||
uses: actions/upload-artifact@main
|
||||
with:
|
||||
name: firebird-windows-${{ matrix.platform }}-withDebugSymbols-zip
|
||||
path: builds/install_images/Firebird-*-windows-${{ matrix.platform }}-withDebugSymbols.zip
|
||||
|
||||
- name: Upload installer
|
||||
uses: actions/upload-artifact@main
|
||||
with:
|
||||
name: firebird-windows-${{ matrix.platform }}-installer
|
||||
path: builds/install_images/*.exe
|
||||
path: builds/install_images/*-windows-${{ matrix.platform }}.exe
|
||||
|
||||
- name: Upload installer (withDebugSymbols)
|
||||
uses: actions/upload-artifact@main
|
||||
with:
|
||||
name: firebird-windows-${{ matrix.platform }}-withDebugSymbols-installer
|
||||
path: builds/install_images/*-windows-${{ matrix.platform }}-withDebugSymbols.exe
|
||||
|
||||
- name: Snapshot - prepare
|
||||
id: snapshot_prepare
|
||||
@ -321,8 +337,8 @@ jobs:
|
||||
fail-if-no-release: false
|
||||
fail-if-no-assets: false
|
||||
assets: |
|
||||
Firebird-*${{ steps.build.outputs.arch_suffix }}*.exe
|
||||
Firebird-*${{ steps.build.outputs.arch_suffix }}*.zip
|
||||
Firebird-*-windows-${{ steps.build.outputs.arch_suffix }}*.exe
|
||||
Firebird-*-windows-${{ steps.build.outputs.arch_suffix }}*.zip
|
||||
|
||||
- name: Snapshot - release
|
||||
id: snapshot_release_try1
|
||||
@ -336,8 +352,8 @@ jobs:
|
||||
prerelease: true
|
||||
token: ${{ secrets.SNAPSHOT_RELEASE_TOKEN }}
|
||||
files: |
|
||||
builds/install_images/Firebird-*.exe
|
||||
builds/install_images/Firebird-*.zip
|
||||
builds/install_images/Firebird-*-windows-*.exe
|
||||
builds/install_images/Firebird-*-windows-*.zip
|
||||
|
||||
- name: Snapshot - release (retry)
|
||||
uses: softprops/action-gh-release@v1
|
||||
@ -351,14 +367,15 @@ jobs:
|
||||
prerelease: true
|
||||
token: ${{ secrets.SNAPSHOT_RELEASE_TOKEN }}
|
||||
files: |
|
||||
builds/install_images/Firebird-*.exe
|
||||
builds/install_images/Firebird-*.zip
|
||||
builds/install_images/Firebird-*windows-*.exe
|
||||
builds/install_images/Firebird-*windows-*.zip
|
||||
|
||||
build-macos:
|
||||
runs-on: macos-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
fetch-depth: 10
|
||||
|
||||
@ -476,7 +493,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
|
||||
@ -501,7 +518,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
|
||||
@ -515,7 +532,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
|
||||
@ -529,4 +546,4 @@ jobs:
|
||||
prerelease: true
|
||||
token: ${{ secrets.SNAPSHOT_RELEASE_TOKEN }}
|
||||
files: |
|
||||
gen/artifacts/Firebird-*x86_64.pkg
|
||||
gen/artifacts/Firebird-*-macos-x64*.pkg
|
||||
|
||||
2
.github/workflows/trim-trailing-spaces.yml
vendored
2
.github/workflows/trim-trailing-spaces.yml
vendored
@ -17,7 +17,7 @@ jobs:
|
||||
- v4.0-release
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
ref: ${{ matrix.branch }}
|
||||
persist-credentials: false
|
||||
|
||||
2
.github/workflows/tzdata-update.yml
vendored
2
.github/workflows/tzdata-update.yml
vendored
@ -17,7 +17,7 @@ jobs:
|
||||
- v4.0-release
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- uses: actions/checkout@v3
|
||||
with:
|
||||
ref: ${{ matrix.branch }}
|
||||
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=amd64
|
||||
|
||||
set FB_PROCESSOR_ARCHITECTURE=AMD64
|
||||
set FB_OUTPUT_SUFFIX=x64
|
||||
|
||||
xcopy /h /e /i /q C:\firebird C:\firebird-build
|
||||
cd /d C:\firebird-build\builds\win32
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\Common7\Tools\VsDevCmd.bat" -arch=x86
|
||||
|
||||
set FB_PROCESSOR_ARCHITECTURE=x86
|
||||
set FB_OUTPUT_SUFFIX=win32
|
||||
|
||||
xcopy /h /e /i /q C:\firebird C:\firebird-build
|
||||
cd /d C:\firebird-build\builds\win32
|
||||
|
||||
@ -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 <mark.odonohue@ludwig.edu.au>
|
||||
@ -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
|
||||
|
||||
@ -11,8 +11,8 @@ arm=""
|
||||
MakeVersion=gen/Make.Version
|
||||
Build=`grep ^BuildNum ${MakeVersion}|awk '{print $3;}'`
|
||||
Version=`grep ^FirebirdVersion ${MakeVersion}|awk '{print $3;}'`
|
||||
Release="Firebird-${Version}.${Build}-0.arm${arm}.tar.gz"
|
||||
Debug="Firebird-withDebugInfo-${Version}.${Build}-0.arm${arm}.tar.gz"
|
||||
Release="Firebird-${Version}.${Build}-0-android-arm${arm}.tar.gz"
|
||||
Debug="Firebird-${Version}.${Build}-0-android-arm${arm}-withDebugSymbols.tar.gz"
|
||||
Stripped=strip
|
||||
aStrip=${NDK_TOOLCHAIN}/bin/llvm-strip
|
||||
fbRootDir=`pwd`
|
||||
|
||||
@ -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' \
|
||||
|
||||
@ -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 <mark.odonohue@ludwig.edu.au>
|
||||
#
|
||||
# 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)
|
||||
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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'
|
||||
}
|
||||
|
||||
|
||||
@ -175,7 +175,11 @@ set FBBUILD_PROD_STATUS=PROD
|
||||
set FBBUILD_PROD_STATUS=DEV
|
||||
)
|
||||
|
||||
set FBBUILD_FILE_ID=%PRODUCT_VER_STRING%-%FBBUILD_PACKAGE_NUMBER%-%FB_TARGET_PLATFORM%
|
||||
if "%FB_TARGET_PLATFORM%"=="x64" (
|
||||
set FBBUILD_FILE_ID=%PRODUCT_VER_STRING%-%FBBUILD_PACKAGE_NUMBER%-windows-x64
|
||||
) else (
|
||||
set FBBUILD_FILE_ID=%PRODUCT_VER_STRING%-%FBBUILD_PACKAGE_NUMBER%-windows-x86
|
||||
)
|
||||
|
||||
@setlocal
|
||||
@echo.
|
||||
@ -466,7 +470,7 @@ setlocal DisableDelayedExpansion
|
||||
set SKIP_FILES=-x!*.log -x!*.exp -x!*_test.exe -x!installation_readme.txt
|
||||
|
||||
if "%FBBUILD_SHIP_PDB%" == "ship_pdb" (
|
||||
set FBBUILD_ZIPFILE=%FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%-pdb%FBBUILD_FILENAME_SUFFIX%.zip
|
||||
set FBBUILD_ZIPFILE=%FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%-withDebugSymbols%FBBUILD_FILENAME_SUFFIX%.zip
|
||||
) else (
|
||||
set FBBUILD_ZIPFILE=%FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%%FBBUILD_FILENAME_SUFFIX%.zip
|
||||
set SKIP_FILES=%SKIP_FILES% -x!*.pdb
|
||||
|
||||
@ -217,6 +217,12 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if PlatformTarget == "x64"
|
||||
#define ReleasePlatformTarget "x64"
|
||||
#else
|
||||
#define ReleasePlatformTarget "x86"
|
||||
#endif
|
||||
|
||||
;---- If we haven't already set ConfigurationTarget then pick it up from the environment.
|
||||
#ifndef ConfigurationTarget
|
||||
#define ConfigurationTarget GetEnv("FBBUILD_BUILDTYPE")
|
||||
@ -262,12 +268,12 @@
|
||||
|
||||
;Some more strings to distinguish the name of final executable
|
||||
#ifdef ship_pdb
|
||||
#define pdb_str="-pdb"
|
||||
#define pdb_str="-withDebugSymbols"
|
||||
#else
|
||||
#define pdb_str=""
|
||||
#endif
|
||||
#if GetEnv("FBBUILD_BUILDTYPE") == "debug"
|
||||
#define debug_str="-debug"
|
||||
#define debug_str="-withDebugSymbols"
|
||||
#else
|
||||
#define debug_str=""
|
||||
#endif
|
||||
@ -291,8 +297,8 @@ AppVersion={#MyAppVerString}
|
||||
VersionInfoVersion={#MyAppVerString}
|
||||
|
||||
SourceDir={#Root}
|
||||
OutputBaseFilename={#MyAppName}-{#MyAppVerString}-{#PackageNumber}-{#PlatformTarget}{#debug_str}{#pdb_str}{#FilenameSuffix}
|
||||
;OutputManifestFile={#MyAppName}-{#MyAppVerString}-{#PackageNumber}-{#PlatformTarget}{#debug_str}{#pdb_str}{#FilenameSuffix}-Setup-Manifest.txt
|
||||
OutputBaseFilename={#MyAppName}-{#MyAppVerString}-{#PackageNumber}-windows-{#ReleasePlatformTarget}{#debug_str}{#pdb_str}{#FilenameSuffix}
|
||||
;OutputManifestFile={#MyAppName}-{#MyAppVerString}-{#PackageNumber}-windows-{#ReleasePlatformTarget}{#debug_str}{#pdb_str}{#FilenameSuffix}-Setup-Manifest.txt
|
||||
OutputDir=builds\install_images
|
||||
;!!! These directories are as seen from SourceDir !!!
|
||||
#define ScriptsDir "builds\install\arch-specific\win32"
|
||||
|
||||
@ -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*)
|
||||
|
||||
@ -50,7 +50,7 @@ tar -C $SRCROOT -cf - $MEMBERS $MAKEFILES | tar -C $MODULE -xf -
|
||||
|
||||
# Load version information from the tree
|
||||
source $MODULE/src/misc/writeBuildNum.sh
|
||||
PACKNAME="Firebird-$PRODUCT_VER_STRING-$FIREBIRD_PACKAGE_VERSION"
|
||||
PACKNAME="Firebird-$PRODUCT_VER_STRING-$FIREBIRD_PACKAGE_VERSION-source"
|
||||
DIRNAME="$SRCROOT/temp/$PACKNAME"
|
||||
|
||||
echo "Cleaning up"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user