8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 20:03:02 +01:00

Move tzdata to extern/icu.

This commit is contained in:
Adriano dos Santos Fernandes 2020-01-21 12:57:31 -03:00
parent 5d1bcc284c
commit 4b6eaa57c3
8 changed files with 11 additions and 7 deletions

View File

@ -19,13 +19,13 @@ jobs:
VERSION=`ls /tmp/icu-checkout/tzdata/icunew/ -r1a |head -1`
echo Last version: $VERSION
if [ "$VERSION" == "`cat tzdata/version.txt`" ]
if [ "$VERSION" == "`cat extern/icu/tzdata/version.txt`" ]
then
exit
fi
echo $VERSION > tzdata/version.txt
tzdata/update.sh
echo $VERSION > extern/icu/tzdata/version.txt
extern/icu/tzdata/update.sh
- name: Create Pull Request
uses: peter-evans/create-pull-request@v2

View File

@ -624,8 +624,8 @@ $(FIREBIRD_MSG): $(BUILD_FILE) msg.timestamp
tzdata: $(FIREBIRD)/tzdata
# FIXME: For big-endian, be.zip must be used.
$(FIREBIRD)/tzdata: $(ROOT)/tzdata/le.zip
unzip -o $(ROOT)/tzdata/le.zip -d $(FIREBIRD)/tzdata
$(FIREBIRD)/tzdata: $(ROOT)/extern/icu/tzdata/le.zip
unzip -o $(ROOT)/extern/icu/tzdata/le.zip -d $(FIREBIRD)/tzdata
$(BUILD_FILE): $(BUILD_Objects) $(COMMON_LIB)
$(EXE_LINK) $(EXE_LINK_OPTIONS) $(LSB_UNDEF) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)

View File

@ -15,7 +15,7 @@ if errorlevel 1 call :ERROR build failed - see make_icu_%FB_TARGET_PLATFORM%.log
@echo Extracting tzdata
mkdir %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\tzdata
call zipjs.bat unzip -source "%FB_LONG_ROOT_PATH%\tzdata\le.zip" -destination %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\tzdata -keep yes
call zipjs.bat unzip -source "%FB_LONG_ROOT_PATH%\extern\icu\tzdata\le.zip" -destination %FB_ROOT_PATH%\temp\%FB_OBJ_DIR%\firebird\tzdata -keep yes
@goto :EOF

View File

@ -9,3 +9,7 @@ https://unicode-org.atlassian.net/browse/ICU-20302
https://github.com/unicode-org/icu/pull/315
The build was done using VS 2017 (15.9).
---
tzdata is automatically updated (pull request created) by GitHub Actions tzdata-update.yml.