Merge pull request #18 from fizzed/feature/new-win-native-compile

Feature/new win native compile

Author: jjlauer

.blaze/blaze.conf

@@ -1,8 +1,7 @@
 blaze.dependencies = [
+    "com.fizzed:blaze-maven",
     "com.fizzed:blaze-ssh",
-    "com.fizzed:blaze-public-project:3.1.0",
-    # force buildx version, can be removed once blaze-public-project is updated
-    #"com.fizzed:buildx:2.0.3-SNAPSHOT"
+    "com.fizzed:blaze-public-project:3.3.0"
 ]
 
 java.source.version = 8

.blaze/blaze.java

@@ -1,17 +1,25 @@
 import com.fizzed.blaze.Contexts;
 import com.fizzed.blaze.Task;
 import com.fizzed.blaze.TaskGroup;
+import com.fizzed.blaze.incubating.VcVars;
+import com.fizzed.blaze.maven.MavenClasspath;
+import com.fizzed.blaze.maven.MavenProject;
+import com.fizzed.blaze.maven.MavenProjects;
 import com.fizzed.blaze.project.PublicBlaze;
 import com.fizzed.buildx.Buildx;
 import com.fizzed.buildx.Target;
 import com.fizzed.jne.NativeTarget;
 import com.fizzed.jne.OperatingSystem;
 
 import java.nio.file.Path;
-import java.util.List;
+import java.util.*;
 
 import static com.fizzed.blaze.Contexts.withBaseDir;
 import static com.fizzed.blaze.Systems.*;
+import static com.fizzed.blaze.Systems.exec;
+import static com.fizzed.blaze.incubating.VisualStudios.vcVars;
+import static com.fizzed.blaze.incubating.VisualStudios.vcVarsExec;
+import static com.fizzed.blaze.maven.MavenProjects.mavenClasspath;
 import static com.fizzed.blaze.util.Globber.globber;
 import static java.util.Arrays.asList;
 
@@ -24,10 +32,14 @@ public class blaze extends PublicBlaze {
     private final Path targetDir = projectDir.resolve("target");
 
     @Task(group="project", order = 0, value="Runs a demo of detecting all JDKs on this host")
-    public void demo_detect_javas() throws Exception {
-        // mvn process-test-classes exec:exec -Dexec.classpathScope=test -Dexec.executable=java -Dexec.args="-cp %classpath com.fizzed.jne.JavaHomesDemo"
-        exec("mvn", "process-test-classes", "exec:exec",
-            "-Dexec.classpathScope=test", "-Dexec.executable=java", "-Dexec.args=-cp %classpath com.fizzed.jne.JavaHomesDemo").run();
+    public void demo_java_homes() throws Exception {
+        final MavenProject maven = MavenProjects.mavenProject(withBaseDir("../pom.xml")).run();
+
+        final MavenClasspath classpath = mavenClasspath(maven, "test", "test-compile")
+            .run();
+
+        exec("java", "-cp", classpath, "com.fizzed.jne.JavaHomesDemo")
+            .run();
     }
 
     @Task(group="project", order = 1, value="Builds native libraries and executables for the local os/arch")
@@ -48,11 +60,18 @@ public void build_natives() throws Exception {
         final String libname = nativeTarget.resolveLibraryFileName("helloj");
 
         if (nativeTarget.getOperatingSystem() == OperatingSystem.WINDOWS) {
-            // unfortunately its easiest to delegate this to helper script
-            exec("setup/build-native-lib-windows-action.bat", nativeTarget.toJneOsAbi(), nativeTarget.toJneArch())
-                .workingDir(this.projectDir)
-                .verbose()
-                .run();
+            // we may be cross-compiling so we pass the arch we want
+            try (VcVars vcVars = vcVars().arch(nativeTarget.getHardwareArchitecture().name()).verbose().run()) {
+                log.info("Building jcat executable...");
+                vcVarsExec(vcVars, "nmake", "-f", "VCMakefile")
+                    .workingDir(targetJcatDir)
+                    .run();
+
+                log.info("Building helloj library...");
+                vcVarsExec(vcVars, "nmake", "-f", "VCMakefile")
+                    .workingDir(targetLibHelloJDir)
+                    .run();
+            }
         } else {
             String cmd = "make";
             // freebsd and openbsd, we need to use gmake

.blaze/pom.xml

@@ -23,7 +23,7 @@
     <dependency>
       <groupId>com.fizzed</groupId>
       <artifactId>blaze-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.4.0</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -48,22 +48,27 @@
     <dependency>
       <groupId>com.fizzed</groupId>
       <artifactId>blaze-ivy</artifactId>
-      <version>2.3.0</version>
+      <version>2.4.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.ivy</groupId>
       <artifactId>ivy</artifactId>
       <version>2.5.3</version>
     </dependency>
+    <dependency>
+      <groupId>com.fizzed</groupId>
+      <artifactId>blaze-maven</artifactId>
+      <version>2.4.0</version>
+    </dependency>
     <dependency>
       <groupId>com.fizzed</groupId>
       <artifactId>blaze-ssh</artifactId>
-      <version>2.3.0</version>
+      <version>2.4.0</version>
     </dependency>
     <dependency>
       <groupId>com.fizzed</groupId>
       <artifactId>blaze-public-project</artifactId>
-      <version>3.1.0</version>
+      <version>3.3.0</version>
     </dependency>
   </dependencies>
 </project>

blaze.jar

@@ -3,8 +3,8 @@ Buildx Results
 
 Cross platform tests based on https://github.com/fizzed/buildx
 
-Commit: f34dc4cf6c3a93267a80093413e8ed37122219c5
-Date: 2025-11-05T15:07:54.827383687Z[UTC]
+Commit: 369328e98296758e707745d02238e6b500a5ddea
+Date: 2025-11-05T22:19:20.051604143Z[UTC]
 
 jdk-25 (Zulu JDK 25.0.1 (Linux, x64, /usr/lib/jvm/zulu-jdk-25.0.1.8))...... success
 jdk-21 (Zulu JDK 21.0.8 (Linux, x64, /usr/lib/jvm/zulu-jdk-21.0.8.9))...... success