[Wsf-c-commits] svn commit r15414 - in trunk/wsf/c: . build build/neethi/util examples/flickr examples/trader test/framework wsclient

svn at wso2.org svn at wso2.org
Mon Mar 31 23:00:11 PDT 2008 

Author: dumindu
Date: Mon Mar 31 22:59:51 2008
New Revision: 15414

Log:

updated the WSF/C build to get all the version info from a central location.

With this commit, the version information will be maintained in two files, init.bat and versions.in. Two files were necessary because we have used the version information in both batch files and nmake scripts. I think this is better than having them hard-coded everywhere, at least until we come up with a solution where we can do with only one file.

Added:
   trunk/wsf/c/build/init.bat
   trunk/wsf/c/build/versions.in
Modified:
   trunk/wsf/c/build.bat
   trunk/wsf/c/build/build_optional.bat
   trunk/wsf/c/build/neethi/util/neethi_util.mk
   trunk/wsf/c/build/optional.mk
   trunk/wsf/c/clean.bat
   trunk/wsf/c/configure.in
   trunk/wsf/c/examples/flickr/flickr.mk
   trunk/wsf/c/examples/trader/trader.mk
   trunk/wsf/c/test/framework/wsfc_unit.mk
   trunk/wsf/c/wsclient/wsclient.mk

Modified: trunk/wsf/c/build.bat
==============================================================================
--- trunk/wsf/c/build.bat	(original)
+++ trunk/wsf/c/build.bat	Mon Mar 31 22:59:51 2008
@@ -1,56 +1,59 @@
 @echo off
- at call vcvars32.bat /nologo
+call vcvars32.bat /nologo
+
+rem setup version variables
+call build\init.bat
 
 rem Build Apache Axis2/C
- at cd axis2c\build
- at if exist axis2c-bin-1.3.0-win32 rmdir /s /q axis2c-bin-1.3.0-win32
- at cd win32
- at nmake dist AUTOCONF=..\..\..\configure.in
- at if not %ERRORLEVEL% EQU 0 goto end
+cd axis2c\build
+if exist axis2c-bin-%AXIS2C_VERSION%-win32 rmdir /s /q axis2c-bin-%AXIS2C_VERSION%-win32
+cd win32
+nmake dist AUTOCONF=..\..\..\configure.in
+if not %ERRORLEVEL% EQU 0 goto end
 
 rem Build Flickr sample
- at cd ..\..\..\examples\flickr
- at nmake -f flickr.mk
- at copy /Y flickr.exe  ..\..\axis2c\build\axis2c-bin-1.3.0-win32\bin\samples
+cd ..\..\..\examples\flickr
+nmake -f flickr.mk
+copy /Y flickr.exe  ..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\bin\samples
 
 rem Build Trader sample
- at cd ..\trader
- at nmake -f trader.mk
- at cd ..\..
+cd ..\trader
+nmake -f trader.mk
+cd ..\..
 
 rem Build Optional Modules
- at cd build
- at nmake -f optional.mk
- at cd ..
+cd build
+nmake -f optional.mk
+cd ..
 
 rem Build Neethi util
 :build_neethi_util
- at cd axis2c\neethi\src\util
- at nmake -f neethi_util.mk AXIS2_BIN_DIR=..\..\..\build\axis2c-bin-1.3.0-win32 AUTOCONF=..\..\..\..\configure.in
- at cd ..\..\..\..\
+cd axis2c\neethi\src\util
+nmake -f neethi_util.mk AXIS2_BIN_DIR=..\..\..\build\axis2c-bin-%AXIS2C_VERSION%-win32 AUTOCONF=..\..\..\..\configure.in
+cd ..\..\..\..\
 
 rem Build wsclient
- at cd wsclient
- at nmake -f wsclient.mk AXIS2_BIN_DIR=..\axis2c\build\axis2c-bin-1.3.0-win32 AUTOCONF=..\configure.in
- at cd ..
+cd wsclient
+nmake -f wsclient.mk AXIS2_BIN_DIR=..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32 AUTOCONF=..\configure.in
+cd ..
 
 rem Build Unit Test Framework
- at cd test\framework
- at nmake install -f wsfc_unit.mk AUTOCONF=..\..\configure.in
- at cd ..\..
+cd test\framework
+nmake install -f wsfc_unit.mk AUTOCONF=..\..\configure.in
+cd ..\..
 
 rem Build Tests
 
 :pack_wsfc
