You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2005/03/16 17:50:46 UTC
cvs commit: ws-axis/c/build resource.h version.rc buildApache13Module.xml buildApache20Module.xml buildChannel.xml buildClient.xml buildInitialize.xml buildSSLChannel.xml buildServerEngine.xml buildSimpleAxisServer.xml buildTools.xml buildTransport.xml buildTransportIPV6.xml buildXMLParser.xml version.properties
dicka 2005/03/16 08:50:46
Modified: c build.xml
c/build buildApache13Module.xml buildApache20Module.xml
buildChannel.xml buildClient.xml
buildInitialize.xml buildSSLChannel.xml
buildServerEngine.xml buildSimpleAxisServer.xml
buildTools.xml buildTransport.xml
buildTransportIPV6.xml buildXMLParser.xml
version.properties
Added: c/build resource.h version.rc
Log:
Include version information within DLLs on Windows. The values of the fields can be configured within the version.properties file.
Submitted by: Adrian Dick
Revision Changes Path
1.21 +34 -0 ws-axis/c/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- build.xml 25 Jan 2005 14:07:14 -0000 1.20
+++ build.xml 16 Mar 2005 16:50:45 -0000 1.21
@@ -49,6 +49,40 @@
<import file="${basedir}/build/buildWSDL2Ws.xml"/>
<import file="${basedir}/build/buildDocumentation.xml"/>
+
+ <target name="buildVersionResource" if="windows">
+ <delete>
+ <fileset dir="${basedir}/build">
+ <include name="version.res"/>
+ <include name="version.temp.rc"/>
+ </fileset>
+ </delete>
+ <copy todir="${basedir}/build">
+ <mapper type="glob" from="*.rc" to="*.temp.rc"/>
+ <filterset begintoken="<" endtoken=">">
+ <filter token="Comments" value="${version.comments}"/>
+ <filter token="CompanyName" value="${version.CompanyName}"/>
+ <filter token="FileDescription" value="${version.FileDescription}"/>
+ <filter token="FileVersion" value="${version}"/>
+ <filter token="InternalName" value="${internalName}"/>
+ <filter token="LegalCopyright" value="${version.LegalCopyright}"/>
+ <filter token="LegalTrademarks" value="${version.LegalTrademarks}"/>
+ <filter token="OriginalFilename" value="${internalName}"/>
+ <filter token="PrivateBuild" value="${version.PrivateBuild}"/>
+ <filter token="ProductName" value="${version.ProductName}"/>
+ <filter token="ProductVersion" value="${version}"/>
+ </filterset>
+ <fileset dir="${basedir}/build">
+ <include name="version.rc"/>
+ </fileset>
+ </copy>
+ <exec executable="rc">
+ <arg line="/fo ${basedir}/build/version.res ${basedir}/build/version.temp.rc"/>
+ </exec>
+ </target>
+
+
+
<target name="compileClient">
<if>
<equals arg1="${client}" arg2="true"/>
1.2 +3 -0 ws-axis/c/build/buildApache13Module.xml
Index: buildApache13Module.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildApache13Module.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- buildApache13Module.xml 2 Nov 2004 15:19:44 -0000 1.1
+++ buildApache13Module.xml 16 Mar 2005 16:50:45 -0000 1.2
@@ -9,6 +9,9 @@
<copy todir="${basedir}/include/apache1_3">
<fileset dir="${apache13.dir.server}/include" includes="**"/>
</copy>
+ <antcall target="buildVersionResource" inheritall="true">
+ <param name="internalName" value="${apache13.serverLibraryName}"/>
+ </antcall>
<if>
<not>
<isset property="aix"/>
1.3 +3 -0 ws-axis/c/build/buildApache20Module.xml
Index: buildApache20Module.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildApache20Module.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buildApache20Module.xml 26 Jan 2005 13:03:12 -0000 1.2
+++ buildApache20Module.xml 16 Mar 2005 16:50:45 -0000 1.3
@@ -4,6 +4,9 @@
Compile the Apache 2.0 Axis Server Module
-->
<target name="compileApache20Module">
+ <antcall target="buildVersionResource" inheritall="true">
+ <param name="internalName" value="${apache20.serverLibraryName}"/>
+ </antcall>
<!-- NOT BUILDING THIS MODULE ON AIX DUE TO SOAPATTACHMENT ISSUES (compile and see what they are) -->
<if>
<not>
1.4 +4 -1 ws-axis/c/build/buildChannel.xml
Index: buildChannel.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildChannel.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- buildChannel.xml 27 Jan 2005 18:23:39 -0000 1.3
+++ buildChannel.xml 16 Mar 2005 16:50:45 -0000 1.4
@@ -1,4 +1,4 @@
-<project name="Axis C HTTP Transport Channel" default="compileAxisHTTPChannel" basedir="..">
+<project name="Axis C HTTP Transport Channel" default="compileAxisHTTPTransportChannel" basedir="..">
<!--
Compile the Axis HTTP Transport Channel Library
@@ -6,6 +6,9 @@
<target name="compileAxisHTTPTransportChannel">
<mkdir dir="${dir.objects}"/>
<mkdir dir="${dir.bin}"/>
+ <antcall target="buildVersionResource" inheritall="true">
+ <param name="internalName" value="${channelLibraryName}"/>
+ </antcall>
<if>
<equals arg1="${transport.HTTP.ipv6}" arg2="true" casesensitive="false"/>
<then>
1.7 +3 -0 ws-axis/c/build/buildClient.xml
Index: buildClient.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildClient.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- buildClient.xml 20 Jan 2005 09:51:23 -0000 1.6
+++ buildClient.xml 16 Mar 2005 16:50:45 -0000 1.7
@@ -7,6 +7,9 @@
<target name="compileAxisClient">
<mkdir dir="${dir.objects}"/>
<mkdir dir="${dir.bin}"/>
+ <antcall target="buildVersionResource" inheritall="true">
+ <param name="internalName" value="${clientLibraryName}"/>
+ </antcall>
<if>
<not>
<isset property="aix"/>
1.10 +1 -0 ws-axis/c/build/buildInitialize.xml
Index: buildInitialize.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildInitialize.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- buildInitialize.xml 14 Mar 2005 16:22:21 -0000 1.9
+++ buildInitialize.xml 16 Mar 2005 16:50:45 -0000 1.10
@@ -134,6 +134,7 @@
Definition of Visual C++ linker
-->
<linker id="VisualC++Linker" name="msvc" if="windows">
+ <linkerarg value="${basedir}/build/version.res"/>
<linkerarg value="/debug" if="debug"/>
<linkerarg value="/machine:I386"/>
<linkerarg value="/nologo"/>
1.8 +3 -0 ws-axis/c/build/buildSSLChannel.xml
Index: buildSSLChannel.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildSSLChannel.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- buildSSLChannel.xml 27 Jan 2005 18:23:39 -0000 1.7
+++ buildSSLChannel.xml 16 Mar 2005 16:50:45 -0000 1.8
@@ -6,6 +6,9 @@
<target name="compileAxisHTTPTransportSSLChannel">
<mkdir dir="${dir.objects}"/>
<mkdir dir="${dir.bin}"/>
+ <antcall target="buildVersionResource" inheritall="true">
+ <param name="internalName" value="${channelLibraryName}"/>
+ </antcall>
<!-- the ssl library is in a different place on windows ! -->
<if>
<isset property="windows"/>
1.5 +3 -0 ws-axis/c/build/buildServerEngine.xml
Index: buildServerEngine.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildServerEngine.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- buildServerEngine.xml 20 Jan 2005 09:51:23 -0000 1.4
+++ buildServerEngine.xml 16 Mar 2005 16:50:45 -0000 1.5
@@ -6,6 +6,9 @@
<target name="compileAxisServerEngine">
<mkdir dir="${dir.objects}"/>
<mkdir dir="${dir.bin}"/>
+ <antcall target="buildVersionResource" inheritall="true">
+ <param name="internalName" value="${serverEngineLibraryName}"/>
+ </antcall>
<if>
<not>
<isset property="aix"/>
1.3 +3 -0 ws-axis/c/build/buildSimpleAxisServer.xml
Index: buildSimpleAxisServer.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildSimpleAxisServer.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buildSimpleAxisServer.xml 9 Dec 2004 17:18:36 -0000 1.2
+++ buildSimpleAxisServer.xml 16 Mar 2005 16:50:45 -0000 1.3
@@ -6,6 +6,9 @@
<target name="compileSimpleAxisServer">
<mkdir dir="${dir.objects}"/>
<mkdir dir="${dir.bin}"/>
+ <antcall target="buildVersionResource" inheritall="true">
+ <param name="internalName" value="${simpleAxisServerExecutableName}"/>
+ </antcall>
<cc outfile="${dir.bin}/${simpleAxisServerExecutableName}" objdir="${dir.objects}"
exceptions="true" outtype="executable" multithreaded="true">
<!-- Compilers -->
1.9 +3 -0 ws-axis/c/build/buildTools.xml
Index: buildTools.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildTools.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- buildTools.xml 27 Jan 2005 17:14:56 -0000 1.8
+++ buildTools.xml 16 Mar 2005 16:50:45 -0000 1.9
@@ -73,6 +73,9 @@
<target name="compileCBindings">
<mkdir dir="${dir.objects}"/>
<mkdir dir="${dir.bin}"/>
+ <antcall target="buildVersionResource" inheritall="true">
+ <param name="internalName" value="${cClientLibraryName}"/>
+ </antcall>
<if>
<not>
<isset property="aix"/>
1.10 +3 -0 ws-axis/c/build/buildTransport.xml
Index: buildTransport.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildTransport.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- buildTransport.xml 14 Jan 2005 09:00:32 -0000 1.9
+++ buildTransport.xml 16 Mar 2005 16:50:45 -0000 1.10
@@ -6,6 +6,9 @@
<target name="compileAxisTransport">
<mkdir dir="${dir.objects}"/>
<mkdir dir="${dir.bin}"/>
+ <antcall target="buildVersionResource" inheritall="true">
+ <param name="internalName" value="${transportLibraryName}"/>
+ </antcall>
<if>
<not>
<isset property="aix"/>
1.6 +3 -0 ws-axis/c/build/buildTransportIPV6.xml
Index: buildTransportIPV6.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildTransportIPV6.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- buildTransportIPV6.xml 13 Jan 2005 14:07:06 -0000 1.5
+++ buildTransportIPV6.xml 16 Mar 2005 16:50:45 -0000 1.6
@@ -6,6 +6,9 @@
<target name="compileAxisTransportIPV6">
<mkdir dir="${dir.objects}"/>
<mkdir dir="${dir.bin}"/>
+ <antcall target="buildVersionResource" inheritall="true">
+ <param name="internalName" value="${transportLibraryName}"/>
+ </antcall>
<if>
<not>
<isset property="aix"/>
1.5 +3 -0 ws-axis/c/build/buildXMLParser.xml
Index: buildXMLParser.xml
===================================================================
RCS file: /home/cvs/ws-axis/c/build/buildXMLParser.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- buildXMLParser.xml 17 Jan 2005 15:10:56 -0000 1.4
+++ buildXMLParser.xml 16 Mar 2005 16:50:45 -0000 1.5
@@ -6,6 +6,9 @@
<target name="compileAxisXMLParser">
<mkdir dir="${dir.objects}"/>
<mkdir dir="${dir.bin}"/>
+ <antcall target="buildVersionResource" inheritall="true">
+ <param name="internalName" value="${xmlParserLibraryName}"/>
+ </antcall>
<if>
<not>
<isset property="aix"/>
1.6 +8 -0 ws-axis/c/build/version.properties
Index: version.properties
===================================================================
RCS file: /home/cvs/ws-axis/c/build/version.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- version.properties 28 Jan 2005 17:27:38 -0000 1.5
+++ version.properties 16 Mar 2005 16:50:45 -0000 1.6
@@ -6,3 +6,11 @@
revision = 0
version = ${majorVersion}.${minorVersion}.${revision}
+
+version.comments =
+version.CompanyName = The Apache Software Foundation
+version.FileDescription = Apache Axis C++
+version.LegalCopyright =
+version.LegalTrademarks =
+version.PrivateBuild = ${version}
+version.ProductName = Apache Axis C++
\ No newline at end of file
1.1 ws-axis/c/build/resource.h
Index: resource.h
===================================================================
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by version.rc
//
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 101
#define _APS_NEXT_COMMAND_VALUE 40001
#define _APS_NEXT_CONTROL_VALUE 1000
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
1.1 ws-axis/c/build/version.rc
Index: version.rc
===================================================================
//Microsoft Developer Studio generated resource script.
//
#include "resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
// English (U.K.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
#ifdef _WIN32
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
#pragma code_page(1252)
#endif //_WIN32
#ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
// Version
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION <FileVersion>
PRODUCTVERSION <ProductVersion>
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x40004L
FILETYPE 0x2L
FILESUBTYPE 0x0L
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "<Comments>\0"
VALUE "CompanyName", "<CompanyName>\0"
VALUE "FileDescription", "<FileDescription>\0"
VALUE "FileVersion", "<FileVersion>\0"
VALUE "InternalName", "<InternalName>\0"
VALUE "LegalCopyright", "<LegalCopyright>\0"
VALUE "LegalTrademarks", "<LegalTrademarks>\0"
VALUE "OriginalFilename", "<OriginalFilename>.dll\0"
VALUE "PrivateBuild", "<PrivateBuild>\0"
VALUE "ProductName", "<ProductName>\0"
VALUE "ProductVersion", "<ProductVersion>\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1200
END
END
#endif // !_MAC
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
//
1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\r\n"
"\0"
END
3 TEXTINCLUDE DISCARDABLE
BEGIN
"\r\n"
"\0"
END
#endif // APSTUDIO_INVOKED
#endif // English (U.K.) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 3 resource.
//
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED