[mousetrap/gnome3-wip: 200/240] Reimplement `bin/mt-*` in terms of `make *`.



commit 320216604942aef619764372f3f1dc7abfb5ce95
Author: Stoney Jackson <dr stoney gmail com>
Date:   Sat Jun 28 17:04:44 2014 -0400

    Reimplement `bin/mt-*` in terms of `make *`.

 bin/mt-add-src-to-pythonpath          |    9 ---------
 bin/{mt-gen-mo => mt-check}           |    3 ++-
 bin/mt-clean                          |   26 +++++---------------------
 bin/mt-configure                      |    9 +++++++++
 bin/{mt-gen-mo => mt-ensure-makefile} |    4 +++-
 bin/mt-gen-pot                        |   24 ------------------------
 bin/mt-guess-prefix                   |    2 ++
 bin/mt-install                        |    9 ---------
 bin/{mt-gen-mo => mt-lint}            |    3 ++-
 bin/{mt-gen-mo => mt-pristine}        |    3 ++-
 bin/mt-pylint                         |    5 -----
 bin/mt-run                            |    7 ++++++-
 bin/mt-setup                          |   10 ++++++----
 bin/mt-test                           |    4 ----
 14 files changed, 37 insertions(+), 81 deletions(-)
---
diff --git a/bin/mt-gen-mo b/bin/mt-check
similarity index 64%
copy from bin/mt-gen-mo
copy to bin/mt-check
index b29a673..6c58f23 100755
--- a/bin/mt-gen-mo
+++ b/bin/mt-check
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 source "$(dirname "$0")/mt-define-mousetrap-home"
+"$MOUSETRAP_HOME/bin/mt-ensure-makefile"
 
 (
     cd "$MOUSETRAP_HOME"
-    find . -name "*.po" -exec msgfmt.py "{}" \;
+    make check
 )
diff --git a/bin/mt-clean b/bin/mt-clean
index 234a3ae..e504aa4 100755
--- a/bin/mt-clean
+++ b/bin/mt-clean
@@ -1,24 +1,8 @@
 #!/usr/bin/env bash
 source "$(dirname "$0")/mt-define-mousetrap-home"
+"$MOUSETRAP_HOME/bin/mt-ensure-makefile"
 
-main() {
-    (
-        cd "$MOUSETRAP_HOME"
-        del_ignored
-        if [ "$1" = "-A" ] ; then
-            del_untracked
-        fi
-    )
-}
-
-del_untracked() {
-    git clean -df
-}
-
-del_ignored() {
-    git clean -Xdf
-}
-
-export -f del_ignored del_untracked main
-
-main $@
+(
+    cd "$MOUSETRAP_HOME"
+    make clean
+)
diff --git a/bin/mt-configure b/bin/mt-configure
new file mode 100755
index 0000000..12acebd
--- /dev/null
+++ b/bin/mt-configure
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+source "$(dirname "$0")/mt-define-mousetrap-home"
+(
+    if [ -z "$PREFIX" ] ; then
+        PREFIX="$("$MOUSETRAP_HOME/bin/mt-guess-prefix")"
+    fi
+    cd "$MOUSETRAP_HOME"
+    ./autogen.sh --prefix="$PREFIX"
+)
diff --git a/bin/mt-gen-mo b/bin/mt-ensure-makefile
similarity index 60%
copy from bin/mt-gen-mo
copy to bin/mt-ensure-makefile
index b29a673..8d58f4a 100755
--- a/bin/mt-gen-mo
+++ b/bin/mt-ensure-makefile
@@ -3,5 +3,7 @@ source "$(dirname "$0")/mt-define-mousetrap-home"
 
 (
     cd "$MOUSETRAP_HOME"
-    find . -name "*.po" -exec msgfmt.py "{}" \;
+    if [ ! -f "Makefile" ] ; then
+        bin/mt-configure
+    fi
 )
diff --git a/bin/mt-guess-prefix b/bin/mt-guess-prefix
new file mode 100755
index 0000000..b3dd952
--- /dev/null
+++ b/bin/mt-guess-prefix
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+dirname $(dirname $(find /usr -type f -regex ".*/bin/python2.7" 2> /dev/null | head -1))
diff --git a/bin/mt-gen-mo b/bin/mt-lint
similarity index 64%
copy from bin/mt-gen-mo
copy to bin/mt-lint
index b29a673..1c48a2c 100755
--- a/bin/mt-gen-mo
+++ b/bin/mt-lint
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 source "$(dirname "$0")/mt-define-mousetrap-home"
+"$MOUSETRAP_HOME/bin/mt-ensure-makefile"
 
 (
     cd "$MOUSETRAP_HOME"
-    find . -name "*.po" -exec msgfmt.py "{}" \;
+    make lint
 )
diff --git a/bin/mt-gen-mo b/bin/mt-pristine
similarity index 62%
rename from bin/mt-gen-mo
rename to bin/mt-pristine
index b29a673..34b03b1 100755
--- a/bin/mt-gen-mo
+++ b/bin/mt-pristine
@@ -1,7 +1,8 @@
 #!/usr/bin/env bash
 source "$(dirname "$0")/mt-define-mousetrap-home"
+"$MOUSETRAP_HOME/bin/mt-ensure-makefile"
 
 (
     cd "$MOUSETRAP_HOME"
-    find . -name "*.po" -exec msgfmt.py "{}" \;
+    make pristine
 )
diff --git a/bin/mt-run b/bin/mt-run
index 978bd17..fa75475 100755
--- a/bin/mt-run
+++ b/bin/mt-run
@@ -1,3 +1,8 @@
 #!/usr/bin/env bash
 source "$(dirname "$0")/mt-define-mousetrap-home"
-(cd "$MOUSETRAP_HOME"; python src/mousetrap/main.py)
+"$MOUSETRAP_HOME/bin/mt-ensure-makefile"
+
+(
+    cd "$MOUSETRAP_HOME"
+    make run
+)
diff --git a/bin/mt-setup b/bin/mt-setup
index 0f06c4d..ee0704b 100644
--- a/bin/mt-setup
+++ b/bin/mt-setup
@@ -1,9 +1,11 @@
+# This file is intended to be sourced: `. mt-setup`
+
 SCRIPT_DIRECTORY="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "$SCRIPT_DIRECTORY"
 echo "Adding bin/ to PATH"
 source mt-add-bin-to-path
-echo "Adding src/ to PYTHONPATH"
-source mt-add-src-to-pythonpath
-echo "Defining MOUSETRAP_HOME"
-source mt-define-mousetrap-home
+if [ -z "$PREFIX" ] ; then
+    export PREFIX="$(mt-guess-prefix)"
+    echo "PREFIX=$PREFIX     If I guessed wrong please redefine PREFIX."
+fi
 cd - &> /dev/null


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]