[openrtm-commit:01077] r577 - in trunk/OpenRTM-aist-Python/packages: . deb rpm

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2013-05-02 21:59:10 +0900 (Thu, 02 May 2013)
New Revision: 577

Modified:
   trunk/OpenRTM-aist-Python/packages/Makefile
   trunk/OpenRTM-aist-Python/packages/deb/Makefile
   trunk/OpenRTM-aist-Python/packages/rpm/rpm_build.sh
Log:
[compat] clean target has been added.

Modified: trunk/OpenRTM-aist-Python/packages/Makefile
===================================================================
--- trunk/OpenRTM-aist-Python/packages/Makefile	2013-05-02 12:39:34 UTC (rev 576)
+++ trunk/OpenRTM-aist-Python/packages/Makefile	2013-05-02 12:59:10 UTC (rev 577)
@@ -3,5 +3,7 @@
 	$(MAKE) -C rpm
 
 clean:
+	$(MAKE) -C deb clean
+	$(MAKE) -C rpm clean
 	rm -rf *.deb *.tar.gz *.dsc *.changes
 	rm -rf *.rpm

Modified: trunk/OpenRTM-aist-Python/packages/deb/Makefile
===================================================================
--- trunk/OpenRTM-aist-Python/packages/deb/Makefile	2013-05-02 12:39:34 UTC (rev 576)
+++ trunk/OpenRTM-aist-Python/packages/deb/Makefile	2013-05-02 12:59:10 UTC (rev 577)
@@ -1,2 +1,5 @@
 all:
 	sh dpkg_build.sh
+
+clean:
+	sh dpkg_build.sh clean

Modified: trunk/OpenRTM-aist-Python/packages/rpm/rpm_build.sh
===================================================================
--- trunk/OpenRTM-aist-Python/packages/rpm/rpm_build.sh	2013-05-02 12:39:34 UTC (rev 576)
+++ trunk/OpenRTM-aist-Python/packages/rpm/rpm_build.sh	2013-05-02 12:59:10 UTC (rev 577)
@@ -8,6 +8,23 @@
 #
 export LC_ALL=C
 
+clean_dirs()
+{
+    rm -rf *.log *.bak .rpmrc
+    dirs="BUILD RPMS SOURCES SPECS SRPMS BUILDROOT"
+    for d in $dirs; do
+	rm -rf $d
+    done
+
+}
+get_opt()
+{
+    if test "x$1" = "xclean" ; then
+	clean_dirs
+	exit 0
+    fi
+}
+
 check_distribution()
 {
     dist_name=""
@@ -65,6 +82,7 @@
 
 create_rpmbuilddir()
 {
+    clean_dirs
     mkdir {BUILD,RPMS,SOURCES,SPECS,SRPMS}
     mkdir RPMS/{i386,i586,i686,x86_64,noarch}
     export BUILD_DIR=`pwd`
@@ -105,17 +123,11 @@
     fi
 }
 
-get_opt()
+copy_rpm()
 {
-    if test "x$1" = "xclean" ; then
-	rm -rf *.log *.bak
-	dirs="BUILD RPMS SOURCES SPECS SRPMS BUILDROOT"
-	for d in $dirs; do
-	    rm -rf $d
-	done
-	exit 0
-    fi
+    find $BUILD_DIR -name '*.rpm' -exec cp {} ${BUILD_DIR}/.. \;
 }
+
 #------------------------------
 # main
 #------------------------------
@@ -130,4 +142,4 @@
 create_spec_file
 
 build_rpm
-
+copy_rpm