- at if not exist wso2-wsf-c-bin-1.2.1-win32 mkdir wso2-wsf-c-bin-1.2.1-win32
- at xcopy /E /Q /I /Y axis2c\build\axis2c-bin-1.3.0-win32 wso2-wsf-c-bin-1.2.1-win32
- at copy /Y config\axis2.xml wso2-wsf-c-bin-1.2.1-win32\axis2.xml
- at copy /Y INSTALL wso2-wsf-c-bin-1.2.1-win32
- at copy /Y README wso2-wsf-c-bin-1.2.1-win32
- at copy /Y NEWS wso2-wsf-c-bin-1.2.1-win32
- at copy /Y COPYING wso2-wsf-c-bin-1.2.1-win32
- at copy /Y AUTHORS wso2-wsf-c-bin-1.2.1-win32
- at copy /Y NOTICE wso2-wsf-c-bin-1.2.1-win32
- at xcopy /E /I /Q /Y docs  wso2-wsf-c-bin-1.2.1-win32\docs
+if not exist wso2-wsf-c-bin-%WSFC_VERSION%-win32 mkdir wso2-wsf-c-bin-%WSFC_VERSION%-win32
+xcopy /E /Q /I /Y axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32 wso2-wsf-c-bin-%WSFC_VERSION%-win32
+copy /Y config\axis2.xml wso2-wsf-c-bin-%WSFC_VERSION%-win32\axis2.xml
+copy /Y INSTALL wso2-wsf-c-bin-%WSFC_VERSION%-win32
+copy /Y README wso2-wsf-c-bin-%WSFC_VERSION%-win32
+copy /Y NEWS wso2-wsf-c-bin-%WSFC_VERSION%-win32
+copy /Y COPYING wso2-wsf-c-bin-%WSFC_VERSION%-win32
+copy /Y AUTHORS wso2-wsf-c-bin-%WSFC_VERSION%-win32
+copy /Y NOTICE wso2-wsf-c-bin-%WSFC_VERSION%-win32
+xcopy /E /I /Q /Y docs  wso2-wsf-c-bin-%WSFC_VERSION%-win32\docs
 
 :end

Modified: trunk/wsf/c/build/build_optional.bat
==============================================================================
--- trunk/wsf/c/build/build_optional.bat	(original)
+++ trunk/wsf/c/build/build_optional.bat	Mon Mar 31 22:59:51 2008
@@ -1,82 +1,81 @@
- at echo off
- at cd ..
+cd ..
 
 rem Build Apache Rampart/C
- at if %1 == "no" goto build_sandesha2
- at echo %1
- at cd rampartc\build\win32
- at nmake dist AUTOCONF=..\..\..\configure.in AXIS2_BIN_DIR=.\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32
-
- at if not %ERRORLEVEL% EQU 0 goto rampart_error
-
- at cd ..
- at xcopy /E /Q /I /Y rampartc-1.1.0\modules\rampart .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\modules\rampart
- at copy /Y rampartc-1.1.0\include\*.h .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\include\
- at copy /Y rampartc-1.1.0\modules\rampart\mod_rampart.lib .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\lib\
- at copy /Y rampartc-1.1.0\modules\rampart\mod_rampart.dll .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\lib\
- at copy /Y rampartc-1.1.0\bin\samples\services\sec_echo\server_axis2.xml .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\axis2.xml
- at xcopy /E /I /Q /Y rampartc-1.1.0\bin\samples .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\bin\samples\rampart
- at xcopy /E /I /Q /Y .\..\samples .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\samples\rampart
- at xcopy /E /I /Q /Y rampartc-1.1.0\bin\samples\services\sec_echo .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\sec_echo
- at cd ..\..
- at goto build_sandesha2
+if %1 == "no" goto build_sandesha2
+echo %1
+cd rampartc\build\win32
+nmake dist AUTOCONF=..\..\..\configure.in AXIS2_BIN_DIR=.\..\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32
+
+if not %ERRORLEVEL% EQU 0 goto rampart_error
+
+cd ..
+xcopy /E /Q /I /Y rampartc-%RAMPARTC_VERSION%\modules\rampart .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\modules\rampart
+copy /Y rampartc-%RAMPARTC_VERSION%\include\*.h .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\include\
+copy /Y rampartc-%RAMPARTC_VERSION%\modules\rampart\mod_rampart.lib .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\lib\
+copy /Y rampartc-%RAMPARTC_VERSION%\modules\rampart\mod_rampart.dll .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\lib\
+copy /Y rampartc-%RAMPARTC_VERSION%\bin\samples\services\sec_echo\server_axis2.xml .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\axis2.xml
+xcopy /E /I /Q /Y rampartc-%RAMPARTC_VERSION%\bin\samples .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\bin\samples\rampart
+xcopy /E /I /Q /Y .\..\samples .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\samples\rampart
+xcopy /E /I /Q /Y rampartc-%RAMPARTC_VERSION%\bin\samples\services\sec_echo .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\services\sec_echo
+cd ..\..
+goto build_sandesha2
 
 :rampart_error
- at cd ..\..\..
+cd ..\..\..
 
 rem Build Apache Sandesha2/C
 :build_sandesha2
