From: Stefan Csomor Date: Sun, 28 Aug 2011 13:00:38 +0000 (+0000) Subject: make sure svn info for an already existing .xcodeproj folder is not deleted, replace... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2824962c5ab69c7fef145e75c0b1ff9cebfa51e7 make sure svn info for an already existing .xcodeproj folder is not deleted, replace project file itself in place git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68938 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/build/osx/makeprojects.applescript b/build/osx/makeprojects.applescript index e7f7032ab2..de5e2fa05f 100644 --- a/build/osx/makeprojects.applescript +++ b/build/osx/makeprojects.applescript @@ -160,14 +160,26 @@ end readFilesList -- creates a new project file from the respective template on instantiateProject(theProject) set projectName to projectName of theProject - set template to POSIX file (osxBuildFolder & projectName & "_in.xcodeproj") - set projectFile to POSIX file (osxBuildFolder & projectName & ".xcodeproj") + set template to (osxBuildFolder & projectName & "_in.xcodeproj") + set projectFile to (osxBuildFolder & projectName & ".xcodeproj") tell application "Finder" - try - delete file projectFile - end try - set duplicateProject to duplicate template with replace - set name of duplicateProject to (projectName & ".xcodeproj") + if exists projectFile as POSIX file then + set templateContentFile to (osxBuildFolder & projectName & "_in.xcodeproj/project.pbxproj") + set projectContentFile to (osxBuildFolder & projectName & ".xcodeproj/project.pbxproj") + try + tell me + do shell script "rm -f " & quoted form of projectContentFile + end tell + end try + try + tell me + do shell script "cp " & quoted form of templateContentFile & " " & quoted form of projectContentFile + end tell + end try + else + set duplicateProject to duplicate (template as POSIX file) with replace + set name of duplicateProject to (projectName & ".xcodeproj") + end if end tell end instantiateProject