From 2d12d79f3eb0887816757dee35fa9eb6266f4143 Mon Sep 17 00:00:00 2001
From: Maximilian Ammann <max@maxammann.org>
Date: Thu, 23 Dec 2021 15:08:37 +0100
Subject: [PATCH] Use example instead of bin

---
 .github/workflows/rust.yml                        |  2 +-
 .../{Run_mapr.xml => Run_desktop.xml}             |  4 ++--
 Cargo.toml                                        | 12 ++++++------
 README.md                                         |  2 +-
 docs/src/building.md                              |  2 +-
 src/main.rs => examples/desktop.rs                | 10 +---------
 src/lib.rs                                        | 11 +----------
 src/platform.rs                                   |  5 -----
 src/{ => platform}/android/mod.rs                 |  0
 src/{ => platform}/apple/mod.rs                   |  6 +++---
 src/platform/mod.rs                               | 15 +++++++++++++++
 src/{ => platform}/web/io.rs                      |  0
 src/{ => platform}/web/mod.rs                     |  0
 src/{ => platform}/web/wasm_experiment.rs         |  0
 14 files changed, 31 insertions(+), 38 deletions(-)
 rename .idea/runConfigurations/{Run_mapr.xml => Run_desktop.xml} (78%)
 rename src/main.rs => examples/desktop.rs (79%)
 delete mode 100644 src/platform.rs
 rename src/{ => platform}/android/mod.rs (100%)
 rename src/{ => platform}/apple/mod.rs (82%)
 create mode 100644 src/platform/mod.rs
 rename src/{ => platform}/web/io.rs (100%)
 rename src/{ => platform}/web/mod.rs (100%)
 rename src/{ => platform}/web/wasm_experiment.rs (100%)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index b9e38528..e153a0f4 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Install Dependencies
         run: sudo apt-get install -y libwayland-dev libxkbcommon-dev
       - name: Build
-        run: cargo build --bin mapr
+        run: cargo build --example desktop
       - uses: actions/upload-artifact@v2
         with:
           name: mapr
diff --git a/.idea/runConfigurations/Run_mapr.xml b/.idea/runConfigurations/Run_desktop.xml
similarity index 78%
rename from .idea/runConfigurations/Run_mapr.xml
rename to .idea/runConfigurations/Run_desktop.xml
index 64e24af2..1c4d575e 100644
--- a/.idea/runConfigurations/Run_mapr.xml
+++ b/.idea/runConfigurations/Run_desktop.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run mapr" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
-    <option name="command" value="run --bin mapr" />
+  <configuration default="false" name="Run desktop" type="CargoCommandRunConfiguration" factoryName="Cargo Command">
+    <option name="command" value="run --example  desktop" />
     <option name="workingDirectory" value="file://$PROJECT_DIR$" />
     <option name="channel" value="DEFAULT" />
     <option name="requiredFeatures" value="true" />
diff --git a/Cargo.toml b/Cargo.toml
index d7614d1f..a2cf59d2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,9 +15,6 @@ edition = "2021"
 resolver = "2"
 build = "build.rs"
 
-[lib]
-crate-type = [ "rlib", "cdylib", "staticlib" ] # staticlib is used for apple
-
 [package.metadata.wasm-pack.profile.release]
 wasm-opt = true
 
@@ -95,6 +92,9 @@ test-env-log = "0.2"
 wgsl-validate = { path = "./libs/wgsl_validate" }
 mapr-utils = { path = "./libs/mapr_utils" }
 
-[[bin]]
-name = "mapr"
-path = "src/main.rs"
+[lib]
+crate-type = [ "rlib", "cdylib", "staticlib" ] # staticlib is used for apple
+
+[[example]]
+name = "desktop"
+crate-type = ["bin"]
diff --git a/README.md b/README.md
index a9df2320..744b7648 100644
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ cargo build
 After that you can run it on your desktop:
 
 ```bash
-cargo run --bin mapr --
+cargo run --example desktop --
 ```
 
 More information about building for different platforms can be