- at if %2 == "no" goto build_savan
- at cd sandesha2c\build\win32
- at nmake dist AXIS2_BIN_DIR=.\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32 AUTOCONF=..\..\..\configure.in
-
- at if not %ERRORLEVEL% EQU 0 goto sandesha2_error
-
- at cd ..
- at xcopy /E /Q /I /Y sandesha2\modules\sandesha2 .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\modules\sandesha2
- at xcopy /E /Q /I /Y sandesha2\modules\sandesha2\sandesha2.lib  .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\lib\
- at xcopy /E /Q /I /Y sandesha2\modules\sandesha2\sandesha2.dll  .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\lib\
- at mkdir .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\bin\samples\sandesha2
- at copy /Y sandesha2\bin\samples\sandesha2\*.exe .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\bin\samples\sandesha2
- at xcopy /E /Q /I /Y sandesha2\services\RMSampleService .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\RMSampleService
- at xcopy /E /Q /I /Y sandesha2\samples .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\samples\sandesha2
- at copy /Y sandesha2\include\*.h  .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\include\
- at xcopy /E /Q /I /Y  sandesha2\bin\samples\sandesha2 .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\bin\samples\sandesha2
- at mkdir .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\bin\sandesha2
- at copy /Y ..\config\*.txt .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\bin\sandesha2
- at copy /Y ..\config\*.bat .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\bin\sandesha2
- at copy /Y ..\config\*.sh .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\bin\sandesha2
- at cd ..\..
- at goto build_savan
+if %2 == "no" goto build_savan
+cd sandesha2c\build\win32
+nmake dist AXIS2_BIN_DIR=.\..\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32 AUTOCONF=..\..\..\configure.in
+
+if not %ERRORLEVEL% EQU 0 goto sandesha2_error
+
+cd ..
+xcopy /E /Q /I /Y sandesha2\modules\sandesha2 .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\modules\sandesha2
+xcopy /E /Q /I /Y sandesha2\modules\sandesha2\sandesha2.lib  .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\lib\
+xcopy /E /Q /I /Y sandesha2\modules\sandesha2\sandesha2.dll  .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\lib\
+mkdir .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\bin\samples\sandesha2
+copy /Y sandesha2\bin\samples\sandesha2\*.exe .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\bin\samples\sandesha2
+xcopy /E /Q /I /Y sandesha2\services\RMSampleService .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\services\RMSampleService
+xcopy /E /Q /I /Y sandesha2\samples .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\samples\sandesha2
+copy /Y sandesha2\include\*.h  .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\include\
+xcopy /E /Q /I /Y  sandesha2\bin\samples\sandesha2 .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\bin\samples\sandesha2
+mkdir .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\bin\sandesha2
+copy /Y ..\config\*.txt .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\bin\sandesha2
+copy /Y ..\config\*.bat .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\bin\sandesha2
+copy /Y ..\config\*.sh .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\bin\sandesha2
+cd ..\..
+goto build_savan
 
 :sandesha2_error
- at cd ..\..\..
+cd ..\..\..
 
 rem Build Apache Savan/C
 :build_savan
- at if %3 == "no" goto end
- at cd savanc\build\win32
- at nmake dist AUTOCONF=..\..\..\configure.in AXIS2_BIN_DIR=.\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32
-
- at if not %ERRORLEVEL% EQU 0 goto savan_error
-
- at cd ..
- at xcopy /E /Q /I /Y savanc\modules\savan .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\modules\savan
- at xcopy /E /Q /I /Y savanc\services\publisher .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\publisher
- at xcopy /E /Q /I /Y savanc\services\listener .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\listener
- at xcopy /E /Q /I /Y savanc\services\subscription .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\subscription
- at xcopy /E /Q /I /Y savanc\samples .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\samples\savan
- at copy /Y savanc\modules\savan\mod_savan.dll .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\lib\
- at copy /Y savanc\modules\savan\mod_savan.lib .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\lib\
- at copy /Y savanc\lib\savan_client.dll .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\lib\
- at copy /Y savanc\lib\savan_client.lib .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\lib\
-
- at mkdir .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\bin\samples\savan
- at copy /Y savanc\bin\samples\savan\*.exe .\..\..\axis2c\build\axis2c-bin-1.3.0-win32\bin\samples\savan
- at cd ..\..
- at goto end
+if %3 == "no" goto end
+cd savanc\build\win32
+nmake dist AUTOCONF=..\..\..\configure.in AXIS2_BIN_DIR=.\..\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32
+
+if not %ERRORLEVEL% EQU 0 goto savan_error
+
+cd ..
+xcopy /E /Q /I /Y savanc\modules\savan .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\modules\savan
+xcopy /E /Q /I /Y savanc\services\publisher .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\services\publisher
+xcopy /E /Q /I /Y savanc\services\listener .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\services\listener
+xcopy /E /Q /I /Y savanc\services\subscription .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\services\subscription
+xcopy /E /Q /I /Y savanc\samples .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\samples\savan
+copy /Y savanc\modules\savan\mod_savan.dll .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\lib\
+copy /Y savanc\modules\savan\mod_savan.lib .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\lib\
+copy /Y savanc\lib\savan_client.dll .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\lib\
+copy /Y savanc\lib\savan_client.lib .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\lib\
+
+mkdir .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\bin\samples\savan
+copy /Y savanc\bin\samples\savan\*.exe .\..\..\axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32\bin\samples\savan
+cd ..\..
+goto end
 
 :savan_error
