Skip to content

Commit

Permalink
Merge pull-request #9
Browse files Browse the repository at this point in the history 
Former-commit-id: fbf0ec6 [formerly c0238a5f8ebe8bf783e59bc6809ff96c8a536ed1] [formerly 1ee4650e519b53bb557f5e6ba8fc8ed2a7522a85 [formerly 1bfe93059f9906c4785dcd28d661ae3fe069be7b]] [formerly dfab4e8f53db922adb5d53f37fc43e4bd9a0b98e [formerly fc8db69d093da1a1c1d04d7ef377fc9765e81bb7] [formerly c311007feff0936f0d450a20e3187f7ac1e982e2 [formerly 9d040ed25f039d255e765ed54cf2a8a007b53e65]]] [formerly e15ddd699f4d677aecb3450936bebc04ae706475 [formerly 845e572bae16cff281594e55abcbda85a56873c1] [formerly 582ef25e370e45e0dd6c712b12c37f5d11b7c8bf [formerly 1568d0338aa796ca4c3ec0a67a34578bb1e4f168]] [formerly 45f0b6f2eca366788c775962502ac9af5b28c624 [formerly 6ced88e06f822396661b15ffd454de728b7c9d2d] [formerly ea64bdff7b79db4398c83a3b90b12594ffedfc82 [formerly 15728f325eeb9fe9c6df12b322b47e6cba36d55e]]]] [formerly 0cb29a29bf3ec97fdc1ecfba4aeada4de6b8613d [formerly 03f628a9d7e6e91cce83f43ce9215cf756c8bbc4] [formerly 9a6ba79a7fc2522162871df31f29babf3065fffb [formerly f893f3d130060f79148453b742e71fbbfdd651ce]] [formerly d2fbfebe5b4f113012b272990d8e62e8719e20b6 [formerly 5f3b09284c9ad8534af1380207dde05392c8332b] [formerly 3628f96c96fc1eea1ab57356b6341610bfefb08b [formerly c530945284a69978bfbcb6c20c65ed240306001a]]] [formerly 2c0e7bd9485694c326261ff1b134e4ebe1fc20b2 [formerly edd44c991007d747f966636a3b6045cdd8dfa1a7] [formerly 8a4be9cec971c2bb8520ba0bad8884ad8c90cd52 [formerly b6e5686b780b38b10686acea3c5229c261a31367]] [formerly 7d3103191579251d0a03223414262bb330f1b6db [formerly c89356a94b63e5a28774828248a1e10038de68a8] [formerly 878de53e5c1444ea031a9739d8132f70d7942931 [formerly 2eb384e492dd1a89a3c16ecd4ea9599a0d1c5d0d]]]]] [formerly ffffae39b548c275b9abd7ffabf40667437b5394 [formerly ae15d4c2f0b508f51eefdde90a5e11760389e977] [formerly bad174c2a11ca7ecdc195c36c6f9a1b575adfeb9 [formerly f8fbd1984a2e0db193f382eb840f8f0404b1a85b]] [formerly cd0e45cea12eb2c22841fbc6e4d0434ca1884b11 [formerly 56bfb4afcfbd77ed84d5aaecd1610d5342ece36f] [formerly eefa43c4a6a300ada50fc0bd13b021b854fdfbc5 [formerly 49a7d7bb2f6e355ca2f3dc1b9a08ccf2d0de933a]]] [formerly 376d7d9e00990e25c80ca02b8eb7126f0f08e5fa [formerly 97701e9a5db76438297d20a29333f31f02c553f5] [formerly 91c2f92939743961761771ca3877067edb6ae76c [formerly 8da9f66c665bebd1fcce49de0aee8228301825ee]] [formerly 9bedcef676ab1ad29f82142ea5b723216f697f38 [formerly 3f44fca5f4d94081f8229757e6aa36534edb5528] [formerly 499e547e66b220ceb34d545de83a92693579faed [formerly 6f22dd1b5aa3c4b00e8bd096bf216e75eebe5393]]]] [formerly ba366c1b86129aee00b8b99d0461a8798c07b7c8 [formerly 198b104a24093cca8097a6038bb792032cbd0b76] [formerly db6605b6c0d2a1351a0508e5ca4ff701fdabddfb [formerly e664bc0f0ba79d2ad3dd8505142b3cb3542f54cd]] [formerly d50f18c19ae7f9f24f92f718416e13bc5243abfc [formerly 09e38cac7d3ab1e741c6bce327d024f891ae2789] [formerly 301c31f64cbcbcc9aa32356cef59e581b76f4e6b [formerly 5b556f594a5b93d658cb48c8862f4e80b7ff1ffe]]] [formerly 636db4bc74a37cd775e2409180830000d8d8c7bd [formerly f48c85ab3ae6ad545c4b8a9cc9d706e454fa98c0] [formerly 968e11990129be7230b6795b026985b9684d6b67 [formerly 9b92f48ff9ceaf7c392759f2fc1853d1f77e47e1]] [formerly 3e36699d117ca824b1ef388d9589026192ea7cf5 [formerly 364364824f21ea202892c1aea5fff82454084e96] [formerly 1e42854]]]]] [formerly 1e42854 [formerly 7467ba524bff8fa580ac67b9ef50ced4637ee51c]] [formerly a2b2b49fe27b30899de289bd463bc4b494a1bb85 [formerly 1e42854 [formerly 7467ba524bff8fa580ac67b9ef50ced4637ee51c] [formerly a2b2b49fe27b30899de289bd463bc4b494a1bb85 [formerly c08079242ab56a05c9f6c775402ae223a66d3191]]]] [formerly e41e05b7102d31740466ab8fd9395c3ac40fac49 [formerly e41e05b7102d31740466ab8fd9395c3ac40fac49 [formerly 541bd85a6330e679968904ed531e95df9d5e9c46]] [formerly c9867b90af42e60bdf2f89f46cf3dbb4ccaf4ca9 [formerly 1e42854 [formerly 7467ba524bff8fa580ac67b9ef50ced4637ee51c] [formerly a2b2b49fe27b30899de289bd463bc4b494a1bb85 [formerly c08079242ab56a05c9f6c775402ae223a66d3191]] [formerly e41e05b7102d31740466ab8fd9395c3ac40fac49 [formerly 541bd85a6330e679968904ed531e95df9d5e9c46] [formerly c9867b90af42e60bdf2f89f46cf3dbb4ccaf4ca9 [formerly d51dbb4ef931416b16180e6fbd263d7596d20e6b]]]]]] [formerly f65bc39fba19e2b39f86bd95a73b25acebaa19df [formerly f65bc39fba19e2b39f86bd95a73b25acebaa19df [formerly 0aced3afc995a13efec67b3514fbe4e29fd340d8]] [formerly 72eb594cc42ae93ceebde967364f60eea842ccdc [formerly f65bc39fba19e2b39f86bd95a73b25acebaa19df [formerly 0aced3afc995a13efec67b3514fbe4e29fd340d8] [formerly 72eb594cc42ae93ceebde967364f60eea842ccdc [formerly 28ab1bfc26de55624a976d3d96747a5add846acf]]]] [formerly 275c68fdfedee5e054ecf5b53d6ac1eb786db37d [formerly 275c68fdfedee5e054ecf5b53d6ac1eb786db37d [formerly 6078b7e4506c509bac66240843e021d73d696723]] [formerly 0b18c6c0b975da602f9948cf6b4c2179d8202817 [formerly 2c142658f1917db7608fc7357e6176fd36e3c473] [formerly 381aa20bd303334d1cf20ba4d4dabe9b5b22fdff [formerly bc498080510c9aa8562912b25ccd246a92e072ab]] [formerly 8534c7c995b09caa8cebee9d25deeea8dce4e7b3 [formerly 33ac280bd9da94b73a82da7ea23476e918be3a04] [formerly fdc864728643a482dfa8f995141cb77defd7435e [formerly 4369686733b4c2cd1bf0fd3308a4ef4cdaa9ab16]]] [formerly dfbe1ac5a051a807e3b659e44d77da5d88d5939e [formerly 5b120a9f16c3f1155086780a4d9c0318e3cd5da2] [formerly 7bd24342d80a04c30c8f5a2a2e5708569ceff186 [formerly 6042370f2324519d5a1d4bd7c981afa8d6fc2b94]] [formerly aebf6aa6e60e34ff101eadbc3071795a543588be [formerly 14c305dff9f3fe88c4cffa98b0144ff5b364b12e] [formerly 872eb441d8e19c019eaeee704613acb47a22dfae]]] [formerly c2a426d [formerly de2c0cc0bd65939048f71a2fdc11bdd83e0ae2cd] [formerly 7c3170feb9e26badc0829614e0fd48cfe19832f0 [formerly 0a0a6c6e5061c05ca76b067e565c6b4b727a8839]] [formerly 06833adae211d322d89d409a60ea625edd1568b5 [formerly 5726afcf5e87319640f1b35aebd4ab1a9adbfc42] [formerly 72225441a613f93f59f8b97e52ba4082f8fcbf84 [formerly fb4e459e755612bb79fe54cb236cfe2ac456a7cf]]] [formerly 84863a1990021fee9a703b8c7227d337923a4968 [formerly f3276cfc9b76fbf610deec68b105ca9b22cf90b1] [formerly a6e27ea4893c9d1c31a8d6017f29c1a83da228a6 [formerly 2f3965e6467e1cceac54f2a0c8d19249774ec5cc]] [formerly 67067c0e2a3e3d2702657fc6451bc59159a17009 [formerly b768230711dbd0387f67be07aeee5ad9b0060266] [formerly 8408f34cf6f58bbf8c479c4c7f4557e24bfd1698]]] [formerly e17354ba3f443ec50785ab743650a550e2dbdcf9 [formerly 1f5fb90cbfc770e0de9a2a86f7625331766c908f] [formerly dccbac783c51687192dbe04dccc502918ede936e [formerly 648f13adb0a2fbfa64db34495933e27a3e714014]] [formerly d6a85bf3f02b59396919687d011f4691d7c58085 [formerly dcf2a0655c7e29b688b8fccedc1a7a721562583b] [formerly 98de0280fc400f990c8e2728269f925da856a33b [formerly 0d15950702ae20f775cbac07f4e464598e9bce66]]] [formerly ef367db10e4372bbe28d778601edc827d672a9e3 [formerly f7d22a5cb541d172a110a9eef38e6145d31e4901] [formerly 56276c157e95da2562d8cec5eff20db78de25697 [formerly 97dd2e5f097dd42dfe19ebcdeb36885a1bd3efc6]] [formerly 48b4af8250e6378118e5abba3f5559d42916f94f [formerly dc530605add0032df4f3dd590723b49fcadeb7af] [formerly 8408f34cf6f58bbf8c479c4c7f4557e24bfd1698 [formerly 5037a2e]]]]] [formerly 0b18c6c0b975da602f9948cf6b4c2179d8202817 [formerly 2c142658f1917db7608fc7357e6176fd36e3c473] [formerly 381aa20bd303334d1cf20ba4d4dabe9b5b22fdff [formerly bc498080510c9aa8562912b25ccd246a92e072ab]] [formerly 8534c7c995b09caa8cebee9d25deeea8dce4e7b3 [formerly 33ac280bd9da94b73a82da7ea23476e918be3a04] [formerly fdc864728643a482dfa8f995141cb77defd7435e [formerly 4369686733b4c2cd1bf0fd3308a4ef4cdaa9ab16]]] [formerly dfbe1ac5a051a807e3b659e44d77da5d88d5939e [formerly 5b120a9f16c3f1155086780a4d9c0318e3cd5da2] [formerly 7bd24342d80a04c30c8f5a2a2e5708569ceff186 [formerly 6042370f2324519d5a1d4bd7c981afa8d6fc2b94]] [formerly aebf6aa6e60e34ff101eadbc3071795a543588be [formerly 14c305dff9f3fe88c4cffa98b0144ff5b364b12e] [formerly 872eb441d8e19c019eaeee704613acb47a22dfae]]] [formerly 1e42854 [formerly 7467ba524bff8fa580ac67b9ef50ced4637ee51c] [formerly a2b2b49fe27b30899de289bd463bc4b494a1bb85 [formerly c08079242ab56a05c9f6c775402ae223a66d3191]] [formerly e41e05b7102d31740466ab8fd9395c3ac40fac49 [formerly 541bd85a6330e679968904ed531e95df9d5e9c46] [formerly c9867b90af42e60bdf2f89f46cf3dbb4ccaf4ca9 [formerly d51dbb4ef931416b16180e6fbd263d7596d20e6b]]] [formerly f65bc39fba19e2b39f86bd95a73b25acebaa19df [formerly 0aced3afc995a13efec67b3514fbe4e29fd340d8] [formerly 72eb594cc42ae93ceebde967364f60eea842ccdc [formerly 28ab1bfc26de55624a976d3d96747a5add846acf]] [formerly 275c68fdfedee5e054ecf5b53d6ac1eb786db37d [formerly 6078b7e4506c509bac66240843e021d73d696723] [formerly 872eb441d8e19c019eaeee704613acb47a22dfae [formerly 6938a0c]]]]]]]]]]
Former-commit-id: f970337bafc673c20af187b76be8f390924dd247 [formerly f970337bafc673c20af187b76be8f390924dd247 [formerly 0bb81ac7a7aaeccc81d0114611e78fca006a5133]] [formerly f64cbc91a754d06fbeaaedb910d9e71daff9142b [formerly f970337bafc673c20af187b76be8f390924dd247 [formerly 0bb81ac7a7aaeccc81d0114611e78fca006a5133] [formerly f64cbc91a754d06fbeaaedb910d9e71daff9142b [formerly a11ffcc47266390baba1fb076aa9c86f8fdb61de]]]] [formerly 38100a0f8931b943d701e6ca12787d7bb733699a [formerly 38100a0f8931b943d701e6ca12787d7bb733699a [formerly b8abc506d1b07b602406bb355db5ee314b6b980f]] [formerly e161d0aa929ea2acf20eec68c8ca2c3da1c2b6e0 [formerly 9bb596cc32c789f60edc70a090a5bdcf594c6548] [formerly 4e02a853be888e90d4741983ce01d6607a5a1720 [formerly c01c0d94b0638a00916320c84a3e94d053b46116]] [formerly d813225a66e5dabc9bf7b560fe6a9a42e1f24df5 [formerly 9dd4be9d6459451ae8958d6fec854ca20536ea67] [formerly fde1c71afb9704ba4fc15d7afac569936d442a89 [formerly ab26c26816112bafbf8ff3aca8cfab4380034eff]]] [formerly 599a36469e57b47c214258fd2e60ff2e09834b44 [formerly f0177ec9f29c081c833e0f38eb05cb127fe9844c] [formerly 11cc3cfd37f5e673abc15c2b15349e05bb1b6c96 [formerly 70e6204d86029671b27a2d87753d62856a2bbc66]] [formerly 8828cb36e03d1b789e09ef3c9b28f6dfe676ab40 [formerly ee46e4fef28caa05daccf1940b6caafa025c5244] [formerly 7a38b21ec5ec9ddf68c12682af07d3fe8552577e]]] [formerly 26affb7 [formerly eedb680862051814a1a7045d754d62fe9983517a] [formerly fd85422cf5b3c8a9855346d1f96256c033e6da09 [formerly fcaf4758c2e998e4e61069cb5a58d0865f4bf9cf]] [formerly ee115e62cbe29d43360f12982a56636263d80e9d [formerly 462b51190defc378da18acb87febb1c20fbb4da8] [formerly 4874888d54e1f71ba30aca653de6933631a880a4 [formerly ce3521a2158cbeb69f620015294a6dfae4d08075]]] [formerly 6d30b882094f1cc0c167265605cc3c9edfa6f535 [formerly 7acf4fb14008665400249c3f2e302c797cee383d] [formerly d929474aeb3cdfe8c40939b16c41f6c425d02ecd [formerly 2401b3287bec3ad45665bd8c06b829855989aeb0]] [formerly 2b416739d71be0ed3bd1ceb9e7fab3292914086c [formerly 2559aab5ae8f61073a19b85b448f9ea2d048d91f] [formerly e7b5a6335418092ea373137a189c1fe591635ebe]]] [formerly dcf80bd62ed91240a219658c9d9f2535f3bbbcc8 [formerly a005c0e3856ce7c5d9f4daea67983b42ce02d664] [formerly 0e22ca35c98194133af5e0133633b75fc4ccef68 [formerly b69aa848b4cd77bb97256f5a29f3a43de2e5865f]] [formerly d3bebd80712b6fdcfc5189ec1d5dd41ea751d776 [formerly 81a43cac7e3247c11ff5193eb4d385760ac507cb] [formerly fd8bca5b151a5c4a9e887013a7e8b3fd6bab770d [formerly e994fb18dda4340c2b613166ecdccbbde8967b48]]] [formerly cc251cc8ca7cdbc4d75a53ac2d3b41e67680e1c3 [formerly 58264370c8bef931bbb9b8f32bfd98ebb3bb0659] [formerly 8e97587a30dcf9304e8c3812c0e0cd8170566b90 [formerly 36d6ce942dc99f76d1cd0745a731268012a5d51a]] [formerly 56630180c4f33478ce57e8771a88dde990141e47 [formerly c0387f570a24daf936005902b1fd517be5b979dc] [formerly e7b5a6335418092ea373137a189c1fe591635ebe [formerly 403d5b4]]]]] [formerly e161d0aa929ea2acf20eec68c8ca2c3da1c2b6e0 [formerly 9bb596cc32c789f60edc70a090a5bdcf594c6548] [formerly 4e02a853be888e90d4741983ce01d6607a5a1720 [formerly c01c0d94b0638a00916320c84a3e94d053b46116]] [formerly d813225a66e5dabc9bf7b560fe6a9a42e1f24df5 [formerly 9dd4be9d6459451ae8958d6fec854ca20536ea67] [formerly fde1c71afb9704ba4fc15d7afac569936d442a89 [formerly ab26c26816112bafbf8ff3aca8cfab4380034eff]]] [formerly 599a36469e57b47c214258fd2e60ff2e09834b44 [formerly f0177ec9f29c081c833e0f38eb05cb127fe9844c] [formerly 11cc3cfd37f5e673abc15c2b15349e05bb1b6c96 [formerly 70e6204d86029671b27a2d87753d62856a2bbc66]] [formerly 8828cb36e03d1b789e09ef3c9b28f6dfe676ab40 [formerly ee46e4fef28caa05daccf1940b6caafa025c5244] [formerly 7a38b21ec5ec9ddf68c12682af07d3fe8552577e]]] [formerly d4ec379 [formerly 03f83a5316eb5181d79666ed1fa93d80446c12f7] [formerly ca9ae1b606b1845d581a526edadac5353640e6d8 [formerly 18db91dde30731081954f0d92996c543fe7b475a]] [formerly 593703860ef50a2d9d1aee34b5cf3953c2e5d216 [formerly 55ab60c60ce81d8435d1f3be5388d358c99bf1ec] [formerly 2305dd3b8af99fa9b0432cbbd5ae6b6c452ecaa2 [formerly cebf9bccd942496a6671a27e805188701e87df43]]] [formerly f970337bafc673c20af187b76be8f390924dd247 [formerly 0bb81ac7a7aaeccc81d0114611e78fca006a5133] [formerly f64cbc91a754d06fbeaaedb910d9e71daff9142b [formerly a11ffcc47266390baba1fb076aa9c86f8fdb61de]] [formerly 38100a0f8931b943d701e6ca12787d7bb733699a [formerly b8abc506d1b07b602406bb355db5ee314b6b980f] [formerly 7a38b21ec5ec9ddf68c12682af07d3fe8552577e [formerly 671b1df]]]]]]]]]
Former-commit-id: 593703860ef50a2d9d1aee34b5cf3953c2e5d216 [formerly 593703860ef50a2d9d1aee34b5cf3953c2e5d216 [formerly 55ab60c60ce81d8435d1f3be5388d358c99bf1ec]] [formerly 2305dd3b8af99fa9b0432cbbd5ae6b6c452ecaa2 [formerly d4ec379 [formerly 03f83a5316eb5181d79666ed1fa93d80446c12f7] [formerly ca9ae1b606b1845d581a526edadac5353640e6d8 [formerly 18db91dde30731081954f0d92996c543fe7b475a]] [formerly 593703860ef50a2d9d1aee34b5cf3953c2e5d216 [formerly 55ab60c60ce81d8435d1f3be5388d358c99bf1ec] [formerly 2305dd3b8af99fa9b0432cbbd5ae6b6c452ecaa2 [formerly cebf9bccd942496a6671a27e805188701e87df43]]]]]
Former-commit-id: ca9ae1b606b1845d581a526edadac5353640e6d8 [formerly d4ec379 [formerly 03f83a5316eb5181d79666ed1fa93d80446c12f7] [formerly ca9ae1b606b1845d581a526edadac5353640e6d8 [formerly 18db91dde30731081954f0d92996c543fe7b475a]]]
Former-commit-id: d4ec379 [formerly 03f83a5316eb5181d79666ed1fa93d80446c12f7]
Former-commit-id: 3eb75549d6f680ddb6424453ae81473d7f473d0f [formerly 78ca92ec66d0f1efb9649279e5fa54881ce3a7a0] [formerly c62d6a706ce255054eb34f3d3e36924c0d20dd79 [formerly 2353a74518f4f249751167fce04ab816b13303aa]] [formerly f387ce12925b686c70d742397d08492b1f7a9f7b [formerly 5813709203418a6eef583c1d2d7fd6f15cd27962] [formerly 804677533f1c080af64657a8693de2bb5e12e861 [formerly 60b4e7d6819040a90a5fabbb7d64f8134a053eeb]]] [formerly 380388247c5f090d5b0ee47b48cf5150daf56c6c [formerly ba1f36395dfce4ac1c498bde9b80b7d5581b32d8] [formerly 1770761fe0bbbc935527e26bd0fcc2a6cca07bbd [formerly d8bb3bcc6a6532ec39d663d676e6f99d03d86f9d]] [formerly cbcaaec55eea8e31c0d945ed8ac8393d4fcffc6c [formerly 845cf692cdb2cf8c6f3a8cf5dc035c4c6bc1d878] [formerly 657d93d9180101a603104ee5cb3bf6d1f21284f6 [formerly eb649cef7f9c71e38fa07465a751a31861ccc0cb]]]] [formerly 850d57561573e4f17075e372b6aa0cbff85570f6 [formerly acf907252e36e8c809bdffa4821fa77aa10dcae3] [formerly 3cc2236ecef7bc184abfc6af19665e64b447b390 [formerly be1d860b60b893782eb6c1cc8d5773177268243e]] [formerly 4917f6ad2bdcbd02c93f544a52b9201e460cd839 [formerly d2467fca16953b30c6bc9d702805eb54d84a8aed] [formerly 5a87cb803acc268eba1b0ea281cdbf7e999a900b [formerly 543729a68a325659c38c4cec719cfe8e7af7ad63]]] [formerly 4c5ff3f785aa279dbc0ed5ee605b0b27199bfb2e [formerly a3898ae335caf9513caf0b81c50dcece5274230c] [formerly 12d81eb4fa9b6aafe500f084c73e990782a80026 [formerly 06d2b21daaa5329554eb4d3b09b6318178140f98]] [formerly 68bc9da4c460a438669432a2bc8e860b396695f6 [formerly 9c7ee4ca48db3931401c620a740c49da7946bf4c] [formerly d4ec379]]]]
Former-commit-id: 070d92f31ba9de5160f213d4ad659d943f16166d [formerly d12516b6d9a8c091d5c5f2759ba11cfb50092368] [formerly eb14f4c662000249a00fe7671d692f5c661f9547 [formerly 2e75cdb2159134a125962198f3c95281e523414d]] [formerly 19aba383fabefec7a87f1017cb1ba9f006375d8f [formerly 0c7487d0899f640380621926abb1e12a1ccc4d1f] [formerly b09eed45a1ff74f8acb1d765671d086c8b6090c2 [formerly 279f05f5c5e4570ceccadd99a69e5dafd5e7d097]]] [formerly 2101e3b96a8f9597bca89d990d72ecea639c6cea [formerly 3d598ff647acec2972b588e7d385006f08bc2f03] [formerly d29a85e56160766bf861ea56f752af85a88c9168 [formerly e0517e350ec4efec7f661dc7a82879caae5f5018]] [formerly c3b4955bfbbe575e928f6bc5b73ef3dc630e13c7 [formerly b841225db868ed9b2f0bce917b511773095f2a78] [formerly 07bb215246c27a77f5723332396041a45a7fc9fb [formerly 09e4d900d1ada3475be1d8ef01902501369eb255]]]]
Former-commit-id: d86c1b76e76cc36a4372e1f2c301a6ee7c47a605 [formerly d6db5b03f38bbfefbb1c7c29e6fd5b256e07217c] [formerly 08b0a53c1b13c2fdeef3f6d2b9a59100984d9876 [formerly 3a1847ae8f3757c88a1e9f2ea2c051c3adf0b821]] [formerly 8cbc852fe998ab000141ddf29749b560f0f4829e [formerly 11ae3ac96178c35b6c8453cf7402a3bfda48fb6e] [formerly 86bac00ec45775c55d57a4938e0e31971fddca89 [formerly aa54dfbb99645f893fb28fe102b79de021236780]]]
Former-commit-id: 1a929edfd84fe33871ab8898f8ca8c31437deb04 [formerly 3900ff636086f4964e8874abb0ce22c385780afd] [formerly e5d3dd7a349a4bc6cea2851bd6067f6eb66480eb [formerly 342a6aedbe3ea43ca8cbc5c879591eff4c6da962]]
Former-commit-id: b1ea206a3d53a6e47524b6aff7d42bf34a80bb6a [formerly 1a912ffdb5e3e0a189ab1d3037f7d3a6b45a899d]
Former-commit-id: 62ac7150f398c0b1892583422c2970086303f1e2
  • Loading branch information
