Skip to content

Commit 2b9d7e7

Browse files
committed
Fixes for Tcl 9.0.
1 parent cbdd3df commit 2b9d7e7

File tree

3 files changed

+24
-3
lines changed

3 files changed

+24
-3
lines changed

.appveyor.yml

+20-2
Original file line numberDiff line numberDiff line change
@@ -219,29 +219,47 @@ for:
219219
- brew install tcl-tk
220220
- export TCL_VERSION=`echo 'puts [info tclversion]' | tclsh`
221221
- export BUILD_FILENAME_TAG="-macOS-tcl${TCL_VERSION}-${PLATFORM_CPU_ARCH}-${PLATFORM}-${PLATFORM_OS_VERSION}"
222+
- export BUILD_FILENAME_TAG_ARM="-macOS-tcl${TCL_VERSION}-arm64-${PLATFORM}-${PLATFORM_OS_VERSION}"
222223
- cd ${TKDND_HOME}
223224
- export TKDND_VERSION=`cat ${TKDND_HOME}/VERSION`
224225
- echo ${TKDND_VERSION}
225226
- export TKDND_RUNTIME=${TKDND_HOME}/cmake/runtime
226227
- export FILE_TO_UPLOAD=${TKDND_HOME}/tkdnd-${TKDND_VERSION}${BUILD_FILENAME_TAG}.tgz
227228
- echo ${FILE_TO_UPLOAD}
229+
- export FILE_TO_UPLOAD_ARM=${TKDND_HOME}/tkdnd-${TKDND_VERSION}${BUILD_FILENAME_TAG_ARM}.tgz
230+
- echo ${FILE_TO_UPLOAD_ARM}
231+
228232

229233
build_script:
230234
- echo "Build for macOS"
231235
- cd ${TKDND_HOME}
232236
- ./configure --prefix=${TKDND_RUNTIME} --exec-prefix=${TKDND_RUNTIME} ${CONFIGURE_ARGS} && make && make test
233237
- make install
238+
- cd ${TKDND_RUNTIME}/lib && tar -czvf ${FILE_TO_UPLOAD} tkdnd${TKDND_VERSION} && rm -rf tkdnd${TKDND_VERSION}
239+
## Cross-compile for ARM...
240+
- cd ${TKDND_HOME}
241+
# - CC="clang -march=arm" CFLAGS= CXX="clang++ -march=arm" CXXFLAGS= lhelper create lite-xl-arm -n
242+
- export CC="clang -march=arm"
243+
- export CFLAGS=
244+
- export CXX="clang++ -march=arm"
245+
- export CXXFLAGS=
246+
- ./configure --prefix=${TKDND_RUNTIME} --exec-prefix=${TKDND_RUNTIME} ${CONFIGURE_ARGS} && make && make test
247+
- make install
248+
- cd ${TKDND_RUNTIME}/lib && tar -czvf ${FILE_TO_UPLOAD_ARM} tkdnd${TKDND_VERSION} && rm -rf tkdnd${TKDND_VERSION}
234249

235250
after_build:
236-
- echo `pwd`
237-
- cd ${TKDND_RUNTIME}/lib && tar -czvf ${FILE_TO_UPLOAD} tkdnd${TKDND_VERSION}
238251
- cd ${TKDND_HOME}
239252
- echo ${FILE_TO_UPLOAD}
253+
- echo ${FILE_TO_UPLOAD_ARM}
240254

241255
artifacts:
242256
- path: '*.tgz'
243257
type: tgz
244258
name: tkdnd-${TKDND_VERSION}${BUILD_FILENAME_TAG}.tgz
259+
260+
- path: '*.tgz'
261+
type: tgz
262+
name: tkdnd-${TKDND_VERSION}${BUILD_FILENAME_TAG_ARM}.tgz
245263

246264
# https://github.com/forexample/github-binary-release
247265
# git tag tkdnd-release-test-v2.9.2

Changelog

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2025-01-04 Petasis George <[email protected]>
2+
* win/OleDND.h: Improved support for Tcl 9. (Pull request by Github
3+
user apnadkarni - https://github.com/petasis/tkdnd/pull/72).
14
2025-01-02 Petasis George <[email protected]>
25
* TkDND 2.9.5 has been released.
36

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ It can be used with any Tk version equal or greater to **8.4** and currently onl
88
| OS | Master Branch |
99
---|---
1010
| Linux: Ubuntu Xenial 16.04, x86-64, Tcl/Tk 8.6 | [![Build Status](https://app.travis-ci.com/petasis/tkdnd.svg?branch=master)](https://app.travis-ci.com/github/petasis/tkdnd) |
11-
| Windows, x86, x86-64, Tcl/Tk 8.6 | [![Build status](https://ci.appveyor.com/api/projects/status/vfnx40w79dqsox1y/branch/master?svg=true)](https://ci.appveyor.com/project/petasis/tkdnd/branch/master) |
11+
| Linux, x86, x86-64, Tcl/Tk 8.6 <br> Windows, x86, x86-64, Tcl/Tk 8.6 <br> | macOS Sonoma, x86-64, Tcl/Tk 9.0 (Homebrew) [![Build status](https://ci.appveyor.com/api/projects/status/vfnx40w79dqsox1y/branch/master?svg=true)](https://ci.appveyor.com/project/petasis/tkdnd/branch/master) |
1212
| macOS: macOS 10.13, x86-64, Tcl/Tk 8.5 | [![Build Status](https://app.travis-ci.com/petasis/tkdnd.svg?branch=master)](https://app.travis-ci.com/github/petasis/tkdnd) |
1313
| macOS: macOS 12.6, x86-64, Tcl/Tk 8.6 (Homebrew) | [![Build Status](https://app.travis-ci.com/petasis/tkdnd.svg?branch=master)](https://app.travis-ci.com/github/petasis/tkdnd) |
1414

0 commit comments

Comments
 (0)