* Adapt paths for Xcode versions 4.3 and above

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2625 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/iphonelazext/ideext.pas

@@ -452,6 +452,7 @@ begin
   try
     //ProjectBuilding(nil);
     path:=IncludeTrailingPathDelimiter(EnvOptions.SimBundle)+'Contents/MacOS/iPhone Simulator';
+    EnvOptions.SubstituteMacros(path);
     t.CommandLine:='"'+path+'"';
     t.CurrentDirectory:=UTF8Encode(GetSandBoxDir(ProjOptions.SpaceName));
     t.Execute;

components/iphonelazext/iphonebundle.pas

@@ -38,9 +38,7 @@ type
     MainNib     : WideString;
   end;
 
-function GetUserHomeDir: WideString;
+function GetiPhoneSimUserPath: WideString;
-
-function GetiPhoneSimUserPath(const UserHomeDir: WideString=''): WideString;
 
 procedure MakeSimSpaceStruct(const BundleName: WideString; var BundleAppDir: WideString);
 procedure MakeSimSpaceStruct(const iPhoneSimUserPath, BundleName: WideString; var BundleAppDir: WideString);
@@ -62,6 +60,10 @@ function RandomSpaceName: WideString;
 
 implementation
 
+uses
+  FileUtil,
+  iPhoneExtOptions;
+
 function RandomSpaceName: WideString;
 var
   g   : TGUID;
@@ -114,7 +116,12 @@ begin
   space8:=UTF8Encode(SpaceName);
 
   p:=IncludeTrailingPathDelimiter(IncludeTrailingPathDelimiter(path8)+space8);
-  Result:=UTF8Decode(p);
+  if DirectoryExistsUTF8(p) then
+    Result:=UTF8Decode(p)
+  else if DirectoryExistsUTF8(path8) then
+    result:=path8
+  else
+    result :='';
 end;
 
 procedure CreateBundle(const BundleName, ExeName: WideString; const Info: TiPhoneBundleInfo; var FullBundlePath, FullExeName: WideString);
@@ -132,21 +139,13 @@ begin
     Result:=w+PathDelim;
 end;
 
-function GetUserHomeDir: WideString;
+function GetiPhoneSimUserPath: WideString;
-begin
-  Result:=UTF8Decode(GetUserDir);
-end;
-
-function GetiPhoneSimUserPath(const UserHomeDir: WideString=''): WideString;
 var
-  nm : WideString;
+  s : String;
 begin
-  if UserHomeDir = '' then nm:=GetUserHomeDir
+  s := EnvOptions.SimAppsPath;
-  else nm:=UserHomeDir;
+  EnvOptions.SubstituteMacros(s);
-
+  result := s;
-  if nm='' then Exit;
-  if nm[length(nm)]<>'/' then nm:=nm+'/';
-  Result:=nm+'Library/Application Support/iPhone Simulator/User/Applications/';
 end;
 
 {

components/iphonelazext/iphoneextoptions.pas

@@ -20,8 +20,8 @@ unit iPhoneExtOptions;
 interface
 
 uses
-  Classes, SysUtils, IDEOptionsIntf, LazIDEIntf, ProjectIntf,
+  Classes, SysUtils, IDEOptionsIntf, LazIDEIntf, ProjectIntf, MacroIntf,
-  iPhoneBundle, DOM, XMLRead, XMLConf, XcodeUtils;
+  iPhoneBundle, DOM, XMLRead, XMLConf, XcodeUtils, FileUtil;
 
 const
   DefaultResourceDir = 'Resources';
@@ -95,6 +95,8 @@ type
     function GetSDKName(const SDKVer: String; simulator: Boolean): String;
     function GetSDKFullPath(const SDKVer: String; simulator: Boolean): String;
 
+    function SubstituteMacros(var s: string): boolean;
+
     procedure GetSDKVersions(Strings: TStrings);
     procedure RefreshVersions;
 
@@ -213,22 +215,21 @@ end;
 
 function GetDefaultPlatformPath: WideString;
 begin
-  //todo:
+  result := '/Applications/Xcode.app/Contents/Developer/Platforms';
-  Result:='/Developer/Platforms';
+  if not DirectoryExistsUTF8(result) then
+    Result:='/Developer/Platforms';
 end;
 
 function GetDefaultSimBundlePath: WideString;
 begin
-  //todo:
+  Result:='$(iOSPlatformsPath)' +
-  Result:=IncludeTrailingPathDelimiter(GetDefaultPlatformPath)+
           'iPhoneSimulator.platform/Developer/Applications/iPhone Simulator.app';
 end;
 
 function GetDefaultSimAppPath: WideSTring;
 begin
-  //todo:
+  Result:='$(home)'+
-  Result:=IncludeTrailingPathDelimiter(GetUserDir)+
+          'Library/Application Support/iPhone Simulator/$(iOSSDK)/Applications/';
-          'Library/Applications Support/iPhone Simulator/User/Applications/';
 end;
 
 constructor TiPhoneEnvironmentOptions.Create;
@@ -328,6 +329,13 @@ begin
   end;
 end;
 
+function TiPhoneEnvironmentOptions.SubstituteMacros(var s: string): boolean;
+begin
+  s := StringReplace(s, '$(iOSPlatformsPath)', IncludeTrailingPathDelimiter(PlatformsBaseDir), [rfReplaceAll, rfIgnoreCase]);
+  s := StringReplace(s, '$(iOSSDK)', DefaultSDK, [rfReplaceAll, rfIgnoreCase]);
+  result := IDEMacros.SubstituteMacros(s);
+end;
+
 procedure TiPhoneEnvironmentOptions.GetSDKVersions(Strings: TStrings);
 var
   i : Integer;