- at cd ..\..\..
+cd ..\..\..
 
 :end

Added: trunk/wsf/c/build/init.bat
==============================================================================
--- (empty file)
+++ trunk/wsf/c/build/init.bat	Mon Mar 31 22:59:51 2008
@@ -0,0 +1,5 @@
+set AXIS2C_VERSION=1.3.0
+set WSFC_VERSION=1.2.1
+set RAMPARTC_VERSION=1.1.0
+
+rem set WSFC_UNIT_HOME=%CD%\wso2-wsf-c-bin-%WSFC_VERSION%-win32

Modified: trunk/wsf/c/build/neethi/util/neethi_util.mk
==============================================================================
--- trunk/wsf/c/build/neethi/util/neethi_util.mk	(original)
+++ trunk/wsf/c/build/neethi/util/neethi_util.mk	Mon Mar 31 22:59:51 2008
@@ -1,3 +1,5 @@
+!include "..\..\..\..\build\versions.in"
+
 AXIS2_BIN_DIR= ..\..\..\build\axis2c-bin-$(AXIS2C_VERSION)-win32
 
 CFLAGS = /nologo /D "WIN32" /D "AXIS2_DECLARE_EXPORT" /D "_WINDOWS" /D "_MBCS"
@@ -14,12 +16,12 @@
 
 
 neethi_util: copy_include
-	@cl.exe $(CFLAGS)  *.C /I$(AXIS2_BIN_DIR)\include /c
-	@link.exe $(LDFLAGS) *.obj /LIBPATH:$(AXIS2_BIN_DIR)\lib axiom.lib axutil.lib \
+	cl.exe $(CFLAGS)  *.C /I$(AXIS2_BIN_DIR)\include /c
+	link.exe $(LDFLAGS) *.obj /LIBPATH:$(AXIS2_BIN_DIR)\lib axiom.lib axutil.lib \
 	axis2_engine.lib axis2_parser.lib /DLL /OUT:$(AXIS2_BIN_DIR)\lib\neethi_util.dll \
 	/IMPLIB:$(AXIS2_BIN_DIR)\lib\neethi_util.lib
 
 
 copy_include :
-	@copy /Y neethi_options.h .\..\..\..\include\
+	copy /Y neethi_options.h .\..\..\..\include\
 

Modified: trunk/wsf/c/build/optional.mk
==============================================================================
--- trunk/wsf/c/build/optional.mk	(original)
+++ trunk/wsf/c/build/optional.mk	Mon Mar 31 22:59:51 2008
@@ -20,4 +20,4 @@
 !endif
 
 dist :
-	@build_optional.bat $(OPFLAGS)
+	build_optional.bat $(OPFLAGS)

Added: trunk/wsf/c/build/versions.in
==============================================================================
--- (empty file)
+++ trunk/wsf/c/build/versions.in	Mon Mar 31 22:59:51 2008
@@ -0,0 +1,3 @@
+AXIS2C_VERSION=1.3.0
+WSFC_VERSION=1.2.1
+RAMPARTC_VERSION=1.1.0

Modified: trunk/wsf/c/clean.bat
==============================================================================
--- trunk/wsf/c/clean.bat	(original)
+++ trunk/wsf/c/clean.bat	Mon Mar 31 22:59:51 2008
@@ -1,19 +1,22 @@
- at if exist axis2c\build\axis2c-bin-1.2.0-win32 rmdir /S /Q axis2c\build\axis2c-bin-1.2.0-win32
+ at echo off
+call build\init.bat
 
- at if exist sandesha2c\build\sandesha2 rmdir /S /Q sandesha2c\build\sandesha2
+if exist axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32 rmdir /S /Q axis2c\build\axis2c-bin-%AXIS2C_VERSION%-win32
 
- at if exist rampartc\build\rampartc-1.0 rmdir /S /Q rampartc\build\rampartc-1.0
+if exist sandesha2c\build\sandesha2 rmdir /S /Q sandesha2c\build\sandesha2
 
- at if exist savanc\build\savanc rmdir /S /Q savanc\build\savanc
+if exist rampartc\build\rampartc-1.0 rmdir /S /Q rampartc\build\rampartc-1.0
 
- at if exist wso2-wsf-c-bin-1.2.0-win32 rmdir /S /Q wso2-wsf-c-bin-1.2.0-win32
+if exist savanc\build\savanc rmdir /S /Q savanc\build\savanc
 
- at if exist axis2c\build\win32\int.msvc rmdir /S /Q axis2c\build\win32\int.msvc
+if exist wso2-wsf-c-bin-%WSFC_VERSION%-win32 rmdir /S /Q wso2-wsf-c-bin-%WSFC_VERSION%-win32
 
