svn commit: r773516 - in /webservices/rampart/trunk/c: bindist.sh build/win32/configure.in

[sh...@apache.org]

Author: shankar
Date: Mon May 11 09:57:32 2009
New Revision: 773516

URL: http://svn.apache.org/viewvc?rev=773516&view=rev
Log:
modified bindist.sh according to the new folder structure

Modified:
    webservices/rampart/trunk/c/bindist.sh
    webservices/rampart/trunk/c/build/win32/configure.in

Modified: webservices/rampart/trunk/c/bindist.sh
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/bindist.sh?rev=773516&r1=773515&r2=773516&view=diff
==============================================================================
--- webservices/rampart/trunk/c/bindist.sh (original)
+++ webservices/rampart/trunk/c/bindist.sh Mon May 11 09:57:32 2009
@@ -31,53 +31,49 @@
 
 echo "Creating directories in $PWDIR"
 mkdir $BIN_DIR
-mkdir $BIN_DIR/bin
-mkdir $BIN_DIR/bin/samples
-mkdir $BIN_DIR/bin/samples/server
-mkdir $BIN_DIR/bin/samples/secpolicy
-mkdir $BIN_DIR/modules
-mkdir $BIN_DIR/modules/rampart
 mkdir $BIN_DIR/samples
+mkdir $BIN_DIR/samples/bin
+mkdir $BIN_DIR/samples/bin/rampartc
+mkdir $BIN_DIR/samples/lib
+mkdir $BIN_DIR/samples/lib/rampartc
+mkdir $BIN_DIR/samples/src
+mkdir $BIN_DIR/samples/src/rampartc
 mkdir $BIN_DIR/include
 mkdir $BIN_DIR/include/$INCL_V_DIR
+mkdir $BIN_DIR/modules
+mkdir $BIN_DIR/modules/rampart
+mkdir $BIN_DIR/modules/rahas
 mkdir $BIN_DIR/lib
+mkdir $BIN_DIR/services
 
 echo "Copy related files to $BIN_DIR"
 #Copy other related files
 cp AUTHORS $BIN_DIR
+cp ChangeLog $BIN_DIR
 cp COPYING $BIN_DIR
 cp INSTALL $BIN_DIR
 cp LICENSE $BIN_DIR
 cp NEWS $BIN_DIR
-cp README $BIN_DIR
 cp NOTICE $BIN_DIR
+cp README $BIN_DIR
 
 echo "Copy rampart module"
 #Copy rampart module
 cp -r $AXIS2C_HOME/modules/rampart $BIN_DIR/modules/
+cp -r $AXIS2C_HOME/modules/rahas $BIN_DIR/modules/
 
 echo "Copy libraries"
-cp -d $AXIS2C_HOME/lib/liboxstokens.* $BIN_DIR/lib
-cp -d $AXIS2C_HOME/lib/libomxmlsec.* $BIN_DIR/lib
-cp -d $AXIS2C_HOME/lib/libomopenssl.* $BIN_DIR/lib
-cp -d $AXIS2C_HOME/lib/libsaml.* $BIN_DIR/lib
-cp -d $AXIS2C_HOME/lib/libsecconv.* $BIN_DIR/lib
-cp -d $AXIS2C_HOME/lib/libtrust.* $BIN_DIR/lib
-cp -d $AXIS2C_HOME/lib/libmod_rampart.* $BIN_DIR/lib
+cp -d $AXIS2C_HOME/lib/librampart.so.* $BIN_DIR/lib
 
 echo "Strip binaries"
 strip $BIN_DIR/lib/*.so
 
 echo "Copy samples"
-#copy samples
-#cp -r samples/secpolicy/* $BIN_DIR/bin/samples/secpolicy/
-cp -r $AXIS2C_HOME/bin/samples/rampart/secpolicy/* $BIN_DIR/bin/samples/secpolicy/
-cp -r $AXIS2C_HOME/bin/samples/rampart/* $BIN_DIR/bin/samples
-cp -r $AXIS2C_HOME/services/sec_echo $BIN_DIR/bin/samples/server/
-cp -r $AXIS2C_HOME/services/saml_sts $BIN_DIR/bin/samples/server/
-cp -r $AXIS2C_HOME/services/secconv_echo $BIN_DIR/bin/samples/server/
-cp samples/server/sec_echo/services.xml $BIN_DIR/bin/samples/server/sec_echo/services.xml
-cp samples/server/sec_echo/server_axis2.xml $BIN_DIR/bin/samples/server/sec_echo/server_axis2.xml
+cp -r $AXIS2C_HOME/samples/bin/rampartc/* $BIN_DIR/samples/bin/rampartc/
+cp -r $AXIS2C_HOME/samples/lib/rampartc/* $BIN_DIR/samples/lib/rampartc/
+cp -r $AXIS2C_HOME/services/sec_echo $BIN_DIR/services/
+cp -r $AXIS2C_HOME/services/saml_sts $BIN_DIR/services/
+cp -r $AXIS2C_HOME/services/secconv_echo $BIN_DIR/services/
 
 echo "Copy headers"
 cp include/*.h $BIN_DIR/include/$INCL_V_DIR
@@ -91,7 +87,7 @@
 echo "Copy sample sources"
 tar -xzf samples/rampart-samples-src*.tar.gz
 rm samples/rampart-samples-src*.tar.gz
-cp -r rampart-samples-src*/* $BIN_DIR/samples
+cp -r rampart-samples-src*/* $BIN_DIR/samples/src/rampartc/
 rm -rf rampart-samples-src*
 
 echo "Copy installer script"

Modified: webservices/rampart/trunk/c/build/win32/configure.in
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/build/win32/configure.in?rev=773516&r1=773515&r2=773516&view=diff
==============================================================================
--- webservices/rampart/trunk/c/build/win32/configure.in (original)
+++ webservices/rampart/trunk/c/build/win32/configure.in Mon May 11 09:57:32 2009
@@ -5,8 +5,8 @@
 OPENSSL_BIN_DIR = C:\OpenSSL
 
 # Set this to 1 if debug code should be generated, 0 otherwise.
-DEBUG = 1
+DEBUG = 0
 #CRUNTIME Libaray ( Use /MT or /MD)
-CRUNTIME=/MD
+CRUNTIME=/MT
 
-EMBED_MANIFEST=1
+EMBED_MANIFEST=0