@r-n-o
r-n-o committed Apr 13, 2023
2 parents e0797ef + 9214526 commit c24db6f
Show file tree
Hide file tree
Showing 39 changed files with 3,486 additions and 90 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dist/*-amd64 filter=lfs diff=lfs merge=lfs -text
dist/*-arm64 filter=lfs diff=lfs merge=lfs -text
dist/*-386 filter=lfs diff=lfs merge=lfs -text
13 changes: 9 additions & 4 deletions .github/workflows/go-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,13 @@ jobs:
with:
go-version: 1.19

- name: Build binary
run: make build/turnkey

- name: Test
run: go test -v ./...
env:
GOHOSTOS: linux
GOHOSTARCH: amd64
GOOS: linux
GOARCH: amd64
run: |
cd src
go build -o ../out/turnkey.linux-x86_64 main.go
go test -v ./...
6 changes: 5 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@
.DS_Store

# Dist/build folder
dist/
build/

# Vscode-related configs
.vscode

# Toolchain
/cache
/out
.*
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "src/toolchain"]
path = src/toolchain
url = https://codeberg.org/distrust/toolchain
51 changes: 0 additions & 51 deletions .goreleaser.yaml
View file

This file was deleted.

84 changes: 72 additions & 12 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,77 @@
.PHONY: all
all: build
include $(PWD)/src/toolchain/Makefile

.PHONY: local-release
local-release:
goreleaser release --snapshot --rm-dist
KEYS := \
6B61ECD76088748C70590D55E90A401336C8AAA9 \
A8864A8303994E3A18ACD1760CAB4418C834B102 \
66039AA59D823C8BD68DB062D3EC673DF9843E7B \
DE050A451E6FAF94C677B58B9361DEC647A087BD

.PHONY: test
test: build/turnkey
go test ./...
ifneq ("$(wildcard $(ROOT)/src/toolchain)","")
clone := $(shell git submodule update --init --recursive)
endif

.DEFAULT_GOAL :=
.PHONY: default
default: \
toolchain \
$(DEFAULT_GOAL) \
$(patsubst %,$(KEY_DIR)/%.asc,$(KEYS)) \
$(OUT_DIR)/turnkey.linux-x86_64 \
$(OUT_DIR)/turnkey.linux-aarch64 \
$(OUT_DIR)/turnkey.darwin-x86_64 \
$(OUT_DIR)/turnkey.darwin-aarch64 \
$(OUT_DIR)/Formula/turnkey.rb \
$(OUT_DIR)/release.env \
$(OUT_DIR)/manifest.txt

build/turnkey: main.go internal/
go build -o build/turnkey main.go
.PHONY: install
install: default
mkdir -p ~/.local/bin
cp $(OUT_DIR)/turnkey.$(HOST_OS)-$(HOST_ARCH) ~/.local/bin/turnkey

.PHONY: test
test: $(OUT_DIR)/turnkey.linux-x86_64
$(call toolchain,' \
GOCACHE=/home/build/$(CACHE_DIR) \
GOPATH=/home/build/$(CACHE_DIR) \
env -C $(SRC_DIR) go test -v ./... \
')

# Clean repo back to initial clone state
.PHONY: clean
clean:
rm -rf dist/ build/
clean: toolchain-clean
git clean -dfx $(SRC_DIR)

$(KEY_DIR)/%.asc:
$(call fetch_pgp_key,$(basename $(notdir $@)))

$(OUT_DIR)/Formula/turnkey.rb: \
$(OUT_DIR)/turnkey.darwin-x86_64 \
$(OUT_DIR)/turnkey.darwin-aarch64
mkdir -p $(OUT_DIR)/Formula
export \
VERSION="$(VERSION)" \
DARWIN_X86_64_SHA256="$(shell \
openssl sha256 -r $(OUT_DIR)/turnkey.darwin-x86_64 \
| sed -e 's/ \*out\// /g' -e 's/ \.\// /g' -e 's/ .*//g' \
)" \
DARWIN_AARCH64_SHA256="$(shell \
openssl sha256 -r $(OUT_DIR)/turnkey.darwin-aarch64 \
| sed -e 's/ \*out\// /g' -e 's/ \.\// /g' -e 's/ .*//g' \
)"; \
cat $(SRC_DIR)/brew/formula.rb | envsubst > $@

$(OUT_DIR)/turnkey.%:
$(call toolchain,' \
GOHOSTOS="linux" \
GOHOSTARCH="amd64" \
GOOS="$(word 1,$(subst -, ,$(word 2,$(subst ., ,$@))))" \
GOARCH="$(call altarch,$(word 2,$(subst -, ,$(word 2,$(subst ., ,$@)))))" \
GOCACHE=/home/build/$(CACHE_DIR) \
GOPATH=/home/build/$(CACHE_DIR) \
CGO_ENABLED=0 \
env -C $(SRC_DIR) \
go build \
-trimpath \
-o /home/build/$@ main.go \
')
Loading

0 comments on commit c24db6f

Please sign in to comment.