diff options
| author |   Unit 193 <unit193@unit193.net> | 2023-04-30 18:31:18 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@unit193.net> | 2023-04-30 18:31:18 -0400 |
| commit | 4de57f628bc74f00ba1885e91c84ea07c5405d8f (patch) | |
| tree | 5d91900751e826d491ff1b2ebc571a787e84f864 /Plugins/ScriptingTcl/ScriptingTcl.pro | |
| parent | 74d881cefa9097e58e129e37b9c44d680d8c7dfe (diff) | |
| parent | 3565aad630864ecdbe53fdaa501ea708555b3c7c (diff) | |
Update upstream source from tag 'upstream/3.4.4+dfsg'
Update to upstream version '3.4.4+dfsg'
with Debian dir 482614bd23f0ef52dabc9803477204ad88e917ed
Diffstat (limited to 'Plugins/ScriptingTcl/ScriptingTcl.pro')
| -rw-r--r-- | Plugins/ScriptingTcl/ScriptingTcl.pro | 58 |
1 files changed, 10 insertions, 48 deletions
diff --git a/Plugins/ScriptingTcl/ScriptingTcl.pro b/Plugins/ScriptingTcl/ScriptingTcl.pro index 85d7740..80a11fe 100644 --- a/Plugins/ScriptingTcl/ScriptingTcl.pro +++ b/Plugins/ScriptingTcl/ScriptingTcl.pro @@ -42,9 +42,8 @@ linux: { message("Looking for $$TCL_CONFIG") } !exists($$TCL_CONFIG) { - # Debian case - DEBIAN_ARCH_PATH=$$system(dpkg-architecture -qDEB_HOST_MULTIARCH) - TCL_CONFIG = /usr/lib/$$DEBIAN_ARCH_PATH/tcl$$TCL_VERSION/tclConfig.sh + # Debian, FreeBSD, Ubuntu Bionic case + TCL_CONFIG = $$system(echo "puts [::tcl::pkgconfig get libdir,runtime]" | tclsh)/tcl$$TCL_VERSION/tclConfig.sh } message("Looking for $$TCL_CONFIG") !exists($$TCL_CONFIG) { @@ -81,27 +80,18 @@ linux: { macx: { # Find tclsh - #TCLSH = $$system(echo "puts 1" | tclsh) - #!contains(TCLSH, 1): { - # error("Could not find tclsh executable. ScriptingTcl plugin requires it to find out all Tcl libraries and headers. Make tclsh available in PATH.") - #} - #TCLSH = $$system(which tclsh) + TCLSH = $$system(echo "puts 1" | tclsh) + !contains(TCLSH, 1): { + error("Could not find tclsh executable. ScriptingTcl plugin requires it to find out all Tcl libraries and headers. Make tclsh available in PATH.") + } + TCLSH = $$system(which tclsh) # Find its version - #TCL_VERSION = $$system(echo "puts [info tclversion]" | tclsh) - #message("Found tclsh: $$TCLSH (version: $$TCL_VERSION)") + TCL_VERSION = $$system(echo "puts [info tclversion]" | tclsh) + message("Found tclsh: $$TCLSH (version: $$TCL_VERSION)") # Find tclConfig.sh - #TCL_CONFIG_DIR = $$system(echo "puts [info library]" | tclsh) - #TCL_CONFIG = $$TCL_CONFIG_DIR/../../tclConfig.sh - - XCRUN = $$system(xcrun --version) - !contains(XCRUN, xcrun): { - error("Could not find xcrun executable. ScriptingTcl plugin requires it to find out all Tcl libraries and headers.") - } - - SDK_PATH = $$system(xcrun --show-sdk-path) - TCL_CONFIG = $$SDK_PATH/System/Library/Frameworks/Tcl.framework/Versions/Current/tclConfig.sh + TCL_CONFIG = $$system(echo "puts [::tcl::pkgconfig get libdir,runtime]" | tclsh)/tclConfig.sh # Define other libs required when linking with Tcl eval($$system(cat $$TCL_CONFIG | grep TCL_LIBS)) @@ -148,31 +138,3 @@ win32: { RESOURCES += \ scriptingtcl.qrc - - -TRANSLATIONS += ScriptingTcl_ro_RO.ts \ - ScriptingTcl_de.ts \ - ScriptingTcl_it.ts \ - ScriptingTcl_zh_CN.ts \ - ScriptingTcl_sk.ts \ - ScriptingTcl_ru.ts \ - ScriptingTcl_pt_BR.ts \ - ScriptingTcl_fr.ts \ - ScriptingTcl_es.ts \ - ScriptingTcl_pl.ts - - - - - - - - - - - - - - - - |