Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
leaanthony committed Sep 9, 2020
2 parents bc0478b + 6f06966 commit c9b26c6
Show file tree
Hide file tree
Showing 65 changed files with 6,612 additions and 6,190 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/latest-pre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
os: [ubuntu-latest, windows-latest, macOS-latest]
steps:

- name: Set up Go 1.12
- name: Set up Go 1.13
uses: actions/setup-go@v1
with:
go-version: 1.12
go-version: 1.13
id: go

- name: Check out code into the Go module directory
Expand All @@ -27,6 +27,6 @@ jobs:
go get -v -d ./...
- name: Build
run: go build -v ./cmd/wails

- name: Test
run: ./wails version
6 changes: 3 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
os: [ubuntu-latest, windows-latest, macOS-latest]
steps:

- name: Set up Go 1.12
- name: Set up Go 1.13
uses: actions/setup-go@v1
with:
go-version: 1.12
go-version: 1.13
id: go

- name: Check out code into the Go module directory
Expand All @@ -27,6 +27,6 @@ jobs:
go get -v -d ./...
- name: Build
run: go build -v ./cmd/wails

- name: Test
run: ./wails version
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
branches:
- master
tags:
- '!**pre**'
- '!**pre**'
jobs:

build:
Expand All @@ -15,10 +15,10 @@ jobs:
os: [ubuntu-latest, windows-latest, macOS-latest]
steps:

- name: Set up Go 1.12
- name: Set up Go 1.13
uses: actions/setup-go@v1
with:
go-version: 1.12
go-version: 1.13
id: go

- name: Check out code into the Go module directory
Expand All @@ -29,6 +29,6 @@ jobs:
go get -v -d ./...
- name: Build
run: go build -v ./cmd/wails

