Hi Mike,
Here is the fix. Could you commit it? Thanks Pierre
Index: /Users/pierre/Projects/workspace/woproject/wolips/plugins/
org.objectstyle.wolips.builder/java/org/objectstyle/wolips/builder/
internal/BuildResourceValidator.java
===================================================================
--- /Users/pierre/Projects/workspace/woproject/wolips/plugins/
org.objectstyle.wolips.builder/java/org/objectstyle/wolips/builder/
internal/BuildResourceValidator.java (revision 2705)
+++ /Users/pierre/Projects/workspace/woproject/wolips/plugins/
org.objectstyle.wolips.builder/java/org/objectstyle/wolips/builder/
internal/BuildResourceValidator.java (working copy)
..-134,6 +134,10 @@
|| resource.getName().equals("CVS")) {
return false;
}
+ // PJYF May 21 2006 We need to exclude the temp wrappers
+ if (resource.getName().endsWith("~")) {
+ return false;
+ }
if (this.project.matchesResourcesPattern(resource)
|| this.project.matchesWOAppResourcesPattern(resource)
|| this.project.matchesClassesPattern(resource)) {
Index: /Users/pierre/Projects/workspace/woproject/wolips/plugins/
org.objectstyle.wolips.builder/java/org/objectstyle/wolips/builder/
internal/DotXcodeBuilder.java
===================================================================
--- /Users/pierre/Projects/workspace/woproject/wolips/plugins/
org.objectstyle.wolips.builder/java/org/objectstyle/wolips/builder/
internal/DotXcodeBuilder.java (revision 2705)
+++ /Users/pierre/Projects/workspace/woproject/wolips/plugins/
org.objectstyle.wolips.builder/java/org/objectstyle/wolips/builder/
internal/DotXcodeBuilder.java (working copy)
..-256,11 +256,14 @@
// System.out.println("DotXcodeBuilder.handleWoappResources: " +
// resourcePath + ", " + (_resource instanceof IFolder));
if (_resource instanceof IFolder) {
- if (myXcodeProject != null) {
- myXcodeProject.addResourceFolderReference(resourcePath);
- }
- if (myXcodeProjProject != null) {
- myXcodeProjProject.addResourceFolderReference(resourcePath);
+ // PJYF May 21 2006 We need to exclude the temp wrappers
+ if (! _resource.getName().endsWith("~")) {
+ if (myXcodeProject != null) {
+ myXcodeProject.addResourceFolderReference(resourcePath);
+ }
+ if (myXcodeProjProject != null) {
+ myXcodeProjProject.addResourceFolderReference(resourcePath);
+ }
}
} else if (_resource instanceof IFile) {
IContainer parent = _resource.getParent();
..-267,8 +270,10 @@
boolean addResourceFileReference = true;
if (parent != null) {
String parentName = parent.getName().toLowerCase();
+ // PJYF May 21 2006 We need to exclude the temp wrappers
if (parentName.endsWith(".eomodeld")
- || parentName.endsWith(".wo")) {
+ || parentName.endsWith(".wo")
+ || parentName.endsWith("~")) {
addResourceFileReference = false;
}
}
On 21-May-06, at 2:58 PM, Mike Schrag wrote:
> There have been some relatively recent checkins related to file
> sets, etc that might have resulted in this problem ... I can't
> remember who was working on it offhand?
>
> On May 21, 2006, at 5:54 PM, Pierre Frisch wrote:
>
>> Mike,
>>
>> I know what is going on even if I do not know how to fix it yet.
>> Here is the deal. EOModeler creates a backup package xxx.eomodeld~
>> in the same directory as the current model being opened, in my
>> case the Resource directory. When it saves it does not remove that
>> old file and that is what causes the problem. If the xxx.eomodeld~
>> is present WOLips tries to include it in the generated .xcodeproj
>> file by adding an entry similar to:
>>
>> 00000000000000000000002b =
>> {
>> isa = PBXFileReference;
>> lastKnownFileType = sourcecode.java;
>> name = index.eomodeld;
>> path = Resources/AdControl.eomodeld~/index.eomodeld;
>> sourceTree = "<group>";
>> };
>>
>> This causes XCode to choke.
>>
>> 2006-05-21 13:57:36.733 Xcode[6422] A system font, {name =
>> LucidaGrande; pointSize = 12}, is requested to be deallocated.
>> Ignoring...
>> 2006-05-21 14:04:32.010 Xcode[6422] CFLog (0):
>> CFPropertyListCreateFromXMLData(): Old-style plist parser: missing
>> semicolon in dictionary.
>> 2006-05-21 14:04:32.014 Xcode[6422] CFLog (0):
>> CFPropertyListCreateFromXMLData(): The file name for this data
>> might be (or it might not): /Users/pierre/Projects/workspace/
>> AdAccess/AdAccess.xcodeproj/project.pbxproj
>> 2006-05-21 14:04:32.225 Xcode[6422] XML parser error:
>> Unexpected character { at line 2
>> Old-style plist parser error:
>> Missing ';' on line 287
>>
>>
>> line 287 is the path line shown above.
>>
>> Why is xxx.eomodeld~ included at all? It is filtered out in the
>> resource.exclude.patternset and should not be included in the
>> xcodeproj generation.
>>
>> What I do not understand is that this did not used to be a problem
>> until a few days ago.
>>
>> Thanks
>>
>> Pierre
>>
>>
>>
>>
>>
>> On 20-May-06, at 11:14 AM, Pierre Frisch wrote:
>>
>>> I had installed a local version to test the eogen version but I
>>> then deleted the feature and plug-in from eclipse and reinstalled
>>> from the nightly build so I have the "official" 129 version.
>>>
>>> If I delete the .xcodeproj it will be rebuild but XCode cannot
>>> open it. It is really bizarre as the generated file is quite
>>> different. For a frameowrk that works the file start with:
>>>
>>> // !$*UTF8*$!
>>> {
>>> archiveVersion = 1;
>>> classes = {
>>> };
>>> objectVersion = 42;
>>> objects = {
>>>
>>> /* Begin PBXBuildStyle section */
>>> 000000000000000000000031 /* Debug */ = {
>>> isa = PBXBuildStyle;
>>> buildSettings = {
>>> COPY_PHASE_STRIP = NO;
>>> };
>>> name = Debug;
>>> };
>>> 000000000000000000000032 /* Release */ = {
>>> isa = PBXBuildStyle;
>>> buildSettings = {
>>> COPY_PHASE_STRIP = YES;
>>> };
>>> name = Release;
>>> };
>>> /* End PBXBuildStyle section */
>>>
>>> On the one that is broken the file starts with:
>>>
>>>
>>> {
>>> archiveVersion = 1;
>>> classes =
>>> {};
>>> objectVersion = 42;
>>> objects =
>>> {
>>> 000000000000000000000001 =
>>> {
>>> isa = PBXFileReference;
>>> lastKnownFileType = sourcecode.java;
>>> name = ModelGroupDelegate.java;
>>> path = src/com/blackpress/adentity/utilities/
>>> ModelGroupDelegate.java;
>>> sourceTree = "<group>";
>>> };
>>> 000000000000000000000002 =
>>> {
>>> fileRef = 000000000000000000000001;
>>> isa = PBXBuildFile;
>>> };
>>> 000000000000000000000003 =
>>> {
>>> isa = PBXFileReference;
>>> lastKnownFileType = sourcecode.java;
>>> name = LockErrorScreamerEditingContext.java;
>>> path = src/com/blackpress/adentity/utilities/
>>> LockErrorScreamerEditingContext.java;
>>> sourceTree = "<group>";
>>> };
>>>
>>> I don't understand why this has a different behavior and I can
>>> see that on the two frameworks that contain a model, all the
>>> others appears to work fine.
>>>
>>> Thanks
>>>
>>> Pierre
>>>
>>> On 20-May-06, at 10:47 AM, Mike Schrag wrote:
>>>
>>>> Hmm .. I'm using the latest and greatest build from my local
>>>> version (what would be 130 which isn't up on the site yet), and
>>>> it seems to be working fine for me. I can open EOModeler and it
>>>> finds my prototypes, and I can open Xcode from my .xcodeproj
>>>> (.xcode tries to upgrade, but it upgrades it to a file that
>>>> appears to work fine?). Oh, and this project has a .eogen
>>>> file. There should be nothing special about EOGenerator
>>>> support. It literally is just a regular file that just happens
>>>> to have a file association. Are you building from a local
>>>> version or from the build server?
>>>>
>>>> On May 20, 2006, at 10:53 AM, Pierre Frisch wrote:
>>>>
>>>>> Any project that use the eogenerator feature appears to have a
>>>>> broken project file. When I try to open it it comes up with a
>>>>> project cannot be parsed message.
>>>>>
>>>>> I cannot see what is the cause but it appears to be the case or
>>>>> at least it is with the commits between the 15 and the 19th.
>>>>>
>>>>> This is a very annoying bug as without the Xcode project
>>>>> EOModeler will not load the Prototype model.
>>>>>
>>>>> Thanks
>>>>>
>>>>> Pierre
>>>>>
>>>>> On 19-May-06, at 11:06 AM, John Huss wrote:
>>>>>
>>>>>> I had the same problem.
>>>>>>
>>>>>> John
>>>>>>
>>>>>> On 5/19/06, Pierre Frisch <pierre.frisc..pearway.com> wrote:
>>>>>>> Am I the only one? The Xcode project is broken with the
>>>>>>> latest build
>>>>>>> (May 19 2006)
>>>>>>>
>>>>>>> Thanks
>>>>>>>
>>>>>>> Pierre
>>>>>>>
>>>>>>
>>>>>
>>>>
>>>>
>>>
>>
>
This archive was generated by hypermail 2.0.0 : Sun May 21 2006 - 19:17:51 EDT