- at if exist rampartc\build\win32\int.msvc rmdir /S /Q rampartc\build\win32\int.msvc
+if exist axis2c\build\win32\int.msvc rmdir /S /Q axis2c\build\win32\int.msvc
 
- at if exist sandesha2c\build\win32\int.msvc rmdir /S /Q sandesha2c\build\win32\int.msvc
+if exist rampartc\build\win32\int.msvc rmdir /S /Q rampartc\build\win32\int.msvc
 
- at if exist savanc\build\win32\int.msvc rmdir /S /Q savanc\build\win32\int.msvc
+if exist sandesha2c\build\win32\int.msvc rmdir /S /Q sandesha2c\build\win32\int.msvc
 
- at if exist axis2c\build\deploy rmdir /S /Q axis2c\build\deploy
+if exist savanc\build\win32\int.msvc rmdir /S /Q savanc\build\win32\int.msvc
+
+if exist axis2c\build\deploy rmdir /S /Q axis2c\build\deploy

Modified: trunk/wsf/c/configure.in
==============================================================================
--- trunk/wsf/c/configure.in	(original)
+++ trunk/wsf/c/configure.in	Mon Mar 31 22:59:51 2008
@@ -6,7 +6,7 @@
 #CRUNTIME Library ( Use /MD or /MT)
 CRUNTIME=/MD
 # embed manifest files or not
-EMBED_MANIFEST =1
+EMBED_MANIFEST = 1
 
 #############################################################################
 ### Apache Axis2/C Build Configuration Parameters
@@ -18,7 +18,10 @@
 ICONV_BIN_DIR = E:\iconv-1.9.2.win32
 
 # Path to zlib installation
-ZLIB_BIN_DIR=E:\zlib-1.2.3.win32
+ZLIB_BIN_DIR = E:\zlib-1.2.3.win32
+
+# Path to OpenSSL installation
+OPENSSL_BIN_DIR = E:\Openssl 
 
 # Path to Apache2 installation
 APACHE_BIN_DIR = "C:\Program Files\Apache Software Foundation\Apache2.2"
@@ -49,15 +52,11 @@
 # Whether Rampart/C is built or not
 ENABLE_RAMPARTC = 1
 
-# Path to OpenSSL installation
-OPENSSL_BIN_DIR = E:\OpenSSL
-
-
 #############################################################################
 ### Apache Sandesha2/C Build Configuration Parameters
 
 # Whether Sandesha2/C is built or not
-ENABLE_SANDESHA2C = 1
+#ENABLE_SANDESHA2C = 1
 
 #############################################################################
 ### Apache Savan/C Build Configuration Parameters

Modified: trunk/wsf/c/examples/flickr/flickr.mk
==============================================================================
--- trunk/wsf/c/examples/flickr/flickr.mk	(original)
+++ trunk/wsf/c/examples/flickr/flickr.mk	Mon Mar 31 22:59:51 2008
@@ -1,7 +1,8 @@
+!include "..\..\build\versions.in"
 
 echo:
-	@cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" *.C  /I..\..\axis2c\build\axis2c-bin-1.3.0-win32\include /c
-	@link.exe /nologo *.obj /LIBPATH:..\..\axis2c\build\axis2c-bin-1.3.0-win32\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib   /OUT:flickr.exe
+	cl.exe /nologo /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" *.C  /I..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\include /c
+	link.exe /nologo *.obj /LIBPATH:..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib   /OUT:flickr.exe
 
 	
 

Modified: trunk/wsf/c/examples/trader/trader.mk
==============================================================================
--- trunk/wsf/c/examples/trader/trader.mk	(original)
+++ trunk/wsf/c/examples/trader/trader.mk	Mon Mar 31 22:59:51 2008
@@ -1,3 +1,4 @@
+!include ..\..\build\versions.in
 
 TRADER_HOME = ..
 TRADER_UTIL = util
@@ -10,50 +11,52 @@
 TRADER_TRADER_CLIENT = ..\trader-client
 TRADER_TRADER_EXCHANGE = ..\trader_exchange
 
+TRADER_DECLARES = /D "_CRT_SECURE_NO_DEPRECATE" /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS"
+
 echo:
-	@cd $(TRADER_UTIL)
-	@cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" *.C  /I..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\include /I../include /c
-	@link.exe /nologo *.obj /LIBPATH:..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib  /DLL /OUT:wsf_util.dll
-
-	@cd $(TRADER_CLIENT)
-	@cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" trader_client.c axis2_stub_TraderClient.c axis2_stub_ExchangeClient.c /I..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\include /I../include /c
-	@link.exe /nologo *.obj ..\util\*.obj /LIBPATH:..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib axis2_http_sender.lib axis2_http_receiver.lib  /OUT:trader.exe
-	@copy /Y trader.exe ..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\bin\samples
+	cd $(TRADER_UTIL)
+	cl.exe /nologo $(TRADER_DECLARES) *.C  /I..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\include /I../include /c
+	link.exe /nologo *.obj /LIBPATH:..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib  /DLL /OUT:wsf_util.dll
+
+	cd $(TRADER_CLIENT)
+	cl.exe /nologo $(TRADER_DECLARES) trader_client.c axis2_stub_TraderClient.c axis2_stub_ExchangeClient.c /I..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\include /I../include /c
+	link.exe /nologo *.obj ..\util\*.obj /LIBPATH:..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib axis2_http_sender.lib axis2_http_receiver.lib  /OUT:trader.exe
+	copy /Y trader.exe ..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\bin\samples
 	
