Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream #26

Closed
wants to merge 50 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
e860a59
Don't abort if there's no man pages
resuna Aug 17, 2017
5a9013d
Merge remote-tracking branch 'upstream/master'
resuna Aug 24, 2017
5bca00e
Initialize prevf to fix (used before set) warning.
resuna Aug 24, 2017
fbb02f0
Merge remote-tracking branch 'upstream/master'
resuna Aug 25, 2017
f6a6993
Merge remote-tracking branch 'upstream/master'
resuna Aug 31, 2017
9a63266
Merge remote-tracking branch 'upstream/master'
resuna Sep 12, 2017
d95411e
Import tclconfig
resuna Sep 12, 2017
0cfbdc5
Clean up tclconfig?
resuna Sep 13, 2017
ef4efa9
Properly add tclconfig.
resuna Sep 13, 2017
66f99f1
Merge remote-tracking branch 'upstream/master'
resuna Sep 13, 2017
e14c9ad
build hints for FreeBSD
lehenbauer Sep 26, 2017
4af7546
Apply Flightaware DST fix and bump version to 8.6.702
resuna Sep 27, 2017
f6ea6c2
Merge remote-tracking branch 'sebres/master' into merge-20181129
resuna Nov 29, 2018
6b4a7b2
Merge remote-tracking branch 'sebres/master' into merge-20181129
resuna Nov 29, 2018
d1c164f
Merge pull request #1 from flightaware/merge-20181129
resuna Nov 30, 2018
f666ac3
Update version to 8.6.703
resuna Dec 3, 2018
cf355ff
Remove unnecessary tclCompile.h
resuna Jan 8, 2019
8af9a58
Ubuntu, at least, hides the real TCL internal headers so we need to i…
resuna Jan 8, 2019
76bf86c
implemented `clock unixtime` command: scans date-time input string (s…
sebres Jan 10, 2019
da15b27
Merge remote-tracking branch 'sebres/flightaware-unixtime-scan' into …
resuna Jan 10, 2019
f6542d5
Document clock unixtime
resuna Jan 10, 2019
bae3e9f
Typos in readme
resuna Jan 10, 2019
24c2b5c
Merge pull request #2 from flightaware/sebres-unixtime
resuna Jan 31, 2019
328bf71
Update to 8.6.704
resuna Feb 11, 2019
a32d07d
add travis status icon to readme
bovine Feb 28, 2019
eb21fd4
Update .travis.yml
bovine Feb 28, 2019
9e8675e
Fixes #18 (Fails to parse short month name for June);
sebres Jun 14, 2019
877302a
small amend to #18: test cases extended to cover error cases (on ambi…
sebres Jun 14, 2019
8ebee32
Update version for next release.
resuna Jun 14, 2019
5d4bfba
.travis.yml: changed dist to xenial and fixed broken repository link …
sebres Jun 14, 2019
8bbd204
run autoconf in build
resuna Jun 14, 2019
93ac84f
close #19: implements safe "catch" in clock NS - avoid overwrite of i…
sebres Feb 14, 2020
48bdc72
windows: small amend (speedup _hasRegistry in positive case)
sebres Feb 17, 2020
599826b
Update ubuntu version to pull tcl from from disco to eoan.
resuna Apr 16, 2020
af7bca5
Merge pull request #3 from flightaware/merge-sebres-19
bovine Apr 18, 2020
52ed179
Update version for next release.
bovine Apr 24, 2020
4f8ea40
Merge branch 'gh-20--neg-relmonth-offs': fixed relative clock calcula…
sebres May 13, 2020
b08db60
Update version.
resuna May 14, 2020
a046190
Merge pull request #4 from flightaware/merge-sebres-20
bovine May 14, 2020
5550dd3
Allow zoneinfo paths to be overridden with --with-tzpath configure flag
Aug 20, 2021
0abbcfc
Don't re-use cached base fields when TZ changed and using :localtime …
Sep 3, 2021
0242301
Merge pull request #5 from agbrooks/master
resuna Sep 9, 2021
6efd1ca
Fix TEA_ADD_TCL_SOURCES invocation broken by moving clock.tcl => cloc…
Sep 9, 2021
9f949be
Merge pull request #6 from agbrooks/master
resuna Sep 9, 2021
89dd77e
use Github Actions for CI (#8)
bovine Oct 13, 2021
669d2f0
Fix install of clock.tcl (#9)
bovine Oct 14, 2021
1741fdc
Merge remote-tracking branch 'upstream/master' into merge-upstream
bovine Dec 13, 2024
7a023f9
fix: missing paren
bovine Jan 10, 2025
872d875
rm autogenerated configure script
bovine Jan 10, 2025
4dd26ab
use `make test` target
bovine Jan 10, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions .github/workflows/linux-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# This is a basic workflow to help you get started with Actions

name: Linux CI

# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the main branch
push:
branches: [ master ]
pull_request:
branches: [ master ]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- name: Install dependencies
run: |
sudo apt-get update -qq
sudo apt-get install -y tcl8.6-dev

- name: configure
run: |
autoconf
autoreconf -iv
cd unix
../configure --with-tcl=/usr/lib/tcl8.6

- name: make
run: |
cd unix
make

- name: unit tests
run: |
# current time and time-zone:
echo $TZ; timedatectl status
# load local library and execute local test cases:
cd unix
make test

- name: install
run: |
cd unix
sudo make install

- name: runtime test
run: |
echo 'if {[catch {package require tclclockmod; clock format -now} catchResult]} {puts stderr "ERROR! $catchResult"; exit 1} else {puts "OK."}' | tclsh

- name: clean
run: |
cd unix
make clean
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/win/Release_*
/win/nmakehlp.obj
/win/nmakehlp.exe
/configure
/unix/*.o
/unix/*.so
/unix/Makefile
Expand Down
4 changes: 2 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ PKG_HEADERS = @PKG_HEADERS@
PKG_LIB_FILE = @PKG_LIB_FILE@
PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@

lib_BINARIES = $(PKG_LIB_FILE)
lib_BINARIES = $(PKG_LIB_FILE) lib/clock.tcl
BINARIES = $(lib_BINARIES)

SHELL = @SHELL@
Expand Down Expand Up @@ -159,7 +159,7 @@ PKG_CFLAGS = @PKG_CFLAGS@
DEFS = @DEFS@ $(PKG_CFLAGS)

# Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile
CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl
CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl lib/clock.tcl
CLEANFILES = @CLEANFILES@

CPPFLAGS = @CPPFLAGS@
Expand Down
11 changes: 11 additions & 0 deletions README.FreeBSD
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#
# This makes sure that TEA knows about all the necessary bits and stuffs them into configure from configure.in
#
autoreconf

#
# This keeps configure honest if you have both clang and gcc installed
#
CC=clang CXX=clang++ ./configure --prefix=/usr/local --with-tcl=/usr/local/lib/tcl8.6

# Then "make clean" and "make"
8 changes: 8 additions & 0 deletions README.Linux
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#
# This makes sure that TEA knows about all the necessary bits and stuffs them into configure from configure.in
#
autoreconf

env CC="cc -I/usr/include/tcl8.6/tcl-private/generic" ./configure --with-tcl=/usr/lib/tcl8.6

# Then "make clean" and "make"
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[![Build status](https://github.com/flightaware/tclclockmod/actions/workflows/linux-ci.yml/badge.svg)](https://github.com/flightaware/tclclockmod/actions/workflows/linux-ci.yml)

_____ _ ___ _ _ __ __ _
|_ _|_| |/ __| |___ __| |_| \/ |___ __| |
Expand Down Expand Up @@ -78,11 +79,14 @@ be used also with previous versions since 8.6.0 (note that some packages like

Since [TIP 688](https://core.tcl-lang.org/tips/doc/trunk/tip/688.md) (commits [GH/tcl/e736133f9c72](https://github.com/tcltk/tcl/commit/e736133f9c72a69186f1d6845b5fb52de03c23ab) or [CORE/tcl/7137ea11e9e343f6](https://core.tcl-lang.org/tcl/info/7137ea11e9e343f6)) this is a part of Tcl 8.7 / 9.0 and therefore fully compatible to newest core-tcl now, excepting few things (like `clock configure` -> `tcl::unsupported::clock::configure`).

Code status (CI):
-----------------
Differences from base clock: `clock unixtime`
--------------

* GH-actions:
- [![CI-nix](https://github.com/sebres/tclclockmod/actions/workflows/ci-nix.yml/badge.svg)](https://github.com/sebres/tclclockmod/actions/workflows/ci-nix.yml)
Same as "clock scan" except:

* If the -timezone argument is an empty string, it uses timezone UTC
* If the input string is an integer, it assumes it's already a UNIX epoch timestamp and returns it unchanged
* If the input sting is not a valid time, it returns 0 rather than generating an error

Contact:
--------
Expand Down
Loading
Loading