perfsonar development work

Author: mac
Date: 2008-10-01 10:21:38 -0400 (Wed, 01 Oct 2008)
New Revision: 4576

Modified:
   trunk/geant2_java-xml-ls/ant/const.properties
   trunk/geant2_java-xml-ls/ant/const.properties.template
   trunk/geant2_java-xml-ls/ant/package.sh
Log:



New packaging script

Modified: trunk/geant2_java-xml-ls/ant/const.properties
===================================================================
--- trunk/geant2_java-xml-ls/ant/const.properties       2008-10-01 14:09:39 
UTC (rev 4575)
+++ trunk/geant2_java-xml-ls/ant/const.properties       2008-10-01 14:21:38 
UTC (rev 4576)
@@ -1,4 +1,4 @@
-version=1.2
+version=1.3
 
 build=build
 
@@ -24,10 +24,10 @@
 api.windowtitle=perfSONAR
 api.bottom=perfSONAR
 
-nmwg-jar-ver=1.0.20080124
+nmwg-jar-ver=1.0.20080911
 ps-antxml-ver=1.0.20080416
-ps-jar-ver=1.0.20080422
-ps-webadmin=0.8.4b
+ps-jar-ver=1.0.20080911
+ps-webadmin=0.8.3b
 
 #RC7
 #ps-jar-ver=1.0.20080310

Modified: trunk/geant2_java-xml-ls/ant/const.properties.template
===================================================================
--- trunk/geant2_java-xml-ls/ant/const.properties.template      2008-10-01 
14:09:39 UTC (rev 4575)
+++ trunk/geant2_java-xml-ls/ant/const.properties.template      2008-10-01 
14:21:38 UTC (rev 4576)
@@ -1,4 +1,4 @@
-version=1.2
+version=1.3
 
 build=build
 

Modified: trunk/geant2_java-xml-ls/ant/package.sh
===================================================================
--- trunk/geant2_java-xml-ls/ant/package.sh     2008-10-01 14:09:39 UTC (rev 
4575)
+++ trunk/geant2_java-xml-ls/ant/package.sh     2008-10-01 14:21:38 UTC (rev 
4576)
@@ -46,7 +46,10 @@
        mkdir -p $LIB
        mkdir -p $SERVICEDIR/WEB-INF/logs
        mkdir -p $SERVICEDIR/wsdd
-       
+        mkdir -p $SERVICEDIR/doc
+        mkdir -p $SERVICEDIR/samples/requests
+        mkdir -p $SERVICEDIR/samples/responses
+               
        echo "[ ] Copy WSDD";
        
        cp $BASEDIR/conf/wsdd/*.wsdd $SERVICEDIR/wsdd
@@ -61,10 +64,16 @@
        echo "    - copy perfsonar jar";
        cp $BASEDIR/build/*.jar $LIB
        
+        echo "[ ] Copy doc & samples"
+        cp -v $BASEDIR/doc/* $SERVICEDIR/doc
+        cp -v $BASEDIR/samples/requests/* $SERVICEDIR/samples/requests
+        cp -v $BASEDIR/samples/responses/* $SERVICEDIR/samples/responses
+        
+        
        echo "[ ] Copy config"
        
        cp $BASEDIR/conf/conf-rpm/* $CONF
-       cp $BASEDIR/samples/requests/LSStore* $CONF
+       cp $BASEDIR/samples/requests/LSStore* $CONF       
        
        echo "[ ] Remove .svn dirs"
        
@@ -110,13 +119,51 @@
     mkdir -v ../package/deb/build
     
     echo "[ ] Copying package files"    
-    cp ../../packaging/deb/geant2-java-xml-ls/* ../package/deb/debian
+    cp -v ../../packaging/deb/geant2-java-xml-ls/* ../package/deb/debian
 }
 
 
+do_rpm_struct() {
+    echo "[ ] Do RPM struct"
+    
+    rm -rfv ../package/rpm
+    mkdir -pv ../package/rpm/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS,TMP}
+    
+    echo "[ ] Create symbolic link and create tar archive"
 
+    currdir=$(pwd)
+    cd $WEBAPPS
+    LSVER=$(ls | grep ^xml-ls)
+    ln -sv $LSVER geant2-java-$LSVER
+    echo "[ ] TAR"
+    tar -czhf geant2-java-$LSVER.tar.gz geant2-java-$LSVER/
+    cd $currdir
+    
+    echo "[ ] Copy tarball into SOURCES"    
+    mv -v $WEBAPPS/geant2-java-$LSVER.tar.gz 
$BASEDIR/package/rpm/rpmbuild/SOURCES
+    
+    echo "[ ] Copy RPM .specs file"
+    cp -v ../../packaging/rpm/geant2-java-xml-ls/geant2-java-xml-ls.specs 
../package/rpm/rpmbuild
+}
 
 
+show_debinfo() {
+    echo "-----------------------------------------------------------"
+    echo "  DEB"
+    echo "       cd ../package/deb"
+    echo "       sudo dpkg-buildpackage"
+    echo "-----------------------------------------------------------"
+    echo;
+}
+show_rpminfo() {
+    echo "-----------------------------------------------------------"
+    echo "  RPM"
+    echo "       cd ../package/rpm"
+    echo "       sudo rpmbuild -bb rpmbuild/geant2-java-xml-ls.specs"
+    echo "-----------------------------------------------------------"
+    echo;
+}
+
 case "$1" in
     clean)
         do_clean
@@ -130,14 +177,20 @@
     deb)
         do_deb_struct
         ;;
+    rpm)
+        do_rpm_struct
+        ;;
     all)
         do_clean
         do_structure
         do_war
         do_deb_struct
+        do_rpm_struct
+        show_debinfo
+        show_rpminfo
         ;;
     *)
-        echo "Usage: $0 clean|structure|war|all" >&2
+        echo "Usage: $0 clean|structure|war|deb|rpm|all" >&2
         exit 3
         ;;
 esac