-	@cd $(TRADER_EXCHANGE_UTIL)
-	@cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" *.C  /I..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\include /I..\..\include /c
-	@link.exe /nologo *.obj ..\..\util\*.obj /LIBPATH:..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib  /DLL /OUT:wsf_exchange_util.dll
-
-
-	@cd $(TRADER_EXCHANGE_CLIENT)
-	@cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" *.C  /I..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\include /I..\..\include /c
-	@link.exe /nologo *.obj ..\..\util\*.obj /LIBPATH:..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib  /DLL /OUT:exchangeclient.dll
-	@if not exist ..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\exchangeclient mkdir ..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\exchangeclient
-	@copy /Y exchangeclient.dll ..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\exchangeclient
-	@copy /Y services.xml ..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\exchangeclient
-
-	@cd $(TRADER_EXCHANGE_TRADER)
-	@cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" *.C  /I..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\include /I..\..\include /c
-	@link.exe /nologo *.obj ..\..\util\*.obj ..\util\*.obj /LIBPATH:..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib  /DLL /OUT:exchangetrader.dll
-	@if not exist ..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\exchangetrader mkdir ..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\exchangetrader
-	@copy /Y exchangetrader.dll ..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\exchangetrader
-	@copy /Y services.xml ..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\exchangetrader
-
-	@cd $(TRADER_TRADER_UTIL)
-	@cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" *.C  /I..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\include /I..\..\include /c
-	@link.exe /nologo *.obj ..\..\util\*.obj /LIBPATH:..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib  /DLL /OUT:wsf_trader_util.dll
-
-	@cd $(TRADER_TRADER_CLIENT)
-	@cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" *.C  /I..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\include /I..\..\include /c
-	@link.exe /nologo *.obj ..\..\util\*.obj ..\util\*.obj /LIBPATH:..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib  /DLL /OUT:traderclient.dll
-	@if not exist ..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\traderclient mkdir ..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\traderclient
-	@copy /Y traderclient.dll ..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\traderclient
-	@copy /Y services.xml ..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\traderclient
-
-
-	@cd $(TRADER_TRADER_exchange)
-	@cl.exe /nologo /D "WIN32" /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" *.C  /I..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\include /I..\..\include /c
-	@link.exe /nologo *.obj ..\..\util\*.obj ..\util\*.obj /LIBPATH:..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib  /DLL /OUT:traderexchange.dll
-	@if not exist ..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\traderexchange mkdir ..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\traderexchange
-	@copy /Y traderexchange.dll ..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\traderexchange
-	@copy /Y services.xml ..\..\..\..\axis2c\build\axis2c-bin-1.3.0-win32\services\traderexchange
+	cd $(TRADER_EXCHANGE_UTIL)
+	cl.exe /nologo $(TRADER_DECLARES) *.C  /I..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\include /I..\..\include /c
+	link.exe /nologo *.obj ..\..\util\*.obj /LIBPATH:..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib  /DLL /OUT:wsf_exchange_util.dll
+
+
+	cd $(TRADER_EXCHANGE_CLIENT)
+	cl.exe /nologo $(TRADER_DECLARES) *.C  /I..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\include /I..\..\include /c
+	link.exe /nologo *.obj ..\..\util\*.obj /LIBPATH:..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib  /DLL /OUT:exchangeclient.dll
+	if not exist ..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\services\exchangeclient mkdir ..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\services\exchangeclient
+	copy /Y exchangeclient.dll ..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\services\exchangeclient
+	copy /Y services.xml ..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\services\exchangeclient
+
+	cd $(TRADER_EXCHANGE_TRADER)
+	cl.exe /nologo $(TRADER_DECLARES) *.C  /I..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\include /I..\..\include /c
+	link.exe /nologo *.obj ..\..\util\*.obj ..\util\*.obj /LIBPATH:..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib  /DLL /OUT:exchangetrader.dll
+	if not exist ..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\services\exchangetrader mkdir ..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\services\exchangetrader
+	copy /Y exchangetrader.dll ..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\services\exchangetrader
+	copy /Y services.xml ..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\services\exchangetrader
+
+	cd $(TRADER_TRADER_UTIL)
+	cl.exe /nologo $(TRADER_DECLARES) *.C  /I..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\include /I..\..\include /c
+	link.exe /nologo *.obj ..\..\util\*.obj /LIBPATH:..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib  /DLL /OUT:wsf_trader_util.dll
+
+	cd $(TRADER_TRADER_CLIENT)
+	cl.exe /nologo $(TRADER_DECLARES) *.C  /I..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\include /I..\..\include /c
+	link.exe /nologo *.obj ..\..\util\*.obj ..\util\*.obj /LIBPATH:..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib  /DLL /OUT:traderclient.dll
+	if not exist ..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\services\traderclient mkdir ..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\services\traderclient
+	copy /Y traderclient.dll ..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\services\traderclient
+	copy /Y services.xml ..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\services\traderclient
+
+
+	cd $(TRADER_TRADER_exchange)
+	cl.exe /nologo $(TRADER_DECLARES) *.C  /I..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\include /I..\..\include /c
+	link.exe /nologo *.obj ..\..\util\*.obj ..\util\*.obj /LIBPATH:..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\lib axiom.lib axutil.lib axis2_engine.lib axis2_parser.lib  /DLL /OUT:traderexchange.dll
+	if not exist ..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\services\traderexchange mkdir ..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\services\traderexchange
+	copy /Y traderexchange.dll ..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\services\traderexchange
+	copy /Y services.xml ..\..\..\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32\services\traderexchange

