update build.mill for native examples

example/scalalib/native/1-simple/build.mill

@@ -1,4 +1,3 @@
-//// SNIPPET:BUILD
 package build
 import mill._, scalalib._, scalanativelib._
 
@@ -16,41 +15,15 @@ object `package` extends RootModule with ScalaNativeModule {
     def testFramework = "utest.runner.Framework"
   }
 }
-//// SNIPPET:END
-//
-//
-//// SNIPPET:DEPENDENCIES
-//
-//
-/** Usage
-
-
-> ./mill nativeLink  # Build and link native binary
-...
-compiling 1 Scala source to ...
-
-> ./mill releaseMode # Generate some files in `out` directory about the `releaseMode`. Default releaseMode is set to Debug.
-
-> ./mill nativeOptimize # Generate some files in `out` directory about native optimization. The Default value is true.
 
-> ./mill nativeIncrementalCompilation # Generate config files in `out` directory about native incremental compilation. Default is false.  
+// This example demonstrates a simple Scala program that generates HTML content
+// from user-provided text and prints it to the standard output, utilizing Scala
+// Native for native integration and `mainargs` for command-line argument parsing.
 
-> ./mill nativeLinkingOptions # Generate config files in `out` directory about the path in native linking options. Default path is `"-L/usr/local/lib`.
+/** Usage
 
+> ./mill show nativeLink  # Build and link native binary
+...
+done compiling
 
 */
-
-//// SNIPPET:END
-
-//
-// You can run `+mill resolve __+` to see a full list of the different tasks that
-// are available, `+mill resolve _+` to see the tasks within `foo`,
-// `mill inspect compile` to inspect a task's doc-comment documentation or what
-// it depends on, or `mill show foo.scalaVersion` to show the output of any task.
-//
-// The most common *tasks* that Mill can run are cached *targets*, such as
-// `compile`, and un-cached *commands* such as `foo.run`. Targets do not
-// re-evaluate unless one of their inputs changes, whereas commands re-run every
-// time.
-
-

example/scalalib/native/2-interop/build.mill

@@ -9,19 +9,23 @@ object `package` extends RootModule with ScalaNativeModule {
     def ivyDeps = Agg(ivy"com.lihaoyi::utest::0.8.4")
     def testFramework = "utest.runner.Framework"
   }
-
-  def nativeLinkingOptions = Seq("-L" + millSourcePath.toString + "/target")
 
-  // Compiled C
-  def nativeCompiled = T {
-    os.makeDir.all(millSourcePath / "target")
+  // Additional source folder to put C sources
+  def nativeSources = Task.Sources(millSourcePath / "resources/scala-native")
+
+  def nativeLinkingOptions = Seq("-L" + Task.dest.toString)
 
+  // Compiled C
+  def nativeCompiled = Task {
+    val cSourceFiles = nativeSources().map(_.path).flatMap(os.walk(_)).filter(_.ext == "c")
+    val output = "libHelloWorld.so"
+
     os.proc("gcc", "-m64", "-shared",
-      "-c", millSourcePath.toString + "/resources/scala-native/HelloWorld.c",
-      "-o", millSourcePath.toString + "/target/libHelloWorld.so"
+      "-c", cSourceFiles,
+      "-o", output
     ).call(stdout = os.Inherit)
 
-    PathRef(T.dest / "target/libHelloWorld.so")    
+    PathRef(Task.dest / output)
   }
 }
 
@@ -53,6 +57,7 @@ object `package` extends RootModule with ScalaNativeModule {
 /** Usage
 
 > ./mill nativeCompiled
+...
 
 > ./mill run
 Running HelloWorld function
@@ -63,4 +68,3 @@ Reversed: !dlroW ,olleH
 Tests: 1, Passed: 1, Failed: 0
 
 */
-

example/scalalib/native/3-multi-module/build.mill

@@ -1,4 +1,3 @@
-//// SNIPPET:BUILD
 package build
 import mill._, scalalib._, scalanativelib._
 
@@ -11,20 +10,24 @@ trait MyModule extends ScalaNativeModule {
     def testFramework = "utest.runner.Framework"
   }
 
-  def nativeLinkingOptions = Seq("-L" + millSourcePath.toString + "/target")
-  def barSource = millSourcePath.toString + "/resources/scala-native"
+  // Additional source folder to put C sources
+  def nativeSources = Task.Sources(millSourcePath / "resources/scala-native")
+
+  def nativeLinkingOptions = Seq("-L" + Task.dest.toString)
+  //def barSource = millSourcePath.toString + "/resources/scala-native"
 
   // Compile C
   def nativeCompiled = Task {
-    os.makeDir.all(millSourcePath / "target")
+    val cSourceFiles = nativeSources().map(_.path).flatMap(os.walk(_)).filter(_.ext == "c")
+    val output = "libHelloWorldBar.so"
 
     os.proc(
       "gcc", "-m64", "-shared", "-fPIC", 
-      millSourcePath.toString + "/resources/scala-native/HelloWorldBar.c",
-      "-o", millSourcePath.toString + "/target/libHelloWorldBar.so")
+      cSourceFiles,
+      "-o", output)
     .call(stdout = os.Inherit)
 
-    PathRef(Task.dest / "target/libHelloWorldBar.so")
+    PathRef(Task.dest / output)
   }  
 
 }
