Overview
Comment: | Make sure all Fossil command arguments are formatted properly for Eagle. Fixes to Tk layout. Make sure uploader client user interface has a title. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
a86353b0d1408080303fe3ac98857688 |
User & Date: | mistachkin on 2016-12-23 04:04:01 |
Other Links: | manifest | tags |
Context
2016-12-23
| ||
04:20 | Be careful to avoid modifying the namespace directory variables when formatting arguments to 'exec'. check-in: 84bd59ace2 user: mistachkin tags: trunk | |
04:04 | Make sure all Fossil command arguments are formatted properly for Eagle. Fixes to Tk layout. Make sure uploader client user interface has a title. check-in: a86353b0d1 user: mistachkin tags: trunk | |
02:27 | For the package uploader, if the target platform is 'neutral' or the same as the current platform, use 'automatic' (an empty string) instead. check-in: 378a6a413c user: mistachkin tags: trunk | |
Changes
Modified client/1.0/neutral/pkgr_upload.eagle from [4f244009ce] to [d8f863d4ad].
︙ | ︙ | |||
588 589 590 591 592 593 594 595 596 597 598 599 600 601 | # proc getCheckoutDirectory {} { variable fossilInfoCommand variable fossilInfoLocalRootPattern variable scriptDirectory if {[isEagle]} then { if {[catch { eval exec -nocarriagereturns -stdout output -stderr error \ [subst $fossilInfoCommand] } result] == 0} then { set result [appendArgs $output $error] } else { return false | > > > | 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 | # proc getCheckoutDirectory {} { variable fossilInfoCommand variable fossilInfoLocalRootPattern variable scriptDirectory if {[isEagle]} then { set scriptDirectory [::PackageRepository::formatExecArgument \ $scriptDirectory] if {[catch { eval exec -nocarriagereturns -stdout output -stderr error \ [subst $fossilInfoCommand] } result] == 0} then { set result [appendArgs $output $error] } else { return false |
︙ | ︙ | |||
649 650 651 652 653 654 655 656 657 658 659 660 661 662 | variable checkoutDirectory variable fossilChangesCommand variable fossilChangesPattern verifyCheckoutDirectory if {[isEagle]} then { if {[catch { eval exec -nocarriagereturns -stdout output -stderr error \ [subst $fossilChangesCommand] } result] == 0} then { set result [appendArgs $output $error] } else { return false | > > > | 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 | variable checkoutDirectory variable fossilChangesCommand variable fossilChangesPattern verifyCheckoutDirectory if {[isEagle]} then { set checkoutDirectory [::PackageRepository::formatExecArgument \ $checkoutDirectory] if {[catch { eval exec -nocarriagereturns -stdout output -stderr error \ [subst $fossilChangesCommand] } result] == 0} then { set result [appendArgs $output $error] } else { return false |
︙ | ︙ | |||
685 686 687 688 689 690 691 692 693 694 695 696 697 698 | proc verifyThisIsTheCorrectProject {} { variable fossilInfoCommand variable fossilInfoProjectCodePattern variable projectCode variable scriptDirectory if {[isEagle]} then { if {[catch { eval exec -nocarriagereturns -stdout output -stderr error \ [subst $fossilInfoCommand] } result] == 0} then { set result [appendArgs $output $error] } else { return false | > > > | 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 | proc verifyThisIsTheCorrectProject {} { variable fossilInfoCommand variable fossilInfoProjectCodePattern variable projectCode variable scriptDirectory if {[isEagle]} then { set scriptDirectory [::PackageRepository::formatExecArgument \ $scriptDirectory] if {[catch { eval exec -nocarriagereturns -stdout output -stderr error \ [subst $fossilInfoCommand] } result] == 0} then { set result [appendArgs $output $error] } else { return false |
︙ | ︙ | |||
720 721 722 723 724 725 726 727 728 729 730 731 732 733 | # proc verifyThisIsTheCorrectBranch {} { variable fossilInfoCommand variable fossilInfoTagsPattern variable scriptDirectory if {[isEagle]} then { if {[catch { eval exec -nocarriagereturns -stdout output -stderr error \ [subst $fossilInfoCommand] } result] == 0} then { set result [appendArgs $output $error] } else { return false | > > > | 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 | # proc verifyThisIsTheCorrectBranch {} { variable fossilInfoCommand variable fossilInfoTagsPattern variable scriptDirectory if {[isEagle]} then { set scriptDirectory [::PackageRepository::formatExecArgument \ $scriptDirectory] if {[catch { eval exec -nocarriagereturns -stdout output -stderr error \ [subst $fossilInfoCommand] } result] == 0} then { set result [appendArgs $output $error] } else { return false |
︙ | ︙ | |||
756 757 758 759 760 761 762 763 764 765 766 767 768 769 | proc changeToTheCorrectBranch {} { variable checkoutDirectory variable fossilUpdateCommand verifyCheckoutDirectory if {[isEagle]} then { if {[catch { eval exec -success Success [subst $fossilUpdateCommand] } error]} then { error [appendArgs \ "could not change branch: " $error] } } else { | > > > | 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 | proc changeToTheCorrectBranch {} { variable checkoutDirectory variable fossilUpdateCommand verifyCheckoutDirectory if {[isEagle]} then { set checkoutDirectory [::PackageRepository::formatExecArgument \ $checkoutDirectory] if {[catch { eval exec -success Success [subst $fossilUpdateCommand] } error]} then { error [appendArgs \ "could not change branch: " $error] } } else { |
︙ | ︙ | |||
780 781 782 783 784 785 786 | # NOTE: This procedure attempts to stage the specified package file using # Fossil. The targetDirectory argument is the fully qualified path # to the package platform directory. The fileName argument is the # relative name of the file to be staged. This procedure may raise # script errors. # proc stageOnePackageFile { targetDirectory fileName } { | < > > | < | 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 | # NOTE: This procedure attempts to stage the specified package file using # Fossil. The targetDirectory argument is the fully qualified path # to the package platform directory. The fileName argument is the # relative name of the file to be staged. This procedure may raise # script errors. # proc stageOnePackageFile { targetDirectory fileName } { variable fossilAddCommand if {[isEagle]} then { set targetDirectory [::PackageRepository::formatExecArgument \ $targetDirectory] set fileName [::PackageRepository::formatExecArgument $fileName] if {[catch { eval exec -success Success [subst $fossilAddCommand] } error]} then { error [appendArgs \ "could not stage file \"" $fileName "\": " $error] |
︙ | ︙ | |||
878 879 880 881 882 883 884 885 886 887 888 889 890 891 | set branch [appendArgs pkg_ $package _ $patchLevel] set comment [appendArgs \ "Add package " $package " v" $patchLevel " for " $language \ " v" $version .] if {[isEagle]} then { if {[catch { eval exec -nocarriagereturns -stdout output -stderr error \ [subst $fossilCommitCommand] } result] == 0} then { set result [appendArgs $output $error] } else { return false | > > > > > > | 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 | set branch [appendArgs pkg_ $package _ $patchLevel] set comment [appendArgs \ "Add package " $package " v" $patchLevel " for " $language \ " v" $version .] if {[isEagle]} then { set checkoutDirectory [::PackageRepository::formatExecArgument \ $checkoutDirectory] set branch [::PackageRepository::formatExecArgument $branch] set comment [::PackageRepository::formatExecArgument $comment] if {[catch { eval exec -nocarriagereturns -stdout output -stderr error \ [subst $fossilCommitCommand] } result] == 0} then { set result [appendArgs $output $error] } else { return false |
︙ | ︙ | |||
1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 | variable argumentData variable widgets object load -import System.Windows.Forms set form [object create -alias Form] set widgets(0) $form ########################################################################### set widgets(1) [object create -alias Label] $widgets(1) Name lblApiKey $widgets(1) Text "API Key" | > > | 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 | variable argumentData variable widgets object load -import System.Windows.Forms set form [object create -alias Form] set widgets(0) $form $form Text "Package Uploader Client" ########################################################################### set widgets(1) [object create -alias Label] $widgets(1) Name lblApiKey $widgets(1) Text "API Key" |
︙ | ︙ | |||
1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 | variable widgets package require Tk catch {console show} catch {wm withdraw .}; set toplevel [toplevel .uploader] set widgets(toplevel) $toplevel ########################################################################### set widgets(label,apiKey) [label [appendArgs \ $toplevel .l_apiKey] -text "API Key"] ########################################################################### | > > > | 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 | variable widgets package require Tk catch {console show} catch {wm withdraw .}; set toplevel [toplevel .uploader] set widgets(toplevel) $toplevel wm title $toplevel "Package Uploader Client" wm minsize $toplevel 250 0 ########################################################################### set widgets(label,apiKey) [label [appendArgs \ $toplevel .l_apiKey] -text "API Key"] ########################################################################### |
︙ | ︙ | |||
1536 1537 1538 1539 1540 1541 1542 | pack $widgets(label,apiKey) $widgets(entry,apiKey) \ $widgets(label,package) $widgets(entry,package) \ $widgets(label,patchLevel) $widgets(entry,patchLevel) \ $widgets(label,language) $widgets(entry,language) \ $widgets(label,version) $widgets(entry,version) \ $widgets(label,platform) $widgets(entry,platform) \ $widgets(label,fileNames) $widgets(listbox,fileNames) \ | | > > > > | 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 | pack $widgets(label,apiKey) $widgets(entry,apiKey) \ $widgets(label,package) $widgets(entry,package) \ $widgets(label,patchLevel) $widgets(entry,patchLevel) \ $widgets(label,language) $widgets(entry,language) \ $widgets(label,version) $widgets(entry,version) \ $widgets(label,platform) $widgets(entry,platform) \ $widgets(label,fileNames) $widgets(listbox,fileNames) \ $widgets(button,submit) $widgets(button,clear) \ -expand true -fill both pack $widgets(button,submit) $widgets(button,clear) \ -anchor e -expand false -fill none } # # NOTE: Figure out the fully qualified path to the current script file. # If necessary, add it to the auto-path for the interpreter. The # necessary supporting packages (i.e. the Package Repository and # other support packages) that are assumed to exist in the same |
︙ | ︙ |
Modified client/1.0/neutral/pkgr_upload.eagle.asc from [eef98ab107] to [d5f6bc4b1f].
1 2 3 4 | -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository | | | | | | | | | | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository iQIcBAABCAAGBQJYXKIfAAoJEFAslq9JXcLZ/dkQALpneEN/I53XLHOarmVTsv51 EW6Kznn+3rTlmdJieQ5OJdsJFgPtrm8m7p0nt1+NJmJXIXJCz05p+MTqGh8QMQJ3 9gjw3DXB+nUOkqgt4/voxFyExdKgh5n9yAKXdkm/+8drd4oXjNivZkiza1xquOtT VXqsAdEr7LCYdbCO4GRb4gG9juzm700cpI7KwwlKMsR1HR0rQH0+6OragKkHmT5e 0gXvw6Li0uTO1opokoxQLC3ERR/QU19ZF3YwFzLcGSqeEAt1fGm+tFwn+qYTt44n oIpjLjStugbp0YU/PbZfez6p6e0X2zj4hWcJzn1FMPiNwDBSe/0aWUCe3Fux5Kxn JnfBALHT//H7+HNUhMBs+8YAMwpEPpVduJ/7DiuRe560ma7BMu/fwYlTJxj2t1E7 R8V4WZU6GW69wb78//TP3TtqJsXK5FL9yu5E+2X46wTGTc90mvqKi2kyxLhlXbeA ZaFOI9TunuR8SwwMXWoJdjZJPLFFeREXb+zcif/pdD62Gb18F1UHgHPE4WAP40VZ 4PznKJtwp8bYMdVFcskW70fw9MXs8iWy2RDyebvNHF8F//y4Vp2PFS3qxTvbwWWo qAKAoPplvHGcY6aSLlBjKk1vV9/MfYHu5HUm/HjpJZTPj2vNxKxHnu8O8dPbzPjV tFAYXJZf7HLUcTHmUhu+ =B0Qb -----END PGP SIGNATURE----- |
Modified client/1.0/neutral/pkgr_upload.eagle.harpy from [f3ea5cd867] to [d00d89cdf4].
︙ | ︙ | |||
17 18 19 20 21 22 23 | THE ASSOCIATED SOFTWARE MAY NOT WORK PROPERLY IF THIS FILE IS ALTERED. --> <Certificate xmlns="https://eagle.to/2011/harpy" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <Protocol>None</Protocol> <Vendor>Mistachkin Systems</Vendor> | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | THE ASSOCIATED SOFTWARE MAY NOT WORK PROPERLY IF THIS FILE IS ALTERED. --> <Certificate xmlns="https://eagle.to/2011/harpy" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> <Protocol>None</Protocol> <Vendor>Mistachkin Systems</Vendor> <Id>02e64bd7-ca00-41c9-8e3d-9c2e8e9b0279</Id> <HashAlgorithm>SHA512</HashAlgorithm> <EntityType>Script</EntityType> <TimeStamp>2016-12-23T04:03:16.4218750Z</TimeStamp> <Duration>-1.00:00:00</Duration> <Key>0x9559f6017247e3e2</Key> <Signature> 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 </Signature> </Certificate> |
Modified client/1.0/neutral/pkgr_upload.eagle.harpy.asc from [800a220a00] to [f2576ad358].
1 2 3 4 | -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository | | | | | | | | | | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Eagle Package Repository iQIcBAABCAAGBQJYXKIgAAoJEFAslq9JXcLZLmYP/AiNJIiCUtZoisioQ5yoPnrQ VE82tPyDdHrGU8muyGZXZoU0mixuz6HuodeQRs7wnVglXkNNzBfIYCS3CvuXf/u4 lX67cTriBOviGuUTvh3OopmUvX9Ohq7JaHb7Hwe/EkX21pLz8gD5kdXwkesgzLzD qgGff61sxCf+kpC/37KCJrc++bqv2FemJIw4FZs4mD9ghTWx6J4YiLHdTszhDCIl bUEswj5UjjS6jdfex3CKCSY6PFEsXp8eEjII+C71NZLNcDKgZLQuR5zWGcRyYkyq xxL6QQehPFWsktThy0wIynQNWmzHiovKPtGEI/1Y/6NLXQ7aTZe2Zvd6WammkCqc dd4g4lMFaRAsWzMLFVJgi3sOjlY+rTpWVZjt7hOuZrUbCt+SKhXTAd6z+Y7OVwGp x8ga6RUQQ9Qqyq8U/K8t+nCXoxPnlUpQOW4Z1oG4A7Vwt+YaaM4rliUlu5F6/6iB Yp5zFr6w1HojytRF3Dox/LmfEZVDo66rNIm2XBl47HntiKTHRhryJUVQnXYbL37L H7JcDlSDUMWYazCiTn80kmhLwvjDw/csuj5cQ1AEmIhqNvtR7lpzsRUgurkAjW9R nPpMNf4xYdZLL5cdUtawEezi079CEQN4+BC1Aodcl9lPplJyrwIu61InFAcaGfYV E8Uhn2IypPmGUpudDyfT =XnsE -----END PGP SIGNATURE----- |