Modified: trunk/wsf/c/test/framework/wsfc_unit.mk
==============================================================================
--- trunk/wsf/c/test/framework/wsfc_unit.mk	(original)
+++ trunk/wsf/c/test/framework/wsfc_unit.mk	Mon Mar 31 22:59:51 2008
@@ -1,11 +1,14 @@
+!include .\..\..\build\versions.in
+
 AUTOCONF = .\..\..\configure.in
 !include $(AUTOCONF)
 
-WSFC_HOME_DIR="%WSFC_HOME%"
+WSFC_HOME_DIR_DLL=.\..\..\wso2-wsf-c-bin-$(WSFC_VERSION)-win32
+WSFC_HOME_DIR_SAMPLE=.\..\..\..\wso2-wsf-c-bin-$(WSFC_VERSION)-win32
 
 CFLAGS = /nologo /w /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "AXIS2_DECLARE_EXPORT"
 
-LDFLAGS = /nologo /LIBPATH:$(WSFC_HOME_DIR)\lib
+LDFLAGS = /nologo
 
 INCLUDE_PATH = /I.\include
 
@@ -26,34 +29,36 @@
 !endif
 
 wso2_wsfc_unit_dll:
-	@if not exist int.msvc mkdir int.msvc
-	@cl.exe $(CFLAGS) $(INCLUDE_PATH) src\*.c /Foint.msvc\ /c
-    @if not exist $(WSFC_HOME_DIR) mkdir $(WSFC_HOME_DIR)
-    @if not exist $(WSFC_HOME_DIR)\lib mkdir $(WSFC_HOME_DIR)\lib
-	@link.exe $(LDFLAGS) int.msvc\*.obj /DLL  /OUT:$(WSFC_HOME_DIR)\lib\wso2_wsfc_unit.dll /IMPLIB:$(WSFC_HOME_DIR)\lib\wso2_wsfc_unit.lib
+	if not exist int.msvc mkdir int.msvc
+	cl.exe $(CFLAGS) $(INCLUDE_PATH) src\*.c /Foint.msvc\ /c
+	if not exist $(WSFC_HOME_DIR_DLL) mkdir $(WSFC_HOME_DIR_DLL)
+	if not exist $(WSFC_HOME_DIR_DLL)\lib mkdir $(WSFC_HOME_DIR_DLL)\lib
+	link.exe $(LDFLAGS) /LIBPATH:$(WSFC_HOME_DIR_DLL)\lib int.msvc\*.obj /DLL \
+	/OUT:$(WSFC_HOME_DIR_DLL)\lib\wso2_wsfc_unit.dll /IMPLIB:$(WSFC_HOME_DIR_DLL)\lib\wso2_wsfc_unit.lib
 	-@$(_VC_MANIFEST_EMBED_DLL)
 
 wso2_wsfc_unit_samples:
