From 3e9188f4045f7fdc0db518e0fcfeab0421265ffe Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@keyman.com>
Date: Thu, 7 Dec 2017 15:04:53 +0700
Subject: [PATCH] Update 'package for distribution' command to bundle both js
 and kmx

---
 .../TIKE/child/UfrmPackageEditor.pas          |  7 ++++---
 .../TIKE/project/kmnProjectFileUI.pas         | 19 +++++++++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/windows/src/developer/TIKE/child/UfrmPackageEditor.pas b/windows/src/developer/TIKE/child/UfrmPackageEditor.pas
index 149ed9cef3..a49f7dd15c 100644
--- a/windows/src/developer/TIKE/child/UfrmPackageEditor.pas
+++ b/windows/src/developer/TIKE/child/UfrmPackageEditor.pas
@@ -255,7 +255,7 @@ type
   public
     function GetPack: TKPSFile;
 
-    procedure CreateFromKMX(FFileName: WideString);
+    procedure CreateFromCompiledKeyboard(FKMXFilename, FJSFilename: string);
 
     procedure FindError(const Filename: string; s: string); override;   // I4081
 
@@ -1210,9 +1210,10 @@ begin
   end;
 end;
 
-procedure TfrmPackageEditor.CreateFromKMX(FFileName: WideString);
+procedure TfrmPackageEditor.CreateFromCompiledKeyboard(FKMXFilename, FJSFilename: string);
 begin
-  AddFile(FFileName);
+  if FKMXFilename <> '' then AddFile(FKMXFilename);
+  if FJSFilename <> '' then AddFile(FJSFilename);
 end;
 
 {-------------------------------------------------------------------------------
diff --git a/windows/src/developer/TIKE/project/kmnProjectFileUI.pas b/windows/src/developer/TIKE/project/kmnProjectFileUI.pas
index 65df8642f0..6d5fb89f14 100644
--- a/windows/src/developer/TIKE/project/kmnProjectFileUI.pas
+++ b/windows/src/developer/TIKE/project/kmnProjectFileUI.pas
@@ -43,7 +43,7 @@ type
     function FontDialog(FSilent: Boolean): Boolean;   // I4057
     function InstallKeyboard: Boolean;
     function UninstallKeyboard: Boolean;
-    function PackageFile(FSilent: BOolean): Boolean;
+    function PackageFile(FSilent: Boolean): Boolean;
     function GetProjectFile: TkmnProjectFile;
 
     procedure ReloadJSON;
@@ -212,15 +212,22 @@ begin
   Result := FOwner as TkmnProjectFile;
 end;
 
-function TkmnProjectFileUI.PackageFile(FSilent: BOolean): Boolean;
+function TkmnProjectFileUI.PackageFile(FSilent: Boolean): Boolean;
 var
-  FCompiledName: string;
+  FKMXTarget, FJSTarget: string;
 begin
   Result := False;
-  FCompiledName := ProjectFile.TargetFilename;
-  if not TestKeyboardState(FCompiledName, FSilent) then Exit;
+  FKMXTarget := ProjectFile.TargetFilename;
+  FJSTarget := ProjectFile.JSTargetFilename;
+
+  if (FKMXTarget <> '') and not TestKeyboardState(FKMXTarget, FSilent) then
+    Exit;
+
+  if (FJSTarget <> '') and not TestKeyboardState(FJSTarget, FSilent) then
+    Exit(False);
+
   with TfrmPackageEditor.Create(frmKeymanDeveloper) do
-    CreateFromKMX(FCompiledName);
+    CreateFromCompiledKeyboard(FKMXTarget, FJSTarget);
   Result := True;
 end;