mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-01 06:05:24 +02:00
Code Issues Wiki Activity

Fix build failure caused by trying to use wrong BREE.

Browse source 
Change-Id: I50278d0b03e0879bf26a4f5412bda7d4dad836ad
Signed-off-by: gwatson <g.watson@computer.org>
This commit is contained in:
gwatson 2014-05-27 22:15:20 -04:00
parent 584a99aecd
commit ea3084efcc
14 changed files with 41 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/org.eclipse.tm.terminal.telnet/.classpath
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src/"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.1%Foundation-1.1"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

5
plugins/org.eclipse.tm.terminal.telnet/.settings/org.eclipse.jdt.core.prefs
View file

@ -1,7 +1,6 @@
#Fri Apr 11 02:37:35 CEST 2008
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.4 org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.lineNumber=generate
@ -72,4 +71,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.4 org.eclipse.jdt.core.compiler.source=1.3

3
plugins/org.eclipse.tm.terminal.telnet/META-INF/MANIFEST.MF
View file

@ -8,6 +8,5 @@ Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui, Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime, org.eclipse.core.runtime,
org.eclipse.tm.terminal;bundle-version="[3.2.0,3.3.0)" org.eclipse.tm.terminal;bundle-version="[3.2.0,3.3.0)"
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, Bundle-RequiredExecutionEnvironment: J2SE-1.4
J2SE-1.4
Export-Package: org.eclipse.tm.internal.terminal.telnet;x-internal:=true Export-Package: org.eclipse.tm.internal.terminal.telnet;x-internal:=true

4
plugins/org.eclipse.tm.terminal/.classpath
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src/"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/CDC-1.1%Foundation-1.1"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

5
plugins/org.eclipse.tm.terminal/.settings/org.eclipse.jdt.core.prefs
View file

@ -1,7 +1,6 @@
#Fri Apr 11 02:37:35 CEST 2008
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.4 org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.lineNumber=generate
@ -72,4 +71,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.4 org.eclipse.jdt.core.compiler.source=1.3

3
plugins/org.eclipse.tm.terminal/META-INF/MANIFEST.MF
View file

@ -10,8 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui org.eclipse.ui
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1, Bundle-RequiredExecutionEnvironment: J2SE-1.4
J2SE-1.4
Bundle-ClassPath: . Bundle-ClassPath: .
Export-Package: org.eclipse.tm.internal.terminal.connector;x-friends:="org.eclipse.tm.terminal.test", Export-Package: org.eclipse.tm.internal.terminal.connector;x-friends:="org.eclipse.tm.terminal.test",
org.eclipse.tm.internal.terminal.control;x-friends:="org.eclipse.tm.terminal.view", org.eclipse.tm.internal.terminal.control;x-friends:="org.eclipse.tm.terminal.view",

4
plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/emulator/VT100EmulatorBackend.java
View file

