axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hawk...@apache.org
Subject cvs commit: ws-axis/c/build buildSSLChannel.xml
Date Mon, 24 Jan 2005 17:13:58 GMT
hawkeye     2005/01/24 09:13:58

  Modified:    c/build  buildSSLChannel.xml
  Log:
  Fixed for AIX.
  
  Revision  Changes    Path
  1.3       +16 -1     ws-axis/c/build/buildSSLChannel.xml
  
  Index: buildSSLChannel.xml
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/build/buildSSLChannel.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- buildSSLChannel.xml	21 Jan 2005 14:56:13 -0000	1.2
  +++ buildSSLChannel.xml	24 Jan 2005 17:13:57 -0000	1.3
  @@ -6,6 +6,18 @@
   	 <target name="compileAxisHTTPTransportSSLChannel">
         <mkdir dir="${dir.objects}"/>
         <mkdir dir="${dir.bin}"/>
  +	  <!-- the ssl library is in a different place on windows ! -->
  +	  <if>
  +		<isset property="windows"/>
  +		<then>
  +			<property name="HTTP.SSLChannel.inc.dir" value="inc32"/>
  +		</then>
  +		<else>
  +			<property name="HTTP.SSLChannel.inc.dir" value="include"/>
  +			<property name="HTTP.SSLChannel.libs" value="crypto,ssl"/>
  +		</else>
  +      </if>
  +		
         <if>
            <not>
               <isset property="aix"/>
  @@ -18,7 +30,7 @@
               <cc outfile="${dir.bin}/${channelLibraryName}" objdir="${dir.objects}" 
                exceptions="true" outtype="shared" multithreaded="true">
                  <!-- Compilers -->
  -               <includepath path="${HTTP.SSLChannel.dir}"/>
  +               <includepath path="${HTTP.SSLChannel.dir}/${HTTP.SSLChannel.inc.dir}"/>
                  <compiler refid="SolarisCC"/>
                  <compiler refid="Linuxgcc"/>
                  <compiler extends="VisualC++">
  @@ -56,12 +68,15 @@
            <else>
               <cc outfile="${dir.bin}/${libraryPrefix}${channelLibraryName}${librarySuffix}"
objdir="${dir.objects}"
                exceptions="true" multithreaded="true">
  +				<includepath path="${HTTP.SSLChannel.dir}/${HTTP.SSLChannel.inc.dir}"/>
                  <!-- Compilers -->
                  <compiler refid="AIXxlc"/>
                  <defineset>
                     <define name="ENABLE_AXISTRACE" if="trace"/>
                     <define name="AXISTRACE_LIBRARY"/>
                  </defineset>
  +				<!-- required libraries -->
  +				<syslibset libs="${HTTP.SSLChannel.libs}" dir="${HTTP.SSLChannel.dir}/lib"/>
   
                  <!-- Linkers -->
                  <linker refid="AIXLinker"/>
  
  
  

Mime
View raw message