- name: Test
run: ./wails version
5 changes: 5 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,8 @@ Wails is what it is because of the time and effort given by these great people.
* [msms](https://github.com/sayuthisobri)
* [dedo1911](https://github.com/dedo1911)
* [Florian Didron](https://github.com/fdidron)
* [Christopher Murphy](https://github.com/Splode)
* [Zámbó, Levente](https://github.com/Lyimmi)
* [artem](https://github.com/Unix4ever)
* [Tim Kipp](https://github.com/timkippdev)
* [Dmitry Gomzyakov](https://github.com/kyoto44)
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ The official docs can be found at [https://wails.app](https://wails.app).

Wails uses cgo to bind to the native rendering engines so a number of platform dependent libraries are needed as well as an installation of Go. The basic requirements are:

- Go 1.12
- Go 1.13
- npm

### MacOS
Expand All @@ -56,7 +56,7 @@ _Ubuntu: 16.04, 18.04, 19.04_

_Also succesfully tested on: Zorin 15, Parrot 4.7, Linuxmint 19, Elementary 5, Kali, Neon_, Pop!_OS

#### Arch Linux / ArchLabs
#### Arch Linux / ArchLabs / Ctlos Linux

`sudo pacman -S webkit2gtk gtk3`

Expand Down
13 changes: 12 additions & 1 deletion app.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,24 @@ import (
"github.com/wailsapp/wails/lib/ipc"
"github.com/wailsapp/wails/lib/logger"
"github.com/wailsapp/wails/lib/renderer"
wailsruntime "github.com/wailsapp/wails/runtime"
)

// -------------------------------- Compile time Flags ------------------------------

// BuildMode indicates what mode we are in
var BuildMode = cmd.BuildModeProd

// Runtime is the Go Runtime struct
type Runtime = wailsruntime.Runtime

// Store is a state store used for syncing with
// the front end
type Store = wailsruntime.Store

// CustomLogger is a specialised logger
type CustomLogger = logger.CustomLogger

// ----------------------------------------------------------------------------------

// App defines the main application struct
Expand Down Expand Up @@ -125,7 +136,7 @@ func (a *App) start() error {
a.ipc.Start(a.eventManager, a.bindingManager)

// Create the runtime
a.runtime = NewRuntime(a.eventManager, a.renderer)
a.runtime = wailsruntime.NewRuntime(a.eventManager, a.renderer)

// Start binding manager and give it our renderer
err = a.bindingManager.Start(a.renderer, a.runtime)
Expand Down
4 changes: 2 additions & 2 deletions cmd/cmd-mewn.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ package cmd
import "github.com/leaanthony/mewn"

func init() {
mewn.AddAsset(".", "../runtime/assets/bridge.js", "1f8b08000000000000ffac396973e2ba969fe157e8f5ad2ec825c1ecebcdad318610920061cbc29b5719611f6c115b3696c04077fefb946c03269d74f79d9a749358d2d9755623fd19472f28f879091f5ec2a7f877f4dddf9090f4f2f2825e922f67fed38b7f227d170702f67fa4f0e945122792f82f7082eda4a07686e2df5f5e24f1f9ef9797f317c9ff2730108a8f0d4026d10dee81f88de62eb6c0b3dd5734b75de4c1ecc224af80b0e3b078523d437780914cb961d32dca65b2d50bc7050694c7ff94e2d29f68c10c423902b60697119bd65009fd29c5e3f3155539b1292294f0e419fa168f49126ab844d301d9b305a83c1ef308d56c2fed6162b25970742920632ea836a5a0f2fe1a5c136f6b88ae4cf33c7a322616b83594cf64c4b6c726c3bb1a4a78ac26490994422169d356b110236dd88c536c014aa1442d5fc8668b52c03121d0439ac4a6238e391cd9a9369d13bd86bebdf95c60c66cf5157804009be60cabafc71d3b10f97adcbdabc563b158e22f8dac916a62c62ebff8aa5e1c94b80881bffcfd1b4017aa4d3950fe7bc09c7013befcfd288e43bbff256964fdf75f33f7b7089836d608d599432805f7cbdfefb089f639aa058c613de0ce09d57dd7125602aa856422bf1311ab29a35160b4f427b4bf393623e2a26a73b201adce6da796a99b30e7b54cdd231a376ad94ce66bddf0bd3b78169c75d75e51ade6ea339ccc9c8b7fe9d2597d6e537e31c71631b7358629bb60e092795d23cc115e476d0af5dd05a11a6c6a55ffe7ed33c1f6b7f3cdc19ab05b2d977136289f7136750e1b7e814da2d39a0a94831b0a9acb80553fe8e382893959c341f40258f599ed6ae05eb858232b56cb8255b7b0ab135a2b7e4578c56d94896877a1daa6edd6fe98cfe7f599bdb96006d66caf967536487c02819c4d1483585887daca35931ae6b8e62f2587eaf51966502a9c9387467fe8656edbba2dcbb2dc1b4d8cd644976559a988f54a91bb6271efcce4b2d8585e35ba0fad89fc0f7f5a0d79f0d1f37e2d3e4dd9eb8a47b1b7ffbbff89ae1559ef88cf7b988fe005dc3f95f5aa3178bc5516a5c020f9e1686c76e53bd259368dd7764366decde23ed3dedc977ac3c26355daf1c5b0d9351e27c54cbbaa17e1fa693d9b569f5a9dea663a56975333874dedd62e16079eadaca7137d6708c2ac7a336c5d4d465de899008fcb853c3126998682aff31d4ebceaee765ccda776ed4c6e709b352ca9787d955aeca637a5f9004aeaf6a9955ae8d5a7b25df536abadd9e9cc0be375ee219f9af5ddd6139d57346f20dd0e3aed662f278d5285bef5a03c3cdd4923b541e764b6990c979dc6f65e32fabd56c5ad8c53b366d71c542bb723b3fc5c31760b6754596797bc695456c579e576e0b49d39bdbf3796edca0dd87a2f5fbe5e5601f7729ba1d1f164dca66b8f55aeb22363b3bc2ddab31cf79e49f64aee360bee137be654916e5a6438330beac4551e0dda55ee8657603dc1ee69362b5607b7854779d4675689e61eb3a982d218e76e2cbe1b94e6cc9db557b3a1d4bb9a6939bdf89c2d5753454f6ab7aef12dbb5e3c2bc0cb8aee3e4df27c83dd9e527edef41f6e786751905ac35d579bce776a3e6b38a98ada2c41bb73a76377fa5c5d4db339436699fc7ade6856956c39ab8f8a7d6b57eeabeb8d7c37e8d0c2aa321c361a0d9591eae363ceb3fb55e2dce9f39df36ceaba9e9f0eb5617fa2546ec7e5c1dd72997facde368a8d9976f5a017aab9eaabe639a5d4124f6957517a0d6d91ea6d7bd9c74aa538dc4af25dbe59900733f6f050a0b642ba9252c9bf6e9f9795cc93d9949f07dcc5669f3477f650be366dfe68569639be583f9b7d5dd5b37265d1929d294e2999d2b8a1c9bbdc609df156d96c47da4dfbdb9b41a9e5b56197bbcfcd2af79d819b353c8fca53266f3cb930919ffbdba7c9a62b6d9c12bf9669a13db1eedbddea3057b11f36ba92016937b8b9e9949a5b633bcdbae5d56e38301cf5b1bc29afc7f871b4bb1db54b189c72f9d5b5c72d333fa96457a3073c1973bdd5e9cd950a389bd4a070551d398e79ddae145aaf25ab30949755697cf7da6fb89b2dac346d6a5cafdb1d27fbf434bfdae6a7f935f77a33f3b64d9a347593aae6d69e2737ae756351bea63b7394bd2ebe360a5579bad6daca954e1af7cb5275397fba77f3db546a4bccab4cbf5718566058668eccee9c69b5d85bca8f458e6759b5b07e9d5a256c025ea846d77b1e6b9dbbc160ecb572fd8742363bed561f77bcb9b85f9ad99c8a1ba4a4379dc9add5d40a93ec534f1b6ca685bbced3a0288dddc27db953e5cfea95dbbccd0759ccbc1abf8e56034b51cea209d8050730af513b7c8a9e1d4a4350353e2f3d7eadffe61733467650cb81f53970589c23e0d974fe6708a78dc037c726429a0b5803e52ca891613d4b17c1da97af6011d4af5aba001662b64934c45d4c99835da07c5fddc2b2956f95ca2d05fd0100feaf77c5af98f95ac794587e3f578b0885b20c9984027611a173d16fc2be4a8a12593f146421d1db7fbdc2d6ef79198ad0f8261a856fbe6c73dbb56aae2dfac064be94d1403f7b7bf37b14d3d66be8d0d8264343fabd6d4c74b7c04c42f98546189e99704145d917828963d5a6cc36216dda7a52ac6389af2af22d8ec2cef7ab8a44e31a52157d2af2b9c66289480383fec03893c964ea28b01af2ab3d3a3595a8f228137e44c5477b1b8846a08e8e578f32e9b20bd6878c32996af5578c42067b86bf6624f89cd5e3b1d85b3cf6568fbfc5e39284640d3b1c3434776d4b8c206b021eba40dcc0f495a11d0357877f45470a313e28a3515265cc37ff1abb084cb0d025d26c756501e569d505cca165825825138c6f4d4808d60230cd80cb9cbb64b6e2904cf0ad03897394109d9aa432e6c391394a06b002756400f0e0aedf6da655c6c6b0e1e812a98cd5e3b1370426832328761ca09a6210534bbe134fe0f56c0d7c4d04d3b7401903b01655c65f7fff7edcd08187aab1c6768cf51eb62099106089b37f67fe538fc7c4f3096b21cbd9dee48acf9e218ca8ad012214710350d3b68e660e24f4a50be2f5dcb731503ede3a708e88761ecc1082f7390afbdfc37d689f5f4684ccded0440b6caba58940245a600b7174e0b187386c088bef9f23f01141043d91b5c43426a083a3003650eaf47684382ef0954b91b637d50838432bc7375098138f4662c0574e38a5260fbacf6c6d1b555facebc1911ff3c13c264c2b843ada59c09da38446d6c21b83841c8ea942b277b827aafd384ba72393683deecfdf1d3f72a29a2065348ac78e11f5391965343a78cf88633720139d2f235611e7c1e661f61f094b9d1831766a3c21e307ec0f4337baf467ecfa8750d1b7023f057cff6a217a4dcb15b8db1198a072db1569fad3313411f7b3d8e782ec5f25a04b719d2cdc052d11dec4c8b03d766a8da3f50cdb1bbe133330e3ef281464a67438c30afe33d3565f13bed3fbbcaf89069ff1368806ff9fbc457b10612d6b9ac8394c7589c311b7f75927ed9f0ec1b2d7c010e188cc1113c435e46051ad39b88830c4dd15a423e2624d1bf9b49201c973e4fa34028945bcb19fd5041fc70fad18fb594958e0353e0516db4a904dd065a88f3839c9d827b985f90e7e5413f96d14c5e6bee4b3a0fef916e977e3313f9945d589b17490b3fce00f4e8eb483921ade30a69a290c4955db225447c7203afa278b5ebb8fa004679fdfb7e85e12cade97c5fd856f7502b37cec3ce2443501bb1da1f01a9b1f259968fcfa183fcb04699baaa6cd44700582370f11f61ba8fb0e6b8fdc0dd69f607e10cfd1607e6ff1a3a18f51ffa3a18ff2fec2d6cd48ea08dce3c4e0bf972eff6f692a16fb380fd58fef4b936747038cddadf087f0641fdaa1b408d6e06e513e93b1184a6a30c72b93a3353657701684be6260aa03e20661c1febe25b130a128fa863878791c4d02bf34e5bbe2c0801f5cf1d8ce87312682eee7660dec1a82fff20ac0438f301bf9eb0f09b3c9f0ce37ea2f1dd776801ebc5639fafb2f11c1756da1f851d97d4689c520cdb8ed742c0b348239dcbbb683757fc64a865285201f9f38ae3f0736832b3d1cfca663c662fb6e6b8e4d06c1d69bffe74d24b4f38fda9ad3af00f62ef82ec2c2a03e1dd2440112e527f4240f10d1a9ed025a3084a926daf770b808d2638c7984abc661d44b6b98e37f67fe73a016743f2699b9d8dda28b10f95ffef7020c50c24bf86fb38f552a4a28cd4ca242327b16140641af677be150e8ae282716889a27c654d0cec383b9edfa71e102d6b6c8377e88ec6b107e1db18f3f3f7ab0e3c4dfdd49bae54fefe93e4d066d662de09238473f44c4a7c929d07e2804498417ff49f4ecc53a78dd67247b3627f3ada858d8714c127c7993f88957ed299f700de1df7c3f0a169f31bcf3d50e2f7218183de4377301bfd60f37c3c93c94871dee97fed6fd9efb6dcb07441b848a61f9406e1690f32788e0085da20f498614840a5f422a35f405a5f678673f5cf84bba075e089adc43fd2892824dd3cfda07a1d4a3507b633731c73f95ec1d67657f495102ef988745a1f603fa9dada75b2281251313fa4a6d8f1ede91881e0db9a0025983568bbe3e3944ea695f14cc2db3addf620bf3469ae0743a1dffb4e4f9d8e9745ac418e61caca07b0d01e3d182f8167f370725a3debf1f85f60365e08b620223fcc06884d7e09fee313f9e34f6b17e7980ab47d50c87b2d8c930762a5f47703d09ce7712fbe096adad4c48c3c6b15d2efa6981568fff6f000000ffffc3c33335cf1e0000")
mewn.AddAsset(".", "../runtime/js/runtime/init.js", "1f8b08000000000000ff548ccd4ec3301084cfec53cc3189680c1c90a04282231247242e488b9b6e89a96347b64b404ddf1dd96d0ff867359a99fd5443601c0f9f049f14cd988ba1a098195c715d149744cd39c8dd0f7552ac72a2f2cb3b47bbcab41a3433abfcdf992f59959b37007aed05d67cf669923cb1097a90c9872d363e6092d5c29aad408f63a4aaabf1221a4f2ef5defde2e6eafa6e310689e212358a5483afd81b9720f15b4234dedde3168d22524d4368f0ec4c32da9a2811a917bc696323c2ce253308a1741e471df480fd66e7ba64bc3ba0d3d6ae74b7a58c3adb85559da31a7bba988c5bfba99d32b4e5f67f614907a2c1af77565af9197d48110f05b2a4bf000000ffffe38437ed8a010000")
mewn.AddAsset(".", "../runtime/assets/bridge.js", "1f8b08000000000000ffac396973e2ba969fe157e8f5ad2ec825c1ecebcdad318610920061cbc29b5719611f6c115b3696c04077fefb946c03269d74f79d9a749358d2d9755623fd19472f28f879091f5ec2a7f877f4dddf9090f4f2f2825e922f67fed38b7f227d170702f67fa4f0e945122792f82f7082eda4a07686e2df5f5e24f1f9ef9797f317c9ff2730108a8f0d4026d10dee81f88de62eb6c0b3dd5734b75de4c1ecc224af80b0e3b078523d437780914cb961d32dca65b2d50bc7050694c7ff94e2d29f68c10c423902b60697119bd65009fd29c5e3f3155539b1292294f0e419fa168f49126ab844d301d9b305a83c1ef308d56c2fed6162b25970742920632ea836a5a0f2fe1a5c136f6b88ae4cf33c7a322616b83594cf64c4b6c726c3bb1a4a78ac26490994422169d356b110236dd88c536c014aa1442d5fc8668b52c03121d0439ac4a6238e391cd9a9369d13bd86bebdf95c60c66cf5157804009be60cabafc71d3b10f97adcbdabc563b158e22f8dac916a62c62ebff8aa5e1c94b80881bffcfd1b4017aa4d3950fe7bc09c7013befcfd288e43bbff256964fdf75f33f7b7089836d608d599432805f7cbdfefb089f639aa058c613de0ce09d57dd7125602aa856422bf1311ab29a35160b4f427b4bf393623e2a26a73b201adce6da796a99b30e7b54cdd231a376ad94ce66bddf0bd3b78169c75d75e51ade6ea339ccc9c8b7fe9d2597d6e537e31c71631b7358629bb60e092795d23cc115e476d0af5dd05a11a6c6a55ffe7ed33c1f6b7f3cdc19ab05b2d977136289f7136750e1b7e814da2d39a0a94831b0a9acb80553fe8e382893959c341f40258f599ed6ae05eb858232b56cb8255b7b0ab135a2b7e4578c56d94896877a1daa6edd6fe98cfe7f599bdb96006d66caf967536487c02819c4d1483585887daca35931ae6b8e62f2587eaf51966502a9c9387467fe8656edbba2dcbb2dc1b4d8cd644976559a988f54a91bb6271efcce4b2d8585e35ba0fad89fc0f7f5a0d79f0d1f37e2d3e4dd9eb8a47b1b7ffbbff89ae1559ef88cf7b988fe005dc3f95f5aa3178bc5516a5c020f9e1686c76e53bd259368dd7764366decde23ed3dedc977ac3c26355daf1c5b0d9351e27c54cbbaa17e1fa693d9b569f5a9dea663a56975333874dedd62e16079eadaca7137d6708c2ac7a336c5d4d465de899008fcb853c3126998682aff31d4ebceaee765ccda776ed4c6e709b352ca9787d955aeca637a5f9004aeaf6a9955ae8d5a7b25df536abadd9e9cc0be375ee219f9af5ddd6139d57346f20dd0e3aed662f278d5285bef5a03c3cdd4923b541e764b6990c979dc6f65e32fabd56c5ad8c53b366d71c542bb723b3fc5c31760b6754596797bc695456c579e576e0b49d39bdbf3796edca0dd87a2f5fbe5e5601f7729ba1d1f164dca66b8f55aeb22363b3bc2ddab31cf79e49f64aee360bee137be654916e5a6438330beac4551e0dda55ee8657603dc1ee69362b5607b7854779d4675689e61eb3a982d218e76e2cbe1b94e6cc9db557b3a1d4bb9a6939bdf89c2d5753454f6ab7aef12dbb5e3c2bc0cb8aee3e4df27c83dd9e527edef41f6e786751905ac35d579bce776a3e6b38a98ada2c41bb73a76377fa5c5d4db339436699fc7ade6856956c39ab8f8a7d6b57eeabeb8d7c37e8d0c2aa321c361a0d9591eae363ceb3fb55e2dce9f39df36ceaba9e9f0eb5617fa2546ec7e5c1dd72997facde368a8d9976f5a017aab9eaabe639a5d4124f6957517a0d6d91ea6d7bd9c74aa538dc4af25dbe59900733f6f050a0b642ba9252c9bf6e9f9795cc93d9949f07dcc5669f3477f650be366dfe68569639be583f9b7d5dd5b37265d1929d294e2999d2b8a1c9bbdc609df156d96c47da4dfbdb9b41a9e5b56197bbcfcd2af79d819b353c8fca53266f3cb930919ffbdba7c9a62b6d9c12bf9669a13db1eedbddea3057b11f36ba92016937b8b9e9949a5b633bcdbae5d56e38301cf5b1bc29afc7f871b4bb1db54b189c72f9d5b5c72d333fa96457a3073c1973bdd5e9cd950a389bd4a070551d398e79ddae145aaf25ab30949755697cf7da6fb89b2dac346d6a5cafdb1d27fbf434bfdae6a7f935f77a33f3b64d9a347593aae6d69e2737ae756351bea63b7394bd2ebe360a5579bad6daca954e1af7cb5275397fba77f3db546a4bccab4cbf5718566058668eccee9c69b5d85bca8f458e6759b5b07e9d5a256c025ea846d77b1e6b9dbbc160ecb572fd8742363bed561f77bcb9b85f9ad99c8a1ba4a4379dc9add5d40a93ec534f1b6ca685bbced3a0288dddc27db953e5cfea95dbbccd0759ccbc1abf8e56034b51cea209d8050730af513b7c8a9e1d4a4350353e2f3d7eadffe61733467650cb81f53970589c23e0d974fe6708a78dc037c726429a0b5803e52ca891613d4b17c1da97af6011d4af5aba001662b64934c45d4c99835da07c5fddc2b2956f95ca2d05fd0100feaf77c5af98f95ac794587e3f578b0885b20c9984027611a173d16fc2be4a8a12593f146421d1db7fbdc2d6ef79198ad0f8261a856fbe6c73dbb56aae2dfac064be94d1403f7b7bf37b14d3d66be8d0d8264343fabd6d4c74b7c04c42f98546189e99704145d917828963d5a6cc36216dda7a52ac6389af2af22d8ec2cef7ab8a44e31a52157d2af2b9c66289480383fec03893c964ea28b01af2ab3d3a3595a8f228137e44c5477b1b8846a08e8e578f32e9b20bd6878c32996af5578c42067b86bf6624f89cd5e3b1d85b3cf6568fbfc5e39284640d3b1c3434776d4b8c206b021eba40dcc0f495a11d0357877f45470a313e28a3515265cc37ff1abb084cb0d025d26c756501e569d505cca165825825138c6f4d4808d60230cd80cb9cbb64b6e2904cf0ad03897394109d9aa432e6c391394a06b002756400f0e0aedf6da655c6c6b0e1e812a98cd5e3b1370426832328761ca09a6210534bbe134fe0f56c0d7c4d04d3b7401903b01655c65f7fff7edcd08187aab1c6768cf51eb62099106089b37f67fe538fc7c4f3096b21cbd9dee48acf9e218ca8ad012214710350d3b68e660e24f4a50be2f5dcb731503ede3a708e88761ecc1082f7390afbdfc37d689f5f4684ccded0440b6caba58940245a600b7174e0b187386c088bef9f23f01141043d91b5c43426a083a3003650eaf47684382ef0954b91b637d50838432bc7375098138f4662c0574e38a5260fbacf6c6d1b555facebc1911ff3c13c264c2b843ada59c09da38446d6c21b83841c8ea942b277b827aafd384ba72393683deecfdf1d3f72a29a2065348ac78e11f5391965343a78cf88633720139d2f235611e7c1e661f61f094b9d1831766a3c21e307ec0f4337baf467ecfa8750d1b7023f057cff6a217a4dcb15b8db1198a072db1569fad3313411f7b3d8e782ec5f25a04b719d2cdc052d11dec4c8b03d766a8da3f50cdb1bbe133330e3ef281464a67438c30afe33d3565f13bed3fbbcaf89069ff1368806ff9fbc457b10612d6b9ac8394c7589c311b7f75927ed9f0ec1b2d7c010e188cc1113c435e46051ad39b88830c4dd15a423e2624d1bf9b49201c973e4fa34028945bcb19fd5041fc70fad18fb594958e0353e0516db4a904dd065a88f3839c9d827b985f90e7e5413f96d14c5e6bee4b3a0fef916e977e3313f9945d589b17490b3fce00f4e8eb483921ade30a69a290c4955db225447c7203afa278b5ebb8fa004679fdfb7e85e12cade97c5fd856f7502b37cec3ce2443501bb1da1f01a9b1f259968fcfa183fcb04699baaa6cd44700582370f11f61ba8fb0e6b8fdc0dd69f607e10cfd1607e6ff1a3a18f51ffa3a18ff2fec2d6cd48ea08dce3c4e0bf972eff6f692a16fb380fd58fef4b936747038cddadf087f0641fdaa1b408d6e06e513e93b1184a6a30c72b93a3353657701684be6260aa03e20661c1febe25b130a128fa863878791c4d02bf34e5bbe2c0801f5cf1d8ce87312682eee7660dec1a82fff20ac0438f301bf9eb0f09b3c9f0ce37ea2f1dd776801ebc5639fafb2f11c1756da1f851d97d4689c520cdb8ed742c0b348239dcbbb683757fc64a865285201f9f38ae3f0736832b3d1cfca663c662fb6e6b8e4d06c1d69bffe74d24b4f38fda9ad3af00f62ef82ec2c2a03e1dd2440112e527f4240f10d1a9ed025a3084a926daf770b808d2638c7984abc661d44b6b98e37f67fe73a016743f2699b9d8dda28b10f95ffef7020c50c24bf86fb38f552a4a28cd4ca242327b16140641af677be150e8ae282716889a27c654d0cec383b9edfa71e102d6b6c8377e88ec6b107e1db18f3f3f7ab0e3c4dfdd49bae54fefe93e4d066d662de09238473f44c4a7c929d07e2804498417ff49f4ecc53a78dd67247b3627f3ada858d8714c127c7993f88957ed299f700de1df7c3f0a169f31bcf3d50e2f7218183de4377301bfd60f37c3c93c94871dee97fed6fd9efb6dcb07441b848a61f9406e1690f32788e0085da20f498614840a5f422a35f405a5f678673f5cf84bba075e089adc43fd2892824dd3cfda07a1d4a3507b633731c73f95ec1d67657f495102ef988745a1f603fa9dada75b2281251313fa4a6d8f1ede91881e0db9a0025983568bbe3e3944ea695f14cc2db3addf620bf3469ae0743a1dffb4e4f9d8e9745ac418e61caca07b0d01e3d182f8167f370725a3debf1f85f60365e08b620223fcc06884d7e09fee313f9e34f6b17e7980ab47d50c87b2d8c930762a5f47703d09ce7712fbe096adad4c48c3c6b15d2efa6981568fff6f000000ffffc3c33335cf1e0000")
mewn.AddAsset(".", "../runtime/js/runtime/init.js", "1f8b08000000000000ff548ccd4ec3301084cfec53cc3189680c1c90a04282231247242e488b9b6e89a96347b64b404ddf1dd96d0ff867359a99fd5443601c0f9f049f14cd988ba1a098195c715d149744cd39c8dd0f7552ac72a2f2cb3b47bbcab41a3433abfcdf992f59959b37007aed05d67cf669923cb1097a90c9872d363e6092d5c29aad408f63a4aaabf1221a4f2ef5defde2e6eafa6e310689e212358a5483afd81b9720f15b4234dedde3168d22524d4368f0ec4c32da9a2811a917bc696323c2ce253308a1741e471df480fd66e7ba64bc3ba0d3d6ae74b7a58c3adb85559da31a7bba988c5bfba99d32b4e5f67f614907a2c1af77565af9197d48110f05b2a4bf000000ffffe38437ed8a010000")
}
8 changes: 5 additions & 3 deletions cmd/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -293,9 +293,11 @@ func BuildApplication(binaryName string, forceRebuild bool, buildMode string, pa
fmt.Println(err)
}
}
if projectOptions.Platform == "windows" {
helper.CleanWindows(projectOptions)
}
// Removed by popular demand
// TODO: Potentially add a flag to cleanup
// if projectOptions.Platform == "windows" {
// helper.CleanWindows(projectOptions)
// }
}()

if projectOptions.CrossCompile {
Expand Down
4 changes: 4 additions & 0 deletions cmd/linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ const (
PopOS
// Solus distribution
Solus
// Ctlos Linux distribution
Ctlos
)

// DistroInfo contains all the information relating to a linux distribution
Expand Down Expand Up @@ -129,6 +131,8 @@ func parseOsRelease(osRelease string) *DistroInfo {
result.Distribution = Arch
case "archlabs":
result.Distribution = ArchLabs
case "ctlos":
result.Distribution = Ctlos
case "debian":
result.Distribution = Debian
case "ubuntu":
Expand Down
11 changes: 10 additions & 1 deletion cmd/linuxdb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,16 @@ distributions:
name: ArchLabs
gccversioncommand: *gccdumpversion
programs: *archdefaultprograms
libraries: *archdefaultlibraries
libraries: *archdefaultlibraries
ctlos:
id: ctlos
releases:
default:
version: default
name: Ctlos Linux
gccversioncommand: *gccdumpversion
programs: *archdefaultprograms
libraries: *archdefaultlibraries
manjaro:
id: manjaro
releases:
Expand Down
Loading

0 comments on commit c9b26c6

Please sign in to comment.