[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkde-ruleset=5D_/=3A_move_deleter-fb_to_bin?=
From:       Ian Monroe <ian.monroe () gmail ! com>
Date:       2011-02-03 21:37:53
Message-ID: 20110203213753.10CE0A609B () git ! kde ! org
[Download RAW message or body]

Git commit d995c4a38fecebe177e2165396d7a7a9942d7fa2 by Ian Monroe.
Committed on 03/02/11 at 22:41.
Pushed by ianmonroe into branch 'master'.

move deleter-fb to bin

A  +23   -0    bin/deleter-fb         [License: UNKNOWN]
A  +17   -0    converted/KDE/kdemain-filter.make         [License: UNKNOWN]
D  +0    -23   deleter-fb     
D  +0    -17   kdemain-filter.make     

http://commits.kde.org/kde-ruleset/d995c4a38fecebe177e2165396d7a7a9942d7fa2

diff --git a/bin/deleter-fb b/bin/deleter-fb
new file mode 100755
index 0000000..5b6759a
--- /dev/null
+++ b/bin/deleter-fb
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# I really need to move this to a shared function
+tempdir=$(
+    mktemp -u -d --tmpdir=/dev/shm filterbranch.XXXXX ||
+    mktemp -u -d --tmpdir filterbranch.XXXXX ||
+    echo ".git-rewrite"
+)
+echo "using $tempdir as temporary directory"
+
+delete_ws="$*"
+delete_regex=$(python -c 'import sys; print "\\|".join(sys.argv[1:])' "$@")
+
+git filter-branch  -d "$tempdir" \
+--index-filter 'git rm -q --cached --ignore-unmatch -r '"$delete_ws"';' \
+--msg-filter '
+cat
+if git diff-tree --name-only -r $(map $GIT_COMMIT) | grep -q "^\('$delete_regex'\)\(/\|\$\)"; then
+    echo
+    echo "The following changes were in SVN, but were removed from git:"
+    git diff-tree --format=format: --name-status -r $(map $GIT_COMMIT) -- '"$delete_ws"';
+fi
+' --tag-name-filter cat -- --all
diff --git a/converted/KDE/kdemain-filter.make b/converted/KDE/kdemain-filter.make
new file mode 100644
index 0000000..3c9e502
--- /dev/null
+++ b/converted/KDE/kdemain-filter.make
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+DELETER=./deleter-fb
+
+all: fb-workspace fb-runtime fb-kdelibs
+
+fb-workspace: kdebase-workspace
+	cd $< && $(DELETER) wallpapers
+	touch $@
+
+fb-runtime: kdebase-runtime
+	cd $< && $(DELETER) pics/oxygen pics/crystalsvg pics/locolor pics/wallpapers
+	touch $@
+
+fb-kdelibs: KDE/kdelibs
+	cd $< && $(DELETER) pics
+	touch $@
diff --git a/deleter-fb b/deleter-fb
deleted file mode 100755
index 5b6759a..0000000
--- a/deleter-fb
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-# I really need to move this to a shared function
-tempdir=$(
-    mktemp -u -d --tmpdir=/dev/shm filterbranch.XXXXX ||
-    mktemp -u -d --tmpdir filterbranch.XXXXX ||
-    echo ".git-rewrite"
-)
-echo "using $tempdir as temporary directory"
-
-delete_ws="$*"
-delete_regex=$(python -c 'import sys; print "\\|".join(sys.argv[1:])' "$@")
-
-git filter-branch  -d "$tempdir" \
---index-filter 'git rm -q --cached --ignore-unmatch -r '"$delete_ws"';' \
---msg-filter '
-cat
-if git diff-tree --name-only -r $(map $GIT_COMMIT) | grep -q "^\('$delete_regex'\)\(/\|\$\)"; then
-    echo
-    echo "The following changes were in SVN, but were removed from git:"
-    git diff-tree --format=format: --name-status -r $(map $GIT_COMMIT) -- '"$delete_ws"';
-fi
-' --tag-name-filter cat -- --all
diff --git a/kdemain-filter.make b/kdemain-filter.make
deleted file mode 100644
index 3c9e502..0000000
--- a/kdemain-filter.make
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/make -f
-
-DELETER=./deleter-fb
-
-all: fb-workspace fb-runtime fb-kdelibs
-
-fb-workspace: kdebase-workspace
-	cd $< && $(DELETER) wallpapers
-	touch $@
-
-fb-runtime: kdebase-runtime
-	cd $< && $(DELETER) pics/oxygen pics/crystalsvg pics/locolor pics/wallpapers
-	touch $@
-
-fb-kdelibs: KDE/kdelibs
-	cd $< && $(DELETER) pics
-	touch $@

[prev in list] [next in list] [prev in thread] [next in thread]