mmanders 01/11/12 15:31:58
Modified: jk/jkant/java/org/apache/jk/ant/compilers MwldLinker.java
Log:
Updated to use linkOpts from the build.xml file.
Revision Changes Path
1.4 +12 -7
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MwldLinker.java 2001/11/10 16:49:16 1.3
+++ MwldLinker.java 2001/11/12 23:31:58 1.4
@@ -116,14 +116,9 @@
// write the link flags out
linkOptPw.println("-warnings off");
linkOptPw.println("-zerobss");
- linkOptPw.println("-desc \"Tomcat Connector\"");
linkOptPw.println("-o " + soFile + ".nlm");
- linkOptPw.println("-screenname \"System Console\"");
- linkOptPw.println("-nlmversion 1,20,2");
- linkOptPw.println("-nodefaults");
linkOptPw.println("-map " + soFile + ".map");
- linkOptPw.println("-threadname \"Tomcat JKThread\"");
- linkOptPw.println("-stacksize 64000");
+ linkOptPw.println("-nodefaults");
// add debug information in if requested
if (optG)
@@ -133,12 +128,22 @@
linkOptPw.println("-sym codeview4");
linkOptPw.println("-osym " + soFile + ".NCV");
}
+
+ // 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 the default startup code to the list of objects
linkOptPw.println(libBase + "\\lib\\nwpre.obj");
// write the objects to link with to the .opt file
for( int i=0; i<srcList.size(); i++ ) {
- Source source=(Source)srcList.elementAt(i);
+ Source source=(Source)srcList.elementAt(i);
File srcF = source.getFile();
String name=srcF.getName();
String targetNA[]=co_mapper.mapFileName( name );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