@@ -35,24 +38,22 @@ object foo extends MyModule {
   def ivyDeps = Agg(ivy"com.lihaoyi::mainargs::0.7.6")
 
   // Compile C
-  def nativeCompiled = T {
-    os.makeDir.all(millSourcePath / "target")
+  def nativeCompiled = Task {
+    val cSourceFiles = nativeSources().map(_.path).flatMap(os.walk(_)).filter(_.ext == "c")
+    val output = "libHelloWorldFoo.so"
 
     os.proc(
       "gcc", "-m64", "-shared", "-fPIC",
-      "-I", barSource,
-      millSourcePath.toString + "/resources/scala-native/HelloWorldFoo.c",
-      "-o", millSourcePath.toString + "/target/libHelloWorldFoo.so")
+      cSourceFiles,
+      "-o", output)
     .call(stdout = os.Inherit)
 
-    PathRef(T.dest / "target/libHelloWorldFoo.so")
+    PathRef(T.dest / output)
   }
 }
 
 object bar extends MyModule {
-    def bar = "Bar"
 }
-//// SNIPPET:END
 
 // This example contains a simple Mill build with two modules, `foo` and `bar`.
 // We don't mark either module as top-level using `extends RootModule`, so
@@ -67,8 +68,6 @@ object bar extends MyModule {
 //
 // The above builds expect the following project layout:
 //
-//// SNIPPET:TREE
-//
 // ----
 // build.mill
 // bar/
@@ -90,14 +89,10 @@ object bar extends MyModule {
 //         Foo.scala
 //
 // ----
-//
-//// SNIPPET:END
-
 //
 
 /** Usage
 
-
 > ./mill bar.run hello
 Running HelloWorld function
 Done...

example/scalalib/native/4-common-config/build.mill

@@ -1,9 +1,3 @@
-// This example shows some of the common tasks you may want to override on a
-// `ScalaNativeModule`: specifying the `releaseMode`, `nativeLinkStubs`
-// `nativeIncrementalCompilation, `nativeLinkingOptions` and `nativeWorkdir`.
-
-
-//// SNIPPET:BUILD
 package build
 import mill._, scalalib._, scalanativelib._, scalanativelib.api._
 
@@ -17,23 +11,24 @@ object `package` extends RootModule with ScalaNativeModule {
   )
 
   // Set the releaseMode to ReleaseFast.
-  def releaseMode: T[ReleaseMode] = T { ReleaseMode.ReleaseFast }
+  def releaseMode: T[ReleaseMode] = ReleaseMode.ReleaseFast
 
   // Set linking of `@stub` methods to true.
-  def nativeLinkStubs: T[Boolean] = T { true }
+  def nativeLinkStubs: T[Boolean] = true
 
   // Set incremental compilation to true
-  def nativeIncrementalCompilation: T[Boolean] = T { true }
+  def nativeIncrementalCompilation: T[Boolean] = true
 
   // Set nativeLinkingOptions path to a directory named `target`.
   def nativeLinkingOptions = Seq("-L" + millSourcePath.toString + "/target")
 
   // Set nativeWorkdir directory to `newDir`
-  def nativeWorkdir = T { T.dest / "newDir" }
+  def nativeWorkdir = T.dest / "newDir"
 }
-//// SNIPPET:END
 
-//
+// This example shows some of the common tasks you may want to override on a
+// `ScalaNativeModule`: specifying the `releaseMode`, `nativeLinkStubs`
+// `nativeIncrementalCompilation, `nativeLinkingOptions` and `nativeWorkdir`.
 
 /** Usage
 
@@ -55,5 +50,5 @@ true
 
 > ./mill show nativeWorkdir
 ...
-*/
 
+*/