iphonelazext: fix wrong SDK selection. Fixed Xcode project updates

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

components/iphonelazext/ideext.pas

@@ -63,9 +63,9 @@ var
   ext : String;
 begin
   if Project.LazCompilerOptions.TargetFilename<>'' then
-    Result:=Project.LazCompilerOptions.TargetFilename
+    Result:=ExtractFileName(Project.LazCompilerOptions.TargetFilename)
   else begin
-    Result:=Project.MainFile.Filename;
+    Result:=ExtractFileName(Project.MainFile.Filename);
     ext:=ExtractFileExt(Result);
     Result:=Copy(Result, 1, length(Result)-length( ext ) );
   end;
@@ -345,7 +345,8 @@ begin
 
   build := TStringList.Create;
 
-  tname:=ExtractFileName( ChangeFileExt(LazarusIDE.ActiveProject.MainFile.Filename, ''));
+  tname:=ExtractFileName( LazarusIDE.ActiveProject.MainFile.Filename);
+  tname:=ChangeFileExt(tname, '');
   plistname:=tname+'.plist';
 
   build.Values['INFOPLIST_FILE'] := '"'+plistname+'"';

components/iphonelazext/iphonebundle.pas

@@ -244,8 +244,11 @@ begin
       ]);
   if FileExists(InfoFileName) then DeleteFile(InfoFileName);
   fs:=TFileStream.Create(InfoFileName, fmCreate or fmOpenWrite);
-  if s<>'' then fs.Write(s[1], length(s));
+  try
-  fs.Free;
+    if s<>'' then fs.Write(s[1], length(s));
+  finally
+    fs.Free;
+  end;
 end;
 
 end.

components/iphonelazext/iphoneextoptions.pas

@@ -310,8 +310,8 @@ begin
   info:=GetSDKInfo(SDKVer);
   if not Assigned(info) then Result:=''
   else begin
-    if simulator then Result:=info.devName
+    if simulator then Result:=info.simName
-    else Result:=info.simName;
+    else Result:=info.devName;
   end;
 end;
 
@@ -322,8 +322,8 @@ begin
   info:=GetSDKInfo(SDKVer);
   if not Assigned(info) then Result:=''
   else begin
-    if simulator then Result:=info.devPath
+    if simulator then Result:=info.simPath
-    else Result:=info.simPath;
+    else Result:=info.devPath;
   end;
 end;
 
@@ -406,7 +406,7 @@ type
     Name      : String;
     Alternate : String; {alternate SDK -> iphonesimulator for iphoneos}
     Version   : String;
-    isDevice  : Boolean; {true for real iPhoneOS, false for iPhoneSimulator}
+    isSim     : Boolean; {true for real iPhoneOS, false for iPhoneSimulator}
   end;
 
 // todo: implement reading .plist via OSX functions! (in case a .plist format changes)
@@ -440,7 +440,7 @@ const
   PlatformName: array [Boolean] of string = ('iPhoneOS.platform','iPhoneSimulator.platform');
   SDKSubDir = PathDelim+'Developer'+PathDelim+'SDKs'+PathDelim;
 var
-  isdev : Boolean;
+  isSim : Boolean;
   dir   : string;
   sr    : TSearchRec;
   sdks  : array of TSDKDescription;
@@ -466,13 +466,13 @@ begin
 
   cnt:=0;
 
-  for isdev:=false to true do begin
+  for isSim:=false to true do begin
-    dir := IncludeTrailingPathDelimiter(PlatformDir) + PlatformName[isdev] + SDKSubDir;
+    dir := IncludeTrailingPathDelimiter(PlatformDir) + PlatformName[isSim] + SDKSubDir;
     if FindFirst(dir+'*', faAnyFile, sr)=0 then begin
       repeat
         if (sr.Attr and faDirectory>0) and (ExtractFileExt(sr.Name) = '.sdk') then
           if isSDKDir( dir + sr.Name, descr) then begin
-            descr.isDevice:=isdev;
+            descr.isSim:=isSim;
             AddDescription(descr);
           end;
       until FindNext(sr)<>0;
@@ -481,11 +481,11 @@ begin
   end;
 
   for i:=0 to cnt-1 do
-    if sdks[i].isDevice then begin
+    if not sdks[i].isSim then begin
       simname:='';
       simpath:='';
       for j:=0 to cnt-1 do
-        if (not sdks[j].isDevice) and (sdks[i].Alternate=sdks[j].Name) then begin
+        if (sdks[j].isSim) and (sdks[i].Alternate=sdks[j].Name) then begin
           simname:=sdks[j].Name;
           simpath:=sdks[j].FullPath;
         end;

components/iphonelazext/lazfilesutils.pas

@@ -63,8 +63,6 @@ begin
     pth:=allfiles[i];
     if (FilterMask='') or (not MaskList.Matches(pth)) then begin
       linkname:=linkdir+Copy(pth, length(curdir), length(pth));
-      writeln('link from: ', pth);
-      writeln('       to: ', linkname);
       fpSymlink(PAnsiChar(pth), PAnsiChar(linkname));
     end;
   end;