Merge remote-tracking branch 'upstream/master'

JeroenVandezande · Jan 30, 2013 · 464e206 · 464e206
2 parents 82679ab + 2df728c
commit 464e206
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/RemObjects.Train/API/Delphi.pas b/RemObjects.Train/API/Delphi.pas
@@ -50,6 +50,9 @@ interface
   VersionInfo = public class
   private
   public
+    constructor ();
+    property codePage: UInt16;
+    property resLang: UInt16;
     property isDll: Boolean;
     property version: String;
     property fileVersion: String;
@@ -191,7 +194,8 @@ implementation
 
   if aVersion <> nil then begin
     var pev := new Win32VersionInfoResource();
-    pev.ResLang := 0;
+    pev.CodePage := aVersion.codePage;
+    pev.ResLang := aVersion.resLang;
     pev.IsDll := aVersion.isDll;
     var lVer := ParseVersion(coalesce(aVersion.version, ''));
     var lFileVer := ParseVersion(coalesce(aVersion.fileVersion,aVersion.version, ''));
@@ -251,4 +255,10 @@ implementation
   end;
 end;
 
+constructor VersionInfo();
+begin
+  codePage := 1252;   
+  resLang := 1033;
+end;
+
 end.
diff --git a/RemObjects.Train/API/Innosetup.pas b/RemObjects.Train/API/Innosetup.pas
@@ -15,7 +15,7 @@ interface
     method &Register(aServices: IApiRegistrationServices);
 
     [WrapAs('inno.build')]
-    class method InnoBuild(aServices: IApiRegistrationServices; aFilename: String; aOptions: InnoSetupOptions);
+    class method InnoBuild(aServices: IApiRegistrationServices; ec: RemObjects.Script.EcmaScript.ExecutionContext; aFilename: String; aOptions: InnoSetupOptions);
   end;
 
   InnoSetupOptions = public class
@@ -33,8 +33,9 @@ implementation
     .AddValue('build', RemObjects.Train.MUtilities.SimpleFunction(aServices.Engine, typeOf(InnoSetupPlugin), 'InnoBuild'));
 end;
 
-class method InnoSetupPlugin.InnoBuild(aServices: IApiRegistrationServices; aFilename: String; aOptions: InnoSetupOptions);
+class method InnoSetupPlugin.InnoBuild(aServices: IApiRegistrationServices; ec: RemObjects.Script.EcmaScript.ExecutionContext; aFilename: String; aOptions: InnoSetupOptions);
 begin
+  aFilename := aServices.ResolveWithBase(ec, aFilename);
   var lPath := String(aServices.Environment['InnoSetup']);
   if String.IsNullOrEmpty(lPath) then
     lPath := String(Microsoft.Win32.Registry.GetValue('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Inno Setup 5_is1', 'InstallLocation', ''));
@@ -46,7 +47,7 @@ implementation
   var sb := new StringBuilder;
   sb.AppendFormat('"{0}"', aFilename);
   if not String.IsNullOrEmpty(aOptions:destinationFolder) then
-    sb.AppendFormat(' /O"{0}"', aOptions.destinationFolder);
+    sb.AppendFormat(' /O"{0}"', aServices.ResolveWithBase(ec, aOptions.destinationFolder));
 
 
  if aOptions <> nil then begin
@@ -57,7 +58,7 @@ implementation
  end;
 
  var lOutput:= new StringBuilder;
-  var n:= Shell.ExecuteProcess(lPath, sb.ToString, nil,false ,
+  var n:= Shell.ExecuteProcess(lPath, sb.ToString, aServices.WorkDir,false ,
   a-> locking lOutput do lOutput.Append(a),a-> locking lOutput do lOutput.Append(a), nil, nil);
 
 

diff --git a/RemObjects.Train/API/Interfaces.pas b/RemObjects.Train/API/Interfaces.pas
@@ -14,6 +14,7 @@ interface
     method RegisterTask(aTask: System.Threading.Tasks.Task; aSignature: String; aLogger: DelayedLogger);
     method UnregisterTask(aTask: System.Threading.Tasks.Task);
 
+    property WorkDir: String read;
     property Environment: Environment read;
     property Globals: GlobalObject read;
     property Engine: Engine read;

diff --git a/RemObjects.Train/API/Resources.pas b/RemObjects.Train/API/Resources.pas
@@ -435,7 +435,7 @@ constructor UnmanagedResourceFile;
   wr.Write(0 as System.UInt16);
   wr.Write(0 as System.UInt16);
   wr.Write(0 as System.UInt16);
-  b := Encoding.Unicode.GetBytes(String.Format('{0:X4}{1:X4}', CodePage, ResLang));
+  b := Encoding.Unicode.GetBytes(String.Format('{0:X4}{1:X4}', ResLang, CodePage));
   wr.Write(b);
   wr.Write(0 as System.UInt16);
   var z: System.UInt16;