[PATCH] native2 build.xml

[Mladen Turk]

Hi,

I'm using a VS.NET for building and here is a patch that enables to do
so.
I've introduced a new var mssdk.tool (no more ugly ../Common/).

MT.


Index: build.properties.sample
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-connectors/jk/build.properties.sample,v
retrieving revision 1.14
diff -u -r1.14 build.properties.sample
--- build.properties.sample     27 May 2002 15:22:41 -0000      1.14
+++ build.properties.sample     10 Jun 2002 15:01:36 -0000
@@ -48,5 +48,8 @@
 
 # MSVC
 #mssdk.home=c:/Program Files/Microsoft Visual Studio/VC98
+#mssdk.tools=c:/Program Files/Microsoft Visual Studio/Common/MSDev98
 
-
+# MSVC 7
+mssdk.home=c:/Program Files/Visual Studio.Net/VC7
+mssdk.tools=c:/Program Files/Visual Studio.Net/Common7/Tools

Index: native2/build.xml
===================================================================
RCS file: /home/cvspublic/jakarta-tomcat-connectors/jk/native2/build.xml,v
retrieving revision 1.36
diff -u -r1.36 build.xml
--- native2/build.xml   9 Jun 2002 00:13:35 -0000       1.36
+++ native2/build.xml   10 Jun 2002 15:01:41 -0000
@@ -118,9 +118,10 @@
   <target name="init.win32.properties" if="win32" >
     <!-- Override it in build.properties if using windows and a 
     different location. I think that's the defaul location for msdev -->
+    <!--
     <property name="mssdk.home" 
               location="c:/Program Files/Microsoft Visual Studio/VC98"/>
-
+    -->
     <property name="build.compiler.base" location="${mssdk.home}" />
     <property name="build.compiler.cc" location="${mssdk.home}/bin/cl" />
     <property name="build.compiler.ld" location="${mssdk.home}/bin/link" />
@@ -132,7 +133,7 @@
   </target>
 
   <target name="init.win32.mc" unless="mc.uptodate" if="win32">
-    <exec executable="${mssdk.home}/bin/mc" dir="common" >
+    <exec executable="${mssdk.tools}/bin/mc" dir="common" >
       <arg value="jk_logger_win32_message.mc" />
     </exec>
     <exec executable="${mssdk.home}/bin/rc" dir="common" >
@@ -249,7 +250,7 @@
         <linkerArg value="/libpath:&quot;${apr-util.lib}&quot;" if="win32" />
         <linkerArg value="/libpath:&quot;${apache2.home}/lib&quot;" if="win32" />
         <linkerArg value="/libpath:&quot;${mssdk.home}/lib&quot;" if="win32" />
-        <linkerArg value="/libpath:&quot;${mssdk.home}/../Common/MSDev98/bin&quot;" 
if="win32" />
+        <linkerArg value="/libpath:&quot;${mssdk.tools}/bin&quot;" if="win32" />
     </cc>
     
     <!-- Missing in cc:
@@ -273,7 +274,7 @@
        optimize="${so.optimize}"
        debug="${so.debug}"
        taskDebug="0"
-       profile="${so.profile}" >
+       profile="${so.profile}" >
       <def name="_REENTRANT" />
       <def name="CHUNK_SIZE" value="4096" 
           info="Read/Write buffer size" />
@@ -324,7 +325,7 @@
       <linkOpt value="/libpath:&quot;${apr-util.lib}&quot;" if="win32" />
       <linkOpt value="/libpath:&quot;${apache2.home}/lib&quot;" if="win32" />
       <linkOpt value="/libpath:&quot;${mssdk.home}/lib&quot;" if="win32" />
-      <linkOpt value="/libpath:&quot;${mssdk.home}/../Common/MSDev98/bin&quot;" 
if="win32" />
+      <linkOpt value="/libpath:&quot;${mssdk.tools}/bin&quot;" if="win32" />
     </so>
   </target>
   
@@ -421,7 +422,7 @@
       <linkOpt value="/libpath:&quot;${apr-util.lib}&quot;" if="win32" />
       <linkOpt value="/libpath:&quot;${apache2.home}/lib&quot;" if="win32" />
       <linkOpt value="/libpath:&quot;${mssdk.home}/lib&quot;" if="win32" />
-      <linkOpt value="/libpath:&quot;${mssdk.home}/../Common/MSDev98/bin&quot;" 
if="win32" />
+      <linkOpt value="/libpath:&quot;${mssdk.tools}/bin&quot;" if="win32" />
     </so>
   </target>
 
@@ -572,7 +573,7 @@
       <export symbol="TerminateFilter"/>
       <export symbol="TerminateExtension"/>
       <linkOpt value="/libpath:&quot;${mssdk.home}/lib&quot;" if="win32" />
-      <linkOpt value="/libpath:&quot;${mssdk.home}/../Common/MSDev98/bin&quot;" 
if="win32" />
+      <linkOpt value="/libpath:&quot;${mssdk.tools}/bin&quot;" if="win32" />
       <linkOpt value="/libpath:&quot;${apr.lib}&quot;" if="win32" />
     </so>
   </target>


--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>