@ -206,7 +206,7 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend {
synchronized (fTerminal) { synchronized (fTerminal) {
if(!isCusorInScrollingRegion()) if(!isCusorInScrollingRegion())
return; return;
assert n>0; // assert n>0;
int line=toAbsoluteLine(fCursorLine); int line=toAbsoluteLine(fCursorLine);
int nLines=fTerminal.getHeight()-line; int nLines=fTerminal.getHeight()-line;
fTerminal.scroll(line, nLines, n); fTerminal.scroll(line, nLines, n);
@ -236,7 +236,7 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend {
synchronized (fTerminal) { synchronized (fTerminal) {
if(!isCusorInScrollingRegion()) if(!isCusorInScrollingRegion())
return; return;
assert n>0; // assert n>0;
int line=toAbsoluteLine(fCursorLine); int line=toAbsoluteLine(fCursorLine);
int nLines=fTerminal.getHeight()-line; int nLines=fTerminal.getHeight()-line;
fTerminal.scroll(line, nLines, -n); fTerminal.scroll(line, nLines, -n);

2
plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/SnapshotChanges.java
View file

@ -254,7 +254,7 @@ public class SnapshotChanges implements ISnapshotChanges {
* @param shift must be negative! * @param shift must be negative!
*/ */
private void scrollChangesLinesWithNegativeShift(int line, int n, int shift) { private void scrollChangesLinesWithNegativeShift(int line, int n, int shift) {
assert shift <0 || throwRuntimeException(); // assert shift <0 || throwRuntimeException();
// scroll the region // scroll the region
// don't run out of bounds! // don't run out of bounds!
int m=Math.min(line+n+shift,getChangedLineLength()+shift); int m=Math.min(line+n+shift,getChangedLineLength()+shift);

32
plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataFastScroll.java
View file

@ -34,8 +34,8 @@ public class TerminalTextDataFastScroll implements ITerminalTextData {
fMaxHeight=maxHeight; fMaxHeight=maxHeight;
fData=data; fData=data;
fData.setDimensions(maxHeight, fData.getWidth()); fData.setDimensions(maxHeight, fData.getWidth());
if(maxHeight>2) // if(maxHeight>2)
assert shiftOffset(-2) || throwRuntimeException(); // assert shiftOffset(-2) || throwRuntimeException();
} }
public TerminalTextDataFastScroll(int maxHeight) { public TerminalTextDataFastScroll(int maxHeight) {
this(new TerminalTextDataStore(),maxHeight); this(new TerminalTextDataStore(),maxHeight);
@ -64,7 +64,7 @@ public class TerminalTextDataFastScroll implements ITerminalTextData {
* @param delta * @param delta
*/ */
void moveOffset(int delta) { void moveOffset(int delta) {
assert Math.abs(delta)<fMaxHeight || throwRuntimeException(); // assert Math.abs(delta)<fMaxHeight || throwRuntimeException();
fOffset=(fMaxHeight+fOffset+delta)%fMaxHeight; fOffset=(fMaxHeight+fOffset+delta)%fMaxHeight;
} }
@ -101,19 +101,19 @@ public class TerminalTextDataFastScroll implements ITerminalTextData {
} }
public void copyRange(ITerminalTextData source, int sourceStartLine, int destStartLine, int length) { public void copyRange(ITerminalTextData source, int sourceStartLine, int destStartLine, int length) {
assert (destStartLine>=0 && destStartLine+length<=fHeight) || throwRuntimeException(); // assert (destStartLine>=0 && destStartLine+length<=fHeight) || throwRuntimeException();
for (int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
fData.copyLine(source, i+sourceStartLine, getPositionOfLine(i+destStartLine)); fData.copyLine(source, i+sourceStartLine, getPositionOfLine(i+destStartLine));
} }
} }
public char getChar(int line, int column) { public char getChar(int line, int column) {
assert (line>=0 && line<fHeight) || throwRuntimeException(); // assert (line>=0 && line<fHeight) || throwRuntimeException();
return fData.getChar(getPositionOfLine(line), column); return fData.getChar(getPositionOfLine(line), column);
} }
public char[] getChars(int line) { public char[] getChars(int line) {
assert (line>=0 && line<fHeight) || throwRuntimeException(); // assert (line>=0 && line<fHeight) || throwRuntimeException();
return fData.getChars(getPositionOfLine(line)); return fData.getChars(getPositionOfLine(line));
} }
@ -122,7 +122,7 @@ public class TerminalTextDataFastScroll implements ITerminalTextData {
} }
public LineSegment[] getLineSegments(int line, int startCol, int numberOfCols) { public LineSegment[] getLineSegments(int line, int startCol, int numberOfCols) {
assert (line>=0 && line<fHeight) || throwRuntimeException(); // assert (line>=0 && line<fHeight) || throwRuntimeException();
return fData.getLineSegments(getPositionOfLine(line), startCol, numberOfCols); return fData.getLineSegments(getPositionOfLine(line), startCol, numberOfCols);
} }
@ -131,12 +131,12 @@ public class TerminalTextDataFastScroll implements ITerminalTextData {
} }
public Style getStyle(int line, int column) { public Style getStyle(int line, int column) {
assert (line>=0 && line<fHeight) || throwRuntimeException(); // assert (line>=0 && line<fHeight) || throwRuntimeException();
return fData.getStyle(getPositionOfLine(line), column); return fData.getStyle(getPositionOfLine(line), column);
} }
public Style[] getStyles(int line) { public Style[] getStyles(int line) {
assert (line>=0 && line<fHeight) || throwRuntimeException(); // assert (line>=0 && line<fHeight) || throwRuntimeException();
return fData.getStyles(getPositionOfLine(line)); return fData.getStyles(getPositionOfLine(line));
} }
@ -153,7 +153,7 @@ public class TerminalTextDataFastScroll implements ITerminalTextData {
} }
} }
public void scroll(int startLine, int size, int shift) { public void scroll(int startLine, int size, int shift) {
assert (startLine>=0 && startLine+size<=fHeight) || throwRuntimeException(); // assert (startLine>=0 && startLine+size<=fHeight) || throwRuntimeException();
if(shift>=fMaxHeight || -shift>=fMaxHeight) { if(shift>=fMaxHeight || -shift>=fMaxHeight) {
cleanLines(startLine, fMaxHeight-startLine); cleanLines(startLine, fMaxHeight-startLine);
return; return;
@ -187,23 +187,23 @@ public class TerminalTextDataFastScroll implements ITerminalTextData {
} }
public void setChar(int line, int column, char c, Style style) { public void setChar(int line, int column, char c, Style style) {
assert (line>=0 && line<fHeight) || throwRuntimeException(); // assert (line>=0 && line<fHeight) || throwRuntimeException();
fData.setChar(getPositionOfLine(line), column, c, style); fData.setChar(getPositionOfLine(line), column, c, style);
} }
public void setChars(int line, int column, char[] chars, int start, int len, Style style) { public void setChars(int line, int column, char[] chars, int start, int len, Style style) {
assert (line>=0 && line<fHeight) || throwRuntimeException(); // assert (line>=0 && line<fHeight) || throwRuntimeException();
fData.setChars(getPositionOfLine(line), column, chars, start, len, style); fData.setChars(getPositionOfLine(line), column, chars, start, len, style);
} }
public void setChars(int line, int column, char[] chars, Style style) { public void setChars(int line, int column, char[] chars, Style style) {
assert (line>=0 && line<fHeight) || throwRuntimeException(); // assert (line>=0 && line<fHeight) || throwRuntimeException();
fData.setChars(getPositionOfLine(line), column, chars, style); fData.setChars(getPositionOfLine(line), column, chars, style);
} }
public void setDimensions(int height, int width) { public void setDimensions(int height, int width) {
assert height>=0 || throwRuntimeException(); // assert height>=0 || throwRuntimeException();
assert width>=0 || throwRuntimeException(); // assert width>=0 || throwRuntimeException();
if(height > fMaxHeight) if(height > fMaxHeight)
setMaxHeight(height); setMaxHeight(height);
fHeight=height; fHeight=height;
@ -212,7 +212,7 @@ public class TerminalTextDataFastScroll implements ITerminalTextData {
} }
public void setMaxHeight(int maxHeight) { public void setMaxHeight(int maxHeight) {
assert maxHeight>=fHeight || throwRuntimeException(); // assert maxHeight>=fHeight || throwRuntimeException();
// move everything to offset0 // move everything to offset0
int start=getPositionOfLine(0); int start=getPositionOfLine(0);
if(start!=0) { if(start!=0) {

4
plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataSnapshot.java
View file

@ -267,8 +267,8 @@ class TerminalTextDataSnapshot implements ITerminalTextDataSnapshot {
} }
public void setInterestWindow(int startLine, int size) { public void setInterestWindow(int startLine, int size) {
assert startLine>=0 || throwRuntimeException(); // assert startLine>=0 || throwRuntimeException();
assert size>=0 || throwRuntimeException(); // assert size>=0 || throwRuntimeException();
fInterestWindowStartLine=startLine; fInterestWindowStartLine=startLine;
fInterestWindowSize=size; fInterestWindowSize=size;
fSnapshot.setWindow(startLine, size); fSnapshot.setWindow(startLine, size);

10
plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataStore.java
View file

@ -62,8 +62,8 @@ public class TerminalTextDataStore implements ITerminalTextData {
* @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#setDimensions(int, int) * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#setDimensions(int, int)
*/ */
public void setDimensions(int height, int width) { public void setDimensions(int height, int width) {
assert height>=0 || throwRuntimeException(); // assert height>=0 || throwRuntimeException();
assert width>=0 || throwRuntimeException(); // assert width>=0 || throwRuntimeException();
// just extend the region // just extend the region
if(height>fChars.length) { if(height>fChars.length) {
int h=4*height/3; int h=4*height/3;
@ -144,7 +144,7 @@ public class TerminalTextDataStore implements ITerminalTextData {
* @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#getChar(int, int) * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#getChar(int, int)
*/ */
public char getChar(int line, int column) { public char getChar(int line, int column) {
assert column<fWidth || throwRuntimeException(); // assert column<fWidth || throwRuntimeException();
if(fChars[line]==null||column>=fChars[line].length) if(fChars[line]==null||column>=fChars[line].length)
return 0; return 0;
return fChars[line][column]; return fChars[line][column];
@ -153,7 +153,7 @@ public class TerminalTextDataStore implements ITerminalTextData {
* @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#getStyle(int, int) * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#getStyle(int, int)
*/ */
public Style getStyle(int line, int column) { public Style getStyle(int line, int column) {
assert column<fWidth || throwRuntimeException(); // assert column<fWidth || throwRuntimeException();
if(fStyle[line]==null || column>=fStyle[line].length) if(fStyle[line]==null || column>=fStyle[line].length)
return null; return null;
return fStyle[line][column]; return fStyle[line][column];
@ -202,7 +202,7 @@ public class TerminalTextDataStore implements ITerminalTextData {
* @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#scroll(int, int, int) * @see org.eclipse.tm.internal.terminal.text.ITerminalTextData#scroll(int, int, int)
*/ */
public void scroll(int startLine, int size, int shift) { public void scroll(int startLine, int size, int shift) {
assert startLine+size <= getHeight() || throwRuntimeException(); // assert startLine+size <= getHeight() || throwRuntimeException();
if(shift<0) { if(shift<0) {
// move the region up // move the region up
// shift is negative!! // shift is negative!!

4
plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/model/TerminalTextDataWindow.java
View file

@ -128,7 +128,7 @@ public class TerminalTextDataWindow implements ITerminalTextData {
fData.copyLine(source, sourceLine, destLine-fWindowStartLine); fData.copyLine(source, sourceLine, destLine-fWindowStartLine);
} }
public void scroll(int startLine, int size, int shift) { public void scroll(int startLine, int size, int shift) {
assert (startLine>=0 && startLine+size<=fHeight) || throwRuntimeException(); // assert (startLine>=0 && startLine+size<=fHeight) || throwRuntimeException();
int n=size; int n=size;
int start=startLine-fWindowStartLine; int start=startLine-fWindowStartLine;
// if start outside our range, cut the length to copy // if start outside our range, cut the length to copy
@ -157,7 +157,7 @@ public class TerminalTextDataWindow implements ITerminalTextData {
fData.setChars(line-fWindowStartLine, column, chars, style); fData.setChars(line-fWindowStartLine, column, chars, style);
} }
public void setDimensions(int height, int width) { public void setDimensions(int height, int width) {
assert height>=0 || throwRuntimeException(); // assert height>=0 || throwRuntimeException();
fData.setDimensions(fWindowSize, width); fData.setDimensions(fWindowSize, width);
fHeight=height; fHeight=height;
} }

2
plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/AbstractTextCanvasModel.java
View file

@ -231,7 +231,7 @@ abstract public class AbstractTextCanvasModel implements ITextCanvasModel {
fCurrentSelection=extractSelectedText(); fCurrentSelection=extractSelectedText();
} }
private void doSetSelection(int startLine, int endLine, int startColumn, int endColumn) { private void doSetSelection(int startLine, int endLine, int startColumn, int endColumn) {
assert(startLine<0 || startLine<=endLine); // assert(startLine<0 || startLine<=endLine);
if(startLine>=0) { if(startLine>=0) {
if(fSelectionSnapshot==null) { if(fSelectionSnapshot==null) {
fSelectionSnapshot=fSnapshot.getTerminalTextData().makeSnapshot(); fSelectionSnapshot=fSnapshot.getTerminalTextData().makeSnapshot();

4
plugins/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/PipedInputStream.java
View file

@ -97,7 +97,7 @@ public class PipedInputStream extends InputStream {
return fBuffer.length - fUsedSlots; return fBuffer.length - fUsedSlots;
} }
public void write(byte[] b, int off, int len) throws InterruptedException { public void write(byte[] b, int off, int len) throws InterruptedException {
assert len<=getFreeSlots(); // assert len<=getFreeSlots();
while (fUsedSlots == fBuffer.length) while (fUsedSlots == fBuffer.length)
// wait until not full // wait until not full
wait(); wait();
@ -133,7 +133,7 @@ public class PipedInputStream extends InputStream {
return b; return b;
} }
public int read(byte[] cbuf, int off, int len) throws InterruptedException { public int read(byte[] cbuf, int off, int len) throws InterruptedException {
assert len<=available(); // assert len<=available();
while (fUsedSlots == 0) { while (fUsedSlots == 0) {
if(fClosed) if(fClosed)
return 0; return 0;