-    @cd samples
-	@if not exist int.msvc mkdir int.msvc
-	@cl.exe $(CFLAGS) *.c /I.\..\include /I.\ /Foint.msvc\ /c
-    @if not exist $(WSFC_HOME_DIR)\bin mkdir $(WSFC_HOME_DIR)\bin
-	@if not exist $(WSFC_HOME_DIR)\bin\test mkdir $(WSFC_HOME_DIR)\bin\test
-	@if not exist $(WSFC_HOME_DIR)\bin\test\framework mkdir $(WSFC_HOME_DIR)\bin\test\framework
-	@if not exist $(WSFC_HOME_DIR)\bin\test\framework\samples mkdir $(WSFC_HOME_DIR)\bin\test\framework\samples
-	@link.exe $(LDFLAGS) /LIBPATH:$(WSFC_HOME_DIR)\lib int.msvc\*.obj wso2_wsfc_unit.lib \
-        /OUT:$(WSFC_HOME_DIR)\bin\test\framework\samples\sample.exe
-    -@$(_VC_MANIFEST_EMBED_EXE)
-    @cd ..
+	cd samples
+	cd
+	if not exist int.msvc mkdir int.msvc
+	cl.exe $(CFLAGS) *.c /I.\..\include /I.\ /Foint.msvc\ /c
+	if not exist $(WSFC_HOME_DIR_SAMPLE)\bin mkdir $(WSFC_HOME_DIR_SAMPLE)\bin
+	if not exist $(WSFC_HOME_DIR_SAMPLE)\bin\test mkdir $(WSFC_HOME_DIR_SAMPLE)\bin\test
+	if not exist $(WSFC_HOME_DIR_SAMPLE)\bin\test\framework mkdir $(WSFC_HOME_DIR_SAMPLE)\bin\test\framework
+	if not exist $(WSFC_HOME_DIR_SAMPLE)\bin\test\framework\samples mkdir $(WSFC_HOME_DIR_SAMPLE)\bin\test\framework\samples
+	link.exe $(LDFLAGS) /LIBPATH:$(WSFC_HOME_DIR_SAMPLE)\lib int.msvc\*.obj wso2_wsfc_unit.lib \
+        /OUT:$(WSFC_HOME_DIR_SAMPLE)\bin\test\framework\samples\sample.exe
+	-@$(_VC_MANIFEST_EMBED_EXE)
+	cd ..
 
 wsfc_unit: wso2_wsfc_unit_dll
 
 cleanint:
-	@if exist $(WSFC_HOME_DIR)\lib\wso2_wsfc_unit.ilk del $(WSFC_HOME_DIR)\lib\wso2_wsfc_unit.ilk
+	if exist $(WSFC_HOME_DIR_DLL)\lib\wso2_wsfc_unit.ilk del $(WSFC_HOME_DIR_DLL)\lib\wso2_wsfc_unit.ilk
 
 clean: 
-	@if exist int.msvc rmdir /s /q int.msvc
-	@if exist samples\int.msvc rmdir /s /q samples\int.msvc
+	if exist int.msvc rmdir /s /q int.msvc
+	if exist samples\int.msvc rmdir /s /q samples\int.msvc
 
 install: wsfc_unit wso2_wsfc_unit_samples
 

Modified: trunk/wsf/c/wsclient/wsclient.mk
==============================================================================
--- trunk/wsf/c/wsclient/wsclient.mk	(original)
+++ trunk/wsf/c/wsclient/wsclient.mk	Mon Mar 31 22:59:51 2008
@@ -1,7 +1,9 @@
+!include "..\build\versions.in"
+
 AUTOCONF = ..\configure.in
 !include $(AUTOCONF)
 
-AXIS2_BIN_DIR=.\..\axis2c\build\axis2c-bin-1.3.0-win32
+AXIS2_BIN_DIR=.\..\axis2c\build\axis2c-bin-$(AXIS2C_VERSION)-win32
 
 !if "$(ENABLE_RAMPARTC)" == "1"
 OPFLAGS = mod_rampart.lib
@@ -10,15 +12,15 @@
 !endif
 
 wsclient:
-	@echo off
+	echo off
 
-	@if not exist int.msvc mkdir int.msvc
-	@cl.exe /nologo /D "WIN32" /w /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" src\*.c \
+	if not exist int.msvc mkdir int.msvc
+	cl.exe /nologo /D "WIN32" /w /D "_WINDOWS" /D "AXIS2_DECLARE_EXPORT" /D "_MBCS" src\*.c \
 	/I$(AXIS2_BIN_DIR)\include /I.\..\axis2c\neethi\include /I.\..\axis2c\neethi\src\util /Foint.msvc\ /c
 
-	@link.exe /LIBPATH:$(AXIS2_BIN_DIR)\lib int.msvc\*.obj axutil.lib  axis2_engine.lib \
+	link.exe /LIBPATH:$(AXIS2_BIN_DIR)\lib int.msvc\*.obj axutil.lib  axis2_engine.lib \
 	axis2_parser.lib axiom.lib neethi_util.lib axis2_http_sender.lib $(OPFLAGS) /OUT:$(AXIS2_BIN_DIR)\bin\wsclient.exe
-	@if exist int.msvc rmdir /s /q int.msvc
-	@mkdir $(AXIS2_BIN_DIR)\bin\samples\wsclient
-	@xcopy /S /Y samples\* $(AXIS2_BIN_DIR)\bin\samples\wsclient
+	if exist int.msvc rmdir /s /q int.msvc
+	if not exist $(AXIS2_BIN_DIR)\bin\samples\wsclient mkdir $(AXIS2_BIN_DIR)\bin\samples\wsclient
+	xcopy /S /Y samples\* $(AXIS2_BIN_DIR)\bin\samples\wsclient

More information about the Wsf-c-commits mailing list