Latest upstream autosetup, with project-local s/--debug/--autodebug-debug/ patch...

FossilOrigin-Name: 1d2352a16cc0990037710b4a666f2f3b039c1973e0af29990d67d70bcdba0600

diff --git a/autosetup/autosetup b/autosetup/autosetup
index 239987554ff30f80957441bcb115898b822f7fc4..c3a31bec585e1c0d5556dd9ad8c64720ffcd6c14 100755 (executable)
--- a/autosetup/autosetup
+++ b/autosetup/autosetup
@@ -406,8 +406,8 @@ proc options-add {opts} {
                # Find the corresponding value in the user options
                # and set the default if necessary
                if {[string match "-*" $opt]} {
-                       # This is a documentation-only option, like "-C <dir>"
-                       set opthelp $opt
+                       # We no longer support documentation-only options, like "-C <dir>"
+                       autosetup-error "Option $opt is not supported"
                } elseif {$colon eq ""} {
                        # Boolean option
                        lappend autosetup(options) $name
@@ -1611,7 +1611,7 @@ proc autosetup_output_block {type lines} {
 # Generate a command reference from inline documentation
 proc automf_command_reference {} {
     lappend files $::autosetup(prog)
-    lappend files {*}[lsort [glob -nocomplain $::autosetup(libdir)/*.tcl]]
+    lappend files {*}[lsort [glob -nocomplain $::autosetup(libdir)/{*/*.tcl,*.tcl}]]
 
     # We want to process all non-module files before module files
     # and then modules in alphabetical order.
@@ -2124,7 +2124,7 @@ if {$autosetup(istcl)} {
                        set frame [info frame -$i]
                        if {[dict exists $frame file]} {
                                # We don't need proc, so use ""
-                               lappend stacktrace "" [dict get $frame file] [dict get $frame line]
+                               lappend stacktrace "" [dict get $frame file] [dict get $frame line] ""
                        }
                }
                return $stacktrace
@@ -2181,8 +2181,12 @@ proc error-location {msg} {
        if {$::autosetup(debug)} {
                return -code error $msg
        }
-       # Search back through the stack trace for the first error in a .def file
-       foreach {p f l} [stacktrace] {
+       set vars {p f l cmd}
+       if {!$::autosetup(istcl) && ![dict exists $::tcl_platform stackFormat]} {
+               # Older versions of Jim had a 3 element stacktrace
+               set vars {p f l}
+       }
+       foreach $vars [stacktrace] {
                if {[string match *.def $f]} {
                        return "[relative-path $f]:$l: Error: $msg"
                }
@@ -2534,7 +2538,7 @@ if {[catch {main $argv} msg opts] == 1} {
        show-notices
        autosetup-full-error [error-dump $msg $opts $autosetup(debug)]
        if {!$autosetup(debug)} {
-               puts stderr "Try: '[file tail $autosetup(exe)] --autosetup-debug' for a full stack trace"
+               puts stderr "Try: '[file tail $autosetup(exe)] --debug' for a full stack trace"
        }
        exit 1
 }

diff --git a/autosetup/cc-shared.tcl b/autosetup/cc-shared.tcl
index cbe568018e9683802333396a778e69fc56abe85d..1fa200eec1845ec7710f435a99cfa454a28347f5 100644 (file)
--- a/autosetup/cc-shared.tcl
+++ b/autosetup/cc-shared.tcl
@@ -89,13 +89,15 @@ switch -glob -- [get-define host] {
                        define SH_SOPREFIX -Wl,-h,
                }
        }
-       *-*-hpux {
-               # XXX: These haven't been tested
-               define SHOBJ_CFLAGS "+O3 +z"
+       *-*-hpux* {
+               define SHOBJ_CFLAGS +z
                define SHOBJ_LDFLAGS -b
                define SH_CFLAGS +z
+               define SH_LDFLAGS -b
                define SH_LINKFLAGS -Wl,+s
-               define LD_LIBRARY_PATH SHLIB_PATH
+               define SH_LINKRPATH "-Wl,+b -Wl,%s"
+               define SH_SOPREFIX -Wl,+h,
+               define STRIPLIBFLAGS -Wl,-s
        }
        *-*-haiku {
                define SHOBJ_CFLAGS ""

diff --git a/autosetup/jimsh0.c b/autosetup/jimsh0.c
index b035524c9681ee6dce25408b2c676f4155b85e71..1a6453d0c8c6e4f45ed85a56a789e9892aa012ec 100644 (file)
--- a/autosetup/jimsh0.c
+++ b/autosetup/jimsh0.c
@@ -9132,7 +9132,7 @@ int Jim_StringEqObj(Jim_Obj *aObjPtr, Jim_Obj *bObjPtr)
         const char *sA = Jim_GetString(aObjPtr, &Alen);
         const char *sB = Jim_GetString(bObjPtr, &Blen);
 
-        return Alen == Blen && *sA == *sB && memcmp(sA, sB, Alen) == 0;
+        return Alen == Blen && memcmp(sA, sB, Alen) == 0;
     }
 }
 
@@ -10242,7 +10242,7 @@ static int JimCommandsHT_KeyCompare(void *privdata, const void *key1, const void
     int len1, len2;
     const char *str1 = Jim_GetStringNoQualifier((Jim_Obj *)key1, &len1);
     const char *str2 = Jim_GetStringNoQualifier((Jim_Obj *)key2, &len2);
-    return len1 == len2 && *str1 == *str2 && memcmp(str1, str2, len1) == 0;
+    return len1 == len2 && memcmp(str1, str2, len1) == 0;
 }
 
 static void JimCommandsHT_ValDestructor(void *interp, void *val)
@@ -13864,13 +13864,6 @@ static int JimExprOpNumUnary(Jim_Interp *interp, struct JimExprNode *node)
             case JIM_EXPROP_NOT:
                 wC = !bA;
                 break;
-            case JIM_EXPROP_UNARYPLUS:
-            case JIM_EXPROP_UNARYMINUS:
-                rc = JIM_ERR;
-                Jim_SetResultFormatted(interp,
-                    "can't use non-numeric string as operand of \"%s\"",
-                        node->type == JIM_EXPROP_UNARYPLUS ? "+" : "-");
-                break;
             default:
                 abort();
         }
@@ -19875,22 +19868,16 @@ wrongargs:
                     }
                     else if (errorCodeObj) {
                         int len = Jim_ListLength(interp, argv[idx + 1]);
+                        int i;
 
-                        if (len > Jim_ListLength(interp, errorCodeObj)) {
+                        ret = JIM_OK;
 
-                            ret = -1;
-                        }
-                        else {
-                            int i;
-                            ret = JIM_OK;
-
-                            for (i = 0; i < len; i++) {
-                                Jim_Obj *matchObj = Jim_ListGetIndex(interp, argv[idx + 1], i);
-                                Jim_Obj *objPtr = Jim_ListGetIndex(interp, errorCodeObj, i);
-                                if (Jim_StringCompareObj(interp, matchObj, objPtr, 0) != 0) {
-                                    ret = -1;
-                                    break;
-                                }
+                        for (i = 0; i < len; i++) {
+                            Jim_Obj *matchObj = Jim_ListGetIndex(interp, argv[idx + 1], i);
+                            Jim_Obj *objPtr = Jim_ListGetIndex(interp, errorCodeObj, i);
+                            if (Jim_StringCompareObj(interp, matchObj, objPtr, 0) != 0) {
+                                ret = -1;
+                                break;
                             }
                         }
                     }
@@ -20266,7 +20253,7 @@ static int Jim_DictCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *arg
         }
 
         case OPT_SET:
-            return Jim_SetDictKeysVector(interp, argv[2], argv + 3, argc - 4, argv[argc - 1], JIM_ERRMSG | JIM_UNSHARED);
+            return Jim_SetDictKeysVector(interp, argv[2], argv + 3, argc - 4, argv[argc - 1], JIM_ERRMSG);
 
         case OPT_EXISTS:{
                 int rc = Jim_DictKeysVector(interp, argv[2], argv + 3, argc - 3, &objPtr, JIM_NONE);
@@ -20278,7 +20265,7 @@ static int Jim_DictCoreCommand(Jim_Interp *interp, int argc, Jim_Obj *const *arg
             }
 
         case OPT_UNSET:
-            if (Jim_SetDictKeysVector(interp, argv[2], argv + 3, argc - 3, NULL, JIM_UNSHARED) != JIM_OK) {
+            if (Jim_SetDictKeysVector(interp, argv[2], argv + 3, argc - 3, NULL, JIM_NONE) != JIM_OK) {
                 return JIM_ERR;
             }
             return JIM_OK;

diff --git a/manifest b/manifest
index 0d5e514d199445b991f8169e61326279574d040d..cfaed5efb54c1c4620e0e7ec2fe84b4aec7434da 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Configure\sscript\sportability\simprovements\sfor\sHP-UX\sbuilds,\swith\sthe\shelp\sof\sHP-UX\ssysadmin\sMichael\sOsipov.
-D 2025-09-11T10:09:43.517
+C Latest\supstream\sautosetup,\swith\sproject-local\ss/--debug/--autodebug-debug/\spatch,\sfor\sHP-UX-specific\sconfig\sbootstrapping\scode\sand\slatest\sjimsh.
+D 2025-09-11T10:14:10.498
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -34,17 +34,17 @@ F autoconf/tea/teaish.test.tcl cfe94e1fb79dd078f650295be59843d470125e0cc3a17a141
 F autosetup/LICENSE 41a26aebdd2cd185d1e2b210f71b7ce234496979f6b35aef2cbf6b80cbed4ce4
 F autosetup/README.autosetup a78ff8c4a3d2636a4268736672a74bf14a82f42687fcf0631a70c516075c031e
 F autosetup/README.md ce0f95980a687bb861bd830b76bc4b48513567be5cf5ee7004f4f3439ffe3841
-F autosetup/autosetup 74a9782b68d07934510190fbd03fc6ad92e63f0ea3b5cbffa5f0bd271ad60f01 x
+F autosetup/autosetup b16e44924c197783df67366762dda985b45d49ebc4af15f4054e3ee0e3b65169 x
 F autosetup/autosetup-config.guess dfa101c5e8220e864d5e9c72a85e87110df60260d36cb951ad0a85d6d9eaa463 x
 F autosetup/autosetup-config.sub a38fb074d0dece01cf919e9fb534a26011608aa8fa606490864295328526cd73 x
 F autosetup/autosetup-find-tclsh b08f883f5753cfff1ecb8581f98b314e190b7e3f3059798e274ae5f5aad571af x
 F autosetup/autosetup-test-tclsh 749d20defee533a3842139df47d700fc7a334a5da7bdbd444ae5331744b06c5f
 F autosetup/cc-db.tcl 6e0ed90146197a5a05b245e649975c07c548e30926b218ca3e1d4dc034b10a7b
 F autosetup/cc-lib.tcl 493c5935b5dd3bf9bd4eca89b07c8b1b1a9356d61783035144e21795facf7360
-F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78
+F autosetup/cc-shared.tcl 163eda58c14cd662fd8a504bd2ad8a716ef4db7015dc1de0095d5de8dd601a4b
 F autosetup/cc.tcl c0fcc50ca91deff8741e449ddad05bcd08268bc31177e613a6343bbd1fd3e45f
 F autosetup/find_tclconfig.tcl e64886ffe3b982d4df42cd28ed91fe0b5940c2c5785e126c1821baf61bc86a7e
-F autosetup/jimsh0.c 563b966c137a4ce3c9333e5196723b7ac0919140a9d7989eb440463cd855c367
+F autosetup/jimsh0.c a57c16e65dcffc9c76e496757cb3f7fb47e01ecbd1631a0a5e01751fc856f049
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/proj.tcl ec30c4bc301b6e9eb937655744a7315f863f804fc66400d975bcf9352ac96a1d
 F autosetup/sqlite-config.tcl e06b0f64079c4b303a0544f0619f95a1f1f164cddca4068372949eac4149b6ee
@@ -2174,8 +2174,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P a8635cae05d2bce28d0c0c39b599cf8ca6f3b89b114fbeef519a8024692180c5
-R 0a2863d6d454b5af46a269bdc370a46a
+P 93cf2afa8ca529784f859da2f015bce3a251b23dafa6ca3d1db644a91969e237
+R 445dacc0dc296c0b1e125e047a4ff9de
 U stephan
-Z 957c72de71b6d69dbd25cba7f572989d
+Z c10dff296e209f38ee0d2bb5b1e1cc37
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index e68ee33aa820111826f1ffcb2cd45467cb766203..3990710c5bc850941337fd620669430af1147a32 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-93cf2afa8ca529784f859da2f015bce3a251b23dafa6ca3d1db644a91969e237
+1d2352a16cc0990037710b4a666f2f3b039c1973e0af29990d67d70bcdba0600