diff --git a/docs/src/building.md b/docs/src/building.md
index ec433273..bceb3b76 100644
--- a/docs/src/building.md
+++ b/docs/src/building.md
@@ -5,7 +5,7 @@
 The setup normal desktop is very simple. You just have to run the following:
 
 ```bash
-cargo run --bin mapr --
+cargo run --example desktop --
 ```
 
 ## Android
diff --git a/src/main.rs b/examples/desktop.rs
similarity index 79%
rename from src/main.rs
rename to examples/desktop.rs
index d62dd36f..149dff49 100644
--- a/src/main.rs
+++ b/examples/desktop.rs
@@ -1,14 +1,6 @@
 use winit::event_loop::EventLoop;
 use winit::window::WindowBuilder;
-
-mod fps_meter;
-mod platform;
-mod render;
-mod io;
-mod setup;
-
-#[cfg(target_arch = "wasm32")]
-mod web;
+use mapr::setup;
 
 fn main() {
     env_logger::init_from_env(env_logger::Env::default().default_filter_or("info"));
diff --git a/src/lib.rs b/src/lib.rs
index 54a52cbe..5d002a86 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,13 +2,4 @@ mod fps_meter;
 mod platform;
 mod render;
 mod io;
-mod setup;
-
-#[cfg(target_arch = "wasm32")]
-mod web;
-
-#[cfg(target_arch = "aarch64")]
-mod apple;
-
-#[cfg(target_os = "android")]
-mod android;
+pub mod setup;
diff --git a/src/platform.rs b/src/platform.rs
deleted file mode 100644
index 6a1f2c64..00000000
--- a/src/platform.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-#[cfg(target_arch = "wasm32")]
-pub use instant::Instant;
-
-#[cfg(not(target_arch = "wasm32"))]
-pub use std::time::Instant;
diff --git a/src/android/mod.rs b/src/platform/android/mod.rs
similarity index 100%
rename from src/android/mod.rs
rename to src/platform/android/mod.rs
diff --git a/src/apple/mod.rs b/src/platform/apple/mod.rs
similarity index 82%
rename from src/apple/mod.rs
rename to src/platform/apple/mod.rs
index 316cacc1..038f31bb 100644
--- a/src/apple/mod.rs
+++ b/src/platform/apple/mod.rs
@@ -1,8 +1,8 @@
+use winit::event_loop::EventLoop;
+use winit::window::WindowBuilder;
+
 #[no_mangle]
 fn mapr_apple_main() {
-    use winit::event_loop::EventLoop;
-    use winit::window::WindowBuilder;
-
     env_logger::init_from_env(env_logger::Env::default().default_filter_or("info"));
 
     let event_loop = EventLoop::new();
diff --git a/src/platform/mod.rs b/src/platform/mod.rs
new file mode 100644
index 00000000..69e220a0
--- /dev/null
+++ b/src/platform/mod.rs
@@ -0,0 +1,15 @@
+#[cfg(target_arch = "wasm32")]
+pub mod web;
+
+#[cfg(target_arch = "aarch64")]
+pub mod apple;
+
+#[cfg(target_os = "android")]
+pub mod android;
+
+
+#[cfg(target_arch = "wasm32")]
+pub use instant::Instant;
+
+#[cfg(not(target_arch = "wasm32"))]
+pub use std::time::Instant;
diff --git a/src/web/io.rs b/src/platform/web/io.rs
similarity index 100%
rename from src/web/io.rs
rename to src/platform/web/io.rs
diff --git a/src/web/mod.rs b/src/platform/web/mod.rs
similarity index 100%
rename from src/web/mod.rs
rename to src/platform/web/mod.rs
diff --git a/src/web/wasm_experiment.rs b/src/platform/web/wasm_experiment.rs
similarity index 100%
rename from src/web/wasm_experiment.rs
rename to src/platform/web/wasm_experiment.rs