- support 'OTHER' filedrop area, remove ZIP and EXE hack

diff --git a/build b/build
index 8b1bdc4..6e63ca2 100755 (executable)
--- a/build
+++ b/build
@@ -1516,17 +1516,6 @@ for SPECFILE in "${SPECFILES[@]}" ; do
                        mkdir -p RPMS/$arch
                        mv "$i" RPMS/$arch/
                    done
-                    # For built MS-Windows apps via cross built mechanism
-                   for i in *.exe ; do
-                       test -e "$i" || continue
-                       mkdir -p EXE
-                       mv "$i" EXE/
-                   done
-                   for i in *.zip ; do
-                       test -e "$i" || continue
-                       mkdir -p ZIP
-                       mv "$i" ZIP/
-                   done
                elif test "$BUILDTYPE" = dsc ; then
                    mkdir -p DEBS
                    find . -type f | while read i; do mv "$i" DEBS/; done
@@ -1534,6 +1523,13 @@ for SPECFILE in "${SPECFILES[@]}" ; do
                    mkdir -p KIWI
                    find . -type f | while read i; do mv "$i" KIWI/; done
                fi
+               for i in * ; do
+                   test -f "$i" || continue
+                   case $i in
+                       _*|.*) ;;
+                       *) mkdir -p OTHER ; mv $i OTHER/ ;;
+                   esac
+               done
                cleanup_and_exit ${BUILDSTATUS#BUILDSTATUS}
                ;;
              BUILDSTATUS*)
@@ -1690,7 +1686,7 @@ for SPECFILE in "${SPECFILES[@]}" ; do
     # now clean up RPM building directories
     #
     rm -rf $BUILD_ROOT$TOPDIR
-    for i in BUILD RPMS/`uname -m` RPMS/i386 RPMS/noarch SOURCES SPECS SRPMS BUILDROOT ZIP EXE; do
+    for i in BUILD RPMS/`uname -m` RPMS/i386 RPMS/noarch SOURCES SPECS SRPMS BUILDROOT OTHER ; do
        mkdir -p $BUILD_ROOT$TOPDIR/$i
     done
     chown -R "$ABUILD_UID:$ABUILD_GID" "$BUILD_ROOT$TOPDIR"
@@ -2017,13 +2013,13 @@ if test -n "$RUNNING_IN_VM" -a -n "$VM_SWAP"; then
     args="--padstart 512 --padend 512 -v"
     case "$BUILDTYPE" in
        spec)
-           computeblocklists $args $TOPDIR/RPMS/*/*.{d,}rpm $TOPDIR/SRPMS/* $TOPDIR/ZIP/* $TOPDIR/EXE/* > "$VM_SWAP"
+           computeblocklists $args $TOPDIR/RPMS/*/*.{d,}rpm $TOPDIR/SRPMS/* $TOPDIR/OTHER/* > "$VM_SWAP"
            ;;
        dsc)
-           computeblocklists $args $TOPDIR/DEBS/*.deb $TOPDIR/SOURCES.DEB/* > "$VM_SWAP"
+           computeblocklists $args $TOPDIR/DEBS/*.deb $TOPDIR/SOURCES.DEB/* $TOPDIR/OTHER/* > "$VM_SWAP"
            ;;
        kiwi)
-           computeblocklists $args $TOPDIR/KIWI/* > "$VM_SWAP"
+           computeblocklists $args $TOPDIR/KIWI/* $TOPDIR/OTHER/* > "$VM_SWAP"
            ;;
     esac || cleanup_and_exit 1
 fi