perfsonar development work

Author: trzaszcz
Date: 2009-12-15 05:31:56 -0500 (Tue, 15 Dec 2009)
New Revision: 5415

Modified:
   branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/postinst
   branches/new-structure-with-base2/ps-mdm-ls/packaging/package.sh
Log:
packaging enhancement

Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/postinst
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/postinst  
2009-12-14 14:56:01 UTC (rev 5414)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/deb/postinst  
2009-12-15 10:31:56 UTC (rev 5415)
@@ -51,12 +51,6 @@
     chown -R tomcat55 
$SERVICEPATH/$SERVICENAME/WEB-INF/classes/perfsonar/conf
     chown tomcat55 $SERVICEPATH/$SERVICENAME/WEB-INF/log
 
-    cp -v /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/resolver-1.2.jar 
/usr/share/tomcat5.5/common/endorsed
-    cp -v /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/xalan-2.7.1.jar 
/usr/share/tomcat5.5/common/endorsed
-    cp -v /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/xml-apis.jar 
/usr/share/tomcat5.5/common/endorsed
-    cp -v /var/lib/tomcat5.5/webapps/exist/WEB-INF/lib/serializer-2.9.1.jar 
/usr/share/tomcat5.5/common/endorsed
-    cp -v 
/var/lib/tomcat5.5/webapps/perfsonar-java-xml-ls/WEB-INF/lib/xercesImpl-2.8.0.jar
 /usr/share/tomcat5.5/common/endorsed
-
     /etc/init.d/tomcat5.5 restart
     ;;
 

Modified: branches/new-structure-with-base2/ps-mdm-ls/packaging/package.sh
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/packaging/package.sh    
2009-12-14 14:56:01 UTC (rev 5414)
+++ branches/new-structure-with-base2/ps-mdm-ls/packaging/package.sh    
2009-12-15 10:31:56 UTC (rev 5415)
@@ -55,7 +55,7 @@
        sudo dpkg-buildpackage -d
 }
 
-clean_after_packaging(){
+clean_after_deb_packaging(){
        cd ../..
        file=$(find temp -regex ".+\.deb$")
        mkdir target
@@ -68,6 +68,7 @@
     echo "[ ] Do RPM struct"
     
     rm -rfv ../packaging/temp/rpm
+    mkdir ../packaging/temp/rpm
     mkdir -pv 
../packaging/temp/rpm/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS,TMP}
     
     echo "[ ] Create symbolic link and create tar archive"
@@ -88,7 +89,12 @@
     cp -v ../rpm/perfsonar-java-xml-ls.specs rpm/rpmbuild
 }
 
+create_rpm_package() {
+       cd packaging/temp/rpm
+       sudo rpmbuild -bb rpmbuild/perfsonar-java-xml-ls.specs
+}
 
+
 case "$1" in
     clean)
         do_clean
@@ -100,11 +106,12 @@
        do_structure
         do_deb_struct
         create_deb_package
-        clean_after_packaging
+        clean_after_deb_packaging
         ;;
     rpm)
-       #do_structure
+       do_structure
         do_rpm_struct
+        create_rpm_package
         ;;
     all)
         do_clean