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 | 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 | 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 | 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 | 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 | 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 | 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 } { |
︙ | |||
878 879 880 881 882 883 884 885 886 887 888 889 890 891 | 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 | 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 | 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 | 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) \ |
︙ |
Modified client/1.0/neutral/pkgr_upload.eagle.asc from [eef98ab107] to [d5f6bc4b1f].
1 2 3 4 | 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 |
Modified client/1.0/neutral/pkgr_upload.eagle.harpy from [f3ea5cd867] to [d00d89cdf4].
︙ | |||
17 18 19 20 21 22 23 | 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> |
Modified client/1.0/neutral/pkgr_upload.eagle.harpy.asc from [800a220a00] to [f2576ad358].
1 2 3 4 | 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 |