.cproject file is broken about lib_dsp

[xross]

There are other oddities in the "synch" commit that need tidying. Other project files modified etc. 2268742

Also, .build etc is checked in.

[ThomasGmeinder]

Thanks for reporting this.

I fixed this with pull request #78
by changing the file back to it’s original version:

git checkout db8fe95 -- .cproject

As a general rule:
Changes to .cproject files should never be committed.
Eclipse modifies these files regularly and so if they were checked in every commit would contain a bunch of changes to these eclipse metadata files.
This distracts from the manual changes in commit diffs and also causes merge issues (as shown by this issue).

.cproject and .project files have to be checked with the first commit to enable eclipse import.
But any changes afterwards should not be checked in.

In practise that means:
Eclipse will change the .cproject and .project files.
But these changes can be undone using git reset on the files (in the GUI or on command line)

From: Aaron Stewart <[email protected]mailto:[email protected]>
Reply-To: xmos/lib_dsp <[email protected]mailto:[email protected]>
Date: Wednesday, 14 September 2016 at 15:42
To: xmos/lib_dsp <[email protected]mailto:[email protected]>
Subject: [xmos/lib_dsp] .cproject file is broken (#77)

The lib_dsp/.cprojecthttps://github.com/xmos/lib_dsp/blob/master/lib_dsp/.cproject file appears to have been committed with some of the inline diff markers still in there. e.g.

                                <listOptionValue builtIn="false" value="__XCC_HAVE_FLOAT__=1"/>
                                <listOptionValue builtIn="false" value="_XSCOPE_PROBES_INCLUDE_FILE=&quot;/tmp/ccjsPcFI.h&quot;"/>
                            </option>

<<<<<<< HEAD

                            <option id="com.xmos.xc.compiler.option.include.paths.497342305" name="com.xmos.xc.compiler.option.include.paths" superClass="com.xmos.xc.compiler.option.include.paths" valueType="includePath">
                                <listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/xc&quot;"/>
                                <listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include&quot;"/>
                                <listOptionValue builtIn="false" value="&quot;${XMOS_TOOL_PATH}/target/include/clang&quot;"/>

4cdfda4

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHubhttps://github.com//issues/77, or mute the threadhttps://github.com/notifications/unsubscribe-auth/AAqhhqFJGW4T4KrIXUum-Rxt6c8Ys8GYks5qp_nVgaJpZM4J8yTr.

[ThomasGmeinder]

.metadata has been removed in the meantime. The .metadata folder is generated by eclipse automatically during import and must not be checked in. That's why it's listed in .gitignore: https://github.com/xmos/lib_dsp/blob/master/.gitignore.
.build directories are also excluded by .gitignore

[oscarbailey-xmos]

Fixed by #78