Pass command line arguments to packaged program on Windows (#13)

mini2Dx · Jul 31, 2019 · 0eb34cc · 0eb34cc
1 parent adc7c0e
commit 0eb34cc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,6 @@
+[1.6.0]
+- Exe now passes command line arguments to packaged program
+
 [1.5.1-SNAPSHOT]
 
 [1.5.0]

diff --git a/build.gradle b/build.gradle
@@ -34,7 +34,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 group = 'org.mini2Dx'
-version = '1.5.1-SNAPSHOT'
+version = '1.6.0'
 description = 'Gradle plugin for bundling your Java application for distribution on Windows, Mac and Linux'
 
 dependencies {

diff --git a/natives/windows/JavaApplicationConfig.cs b/natives/windows/JavaApplicationConfig.cs
@@ -53,7 +53,7 @@ public class JavaApplicationConfig
         [XmlElement("includesJre")]
         public bool IncludesJre { get; set; }
 
-        public String ToStartInfoArguments()
+        public String ToStartInfoArguments(String[] runtimeArgs)
         {
             StringBuilder arguments = new StringBuilder();
             if (VmArgs != null)
@@ -75,6 +75,11 @@ public String ToStartInfoArguments()
                 }
             }
 
+            foreach (String arg in runtimeArgs)
+            {
+                arguments.Append(" " + arg);
+            }
+
             return arguments.ToString();
         }
     }

diff --git a/natives/windows/Program.cs b/natives/windows/Program.cs
@@ -47,7 +47,7 @@ static void Main(string[] args)
 
                     try
                     {
-                        if (args.Length > 0)
+                        if (args.Length == 1 && args[0].Equals("--example"))
                         {
                             JavaApplicationConfig exampleConfig = new JavaApplicationConfig();
                             exampleConfig.ClassPath = new List<String>();
@@ -85,7 +85,7 @@ static void Main(string[] args)
                                 return;
                             }
                         }
-                        process.StartInfo.Arguments = applicationConfig.ToStartInfoArguments();
+                        process.StartInfo.Arguments = applicationConfig.ToStartInfoArguments(args);
                         process.StartInfo.WorkingDirectory = @AppDomain.CurrentDomain.BaseDirectory;
                         process.StartInfo.UseShellExecute = false;
                         process.StartInfo.CreateNoWindow = true;