You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@apache.org on 2002/05/07 21:45:08 UTC
cvs commit: jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers GcjLinker.java LibtoolLinker.java MsvcLinker.java
costin 02/05/07 12:45:08
Modified: jk/jkant/java/org/apache/jk/ant/compilers GcjLinker.java
LibtoolLinker.java MsvcLinker.java
Log:
Use linkOpts for libtool and gcj compilers. ( they are already used
in nw and msvc ).
I ( temporary ) removed the code that delete the tmp files, to see
what options are actually used ( testing )
Revision Changes Path
1.3 +10 -0 jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/GcjLinker.java
Index: GcjLinker.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/GcjLinker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GcjLinker.java 16 Nov 2001 22:26:50 -0000 1.2
+++ GcjLinker.java 7 May 2002 19:45:08 -0000 1.3
@@ -124,6 +124,16 @@
project.log( "Linking " + buildDir + "/" + soFile + ".so");
+ // write out any additional link options
+ Enumeration opts = linkOpts.elements();
+ while( opts.hasMoreElements() ) {
+ JkData opt = (JkData) opts.nextElement();
+ String option = opt.getValue();
+ if( option == null ) continue;
+
+ cmd.createArgument().setValue( option );
+ }
+
for( int i=0; i<srcList.size(); i++ ) {
Source source=(Source)srcList.elementAt(i);
File f1=new File(buildDir, source.getPackage());
1.8 +10 -0 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LibtoolLinker.java 12 Jan 2002 05:33:03 -0000 1.7
+++ LibtoolLinker.java 7 May 2002 19:45:08 -0000 1.8
@@ -107,6 +107,16 @@
if( profile )
cmd.createArgument().setValue("-pg" );
+ // write out any additional link options
+ Enumeration opts = linkOpts.elements();
+ while( opts.hasMoreElements() ) {
+ JkData opt = (JkData) opts.nextElement();
+ String option = opt.getValue();
+ if( option == null ) continue;
+
+ cmd.createArgument().setValue( option );
+ }
+
// All .o files must be included
project.log( "Linking " + buildDir + "/" + soFile + ".so");
1.5 +2 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MsvcLinker.java 4 Dec 2001 01:43:52 -0000 1.4
+++ MsvcLinker.java 7 May 2002 19:45:08 -0000 1.5
@@ -207,8 +207,8 @@
throw new BuildException("Link failed " + soFile);
}
- linkOpt.delete();
- linkDef.delete();
+ // linkOpt.delete();
+ // linkDef.delete();
closeStreamHandler();
return true;
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>