mmanders 01/11/12 15:32:45
Modified: jk/jkant/java/org/apache/jk/ant/compilers MsvcLinker.java
Log:
Updated to use linkOpts from the build.xml file. Made the link.def more generic (in
case we don't declare exports on the link.)
Revision Changes Path
1.2 +20 -7
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MsvcLinker.java 2001/11/11 01:08:00 1.1
+++ MsvcLinker.java 2001/11/12 23:32:45 1.2
@@ -127,6 +127,15 @@
linkOptPw.print("/dll ");
linkOptPw.print("/incremental:no ");
+ // 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;
+ linkOptPw.println( option );
+ }
+
// add debug information in if requested
if (optG)
{
@@ -145,14 +154,18 @@
}
// Write the library name to the def file
linkDefPw.println("LIBRARY\t\""+soFile+"\"");
- // write the exports to link with to the .def file
+
+ // write the exported symbols to the .def file
Enumeration exps = exports.elements();
- linkDefPw.println("EXPORTS");
- while( exps.hasMoreElements() ) {
- JkData exp = (JkData) exps.nextElement();
- String name = exp.getValue();
- if( name==null ) continue;
- linkDefPw.println("\t" + name);
+ if ( exps.hasMoreElements() )
+ {
+ linkDefPw.println("EXPORTS");
+ while( exps.hasMoreElements() ) {
+ JkData exp = (JkData) exps.nextElement();
+ String name = exp.getValue();
+ if( name==null ) continue;
+ linkDefPw.println("\t" + name);
+ }
}
}
catch (IOException ioe)
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
