costin 01/11/16 14:23:22
Modified: jk/jkant/java/org/apache/jk/ant/compilers CcCompiler.java
LibtoolLinker.java MsvcCompiler.java
MsvcLinker.java MwldLinker.java
Log:
Changes in the implementation, reflecting api changes.
Revision Changes Path
1.6 +8 -6
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/CcCompiler.java
Index: CcCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/CcCompiler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CcCompiler.java 2001/11/11 01:09:59 1.5
+++ CcCompiler.java 2001/11/16 22:23:22 1.6
@@ -70,17 +70,19 @@
* @author Costin Manolache
*/
public class CcCompiler extends CompilerAdapter {
-
+ GlobPatternMapper co_mapper=new GlobPatternMapper();
+
public CcCompiler() {
super();
- };
-
- public GlobPatternMapper getOMapper() {
- GlobPatternMapper co_mapper=new GlobPatternMapper();
co_mapper.setFrom("*.c");
co_mapper.setTo("*.o");
+ }
- return co_mapper;
+ public String[] getTargetFiles( Source src ) {
+ File srcFile = src.getFile();
+ String name=srcFile.getName();
+
+ return co_mapper.mapFileName( name );
}
/** Compile using 'standard' gcc flags. This assume a 'current' gcc on
1.5 +4 -15
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/LibtoolLinker.java
Index: LibtoolLinker.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/LibtoolLinker.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LibtoolLinker.java 2001/11/10 16:51:06 1.4
+++ LibtoolLinker.java 2001/11/16 22:23:22 1.5
@@ -69,24 +69,13 @@
*
* @author Costin Manolache
*/
-public class LibtoolLinker extends SoTask implements LinkerAdapter {
+public class LibtoolLinker extends LinkerAdapter {
SoTask so;
- protected static GlobPatternMapper lo_mapper=new GlobPatternMapper();
- static {
- lo_mapper.setFrom("*.c");
- lo_mapper.setTo("*.lo");
- }
+ GlobPatternMapper lo_mapper=new GlobPatternMapper();
public LibtoolLinker() {
so=this;
- };
-
- public void setSoTask(SoTask so ) {
- this.so=so;
- }
-
- public void execute() throws BuildException {
- findSourceFiles();
- link(this.srcList);
+ lo_mapper.setFrom("*.c");
+ lo_mapper.setTo("*.lo");
}
/** Link using libtool.
1.3 +9 -10
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MsvcCompiler.java
Index: MsvcCompiler.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MsvcCompiler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MsvcCompiler.java 2001/11/12 23:33:48 1.2
+++ MsvcCompiler.java 2001/11/16 22:23:22 1.3
@@ -69,21 +69,20 @@
* @author Ignacio J. Ortega
*/
public class MsvcCompiler extends CompilerAdapter {
-
- static GlobPatternMapper co_mapperS=new GlobPatternMapper();
- static {
- co_mapperS.setFrom("*.c");
- co_mapperS.setTo("*.obj");
- }
+ GlobPatternMapper co_mapperS=new GlobPatternMapper();
public MsvcCompiler() {
super();
- };
-
- public GlobPatternMapper getOMapper() {
- return co_mapperS;
+ co_mapperS.setFrom("*.c");
+ co_mapperS.setTo("*.obj");
}
+ public String[] getTargetFiles( Source src ) {
+ File srcFile = src.getFile();
+ String name=srcFile.getName();
+
+ return co_mapperS.mapFileName( name );
+ }
public void setSoTask(SoTask so ) {
this.so=so;
1.3 +6 -3
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MsvcLinker.java
Index: MsvcLinker.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MsvcLinker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MsvcLinker.java 2001/11/12 23:32:45 1.2
+++ MsvcLinker.java 2001/11/16 22:23:22 1.3
@@ -69,12 +69,15 @@
*
* @author Ignacio J. Ortega
*/
-public class MsvcLinker extends SoTask implements LinkerAdapter {
+public class MsvcLinker extends LinkerAdapter {
SoTask so;
-
+ GlobPatternMapper co_mapper=new GlobPatternMapper();
+
public MsvcLinker() {
so=this;
- };
+ co_mapper.setFrom("*.c");
+ co_mapper.setTo("*.obj");
+ }
public void setSoTask(SoTask so ) {
this.so=so;
1.6 +7 -5
jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwldLinker.java
Index: MwldLinker.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwldLinker.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MwldLinker.java 2001/11/16 21:32:24 1.5
+++ MwldLinker.java 2001/11/16 22:23:22 1.6
@@ -69,12 +69,14 @@
*
* @author Costin Manolache
*/
-public class MwldLinker extends SoTask implements LinkerAdapter {
- SoTask so;
+public class MwldLinker extends LinkerAdapter {
+ GlobPatternMapper lo_mapper=new GlobPatternMapper();
public MwldLinker() {
- so=this;
- };
+ super();
+ lo_mapper.setFrom("*.c");
+ lo_mapper.setTo("*.o");
+ }
public void setSoTask(SoTask so ) {
this.so=so;
@@ -161,7 +163,7 @@
Source source=(Source)srcList.elementAt(i);
File srcF = source.getFile();
String name=srcF.getName();
- String targetNA[]=co_mapper.mapFileName( name );
+ String targetNA[]=lo_mapper.mapFileName( name );
if( targetNA!=null )
linkOptPw.println( targetNA[0] );
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
