Fixed some issues when running build_script

git-svn-id: file:///svnroot/gc-dialer/trunk@20 c39d3808-3fe2-4d86-a59f-b7f623ee9f21

diff --git a/GrandcentralDialer.pypackager b/GrandcentralDialer.pypackager
new file mode 100644 (file)
index 0000000..3bdcce0
--- /dev/null
+++ b/GrandcentralDialer.pypackager
@@ -0,0 +1,25 @@
+(S'Grandcentral_Dialer'
+S'0.6'
+S'user/Communication'
+S'all'
+S'Optional'
+S'Mark Bergman <bergman@mertech.com>'
+S'python2.5, python2.5-hildon, python2.5-gtk2'
+S'Python script that provides a telephone dial-pad in order to enter\nphone numbers to be dialed through Grandcentral.com.\n\nRequirements:\n\tan account with Grandcentral'
+S'/tmp/gc_dialer/build'
+S'/tmp/gc_dialer/gc_dialer_26.png'
+S'#!/bin/sh\n\ngtk-update-icon-cache -f /usr/share/icons/hicolor'
+S''
+S''
+S''
+S'0.6 "Daddy brain"\n\nNative login, UI updates, cleanup, and much more\n\n\n0.5\n\nAdded dialing history, changed UI.'
+S'extras'
+S'chinook'
+S'low'
+S'email@email.com'
+S''
+S'/tmp/gc_dialer/build'
+S'z2n'
+S'1'
+tp1
+.
\ No newline at end of file

diff --git a/TODO b/TODO
new file mode 100644 (file)
index 0000000..3b2fa9b
--- /dev/null
+++ b/TODO
@@ -0,0 +1,4 @@
+User Contacts through DBus
+       http://maemo.org/maemo_release_documentation/maemo4.1.x/node8.html#SECTION00870000000000000000
+Clip board
+       http://maemo.org/maemo_release_documentation/maemo4.1.x/node8.html#SECTION00880000000000000000

diff --git a/build_script.sh b/build_script.sh
new file mode 100755 (executable)
index 0000000..facfea5
--- /dev/null
+++ b/build_script.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# Create PyPackager directory structure from the original files
+# Please make sure the following files are in this directory before
+# running this script
+
+# gc_dialer_256.png
+# gc_dialer_64.png
+# gc_dialer_26.png
+# gc_dialer.py
+# gc_dialer.xml
+# gc_dialer.desktop
+# gcbackend.py
+# browser_emu.py
+
+# The script creates the directories and concatenates the .py into a
+# single python script
+
+mkdir -p build/usr/share/icons/hicolor/scalable/hildon
+mkdir -p build/usr/share/icons/hicolor/26x26/hildon
+mkdir -p build/usr/share/icons/hicolor/64x64/hildon
+mkdir -p build/usr/share/applications/hildon
+mkdir -p build/usr/local/bin
+mkdir -p build/usr/local/lib
+
+cp gc_dialer/gc_dialer_256.png build/usr/share/icons/hicolor/scalable/hildon/gc_dialer.png
+cp gc_dialer/gc_dialer_64.png  build/usr/share/icons/hicolor/64x64/hildon/gc_dialer.png
+cp gc_dialer/gc_dialer_26.png  build/usr/share/icons/hicolor/26x26/hildon/gc_dialer.png
+
+cp gc_dialer/gc_dialer.desktop build/usr/share/applications/hildon
+
+cp gc_dialer/gc_dialer.xml     build/usr/local/lib
+
+# Compress whitespace for 30% savings, make sure we are a HildonWindow
+sed -i 's/^[ \t]*//;s/[ \t]*$//;s/GtkWindow/HildonWindow/' build/usr/local/lib/gc_dialer.xml
+
+echo "#!/usr/bin/python" > build/usr/local/bin/gc_dialer.py
+#echo "from __future__ import with_statement" >> build/usr/local/bin/gc_dialer.py
+cat gc_dialer/gc_dialer.py gc_dialer/gcbackend.py gc_dialer/browser_emu.py | grep -e '^import ' | sort -u >> build/usr/local/bin/gc_dialer.py
+echo "import hildon" >> build/usr/local/bin/gc_dialer.py
+cat gc_dialer/browser_emu.py gc_dialer/gcbackend.py gc_dialer/gc_dialer.py | grep -v 'import ' | grep -v "#!" >> build/usr/local/bin/gc_dialer.py
+chmod 755 build/usr/local/bin/gc_dialer.py

diff --git a/gc_dialer/GrandcentralDialer.pypackager b/gc_dialer/GrandcentralDialer.pypackager
deleted file mode 100644 (file)
index 3bdcce0..0000000
--- a/gc_dialer/GrandcentralDialer.pypackager
+++ /dev/null
@@ -1,25 +0,0 @@
-(S'Grandcentral_Dialer'
-S'0.6'
-S'user/Communication'
-S'all'
-S'Optional'
-S'Mark Bergman <bergman@mertech.com>'
-S'python2.5, python2.5-hildon, python2.5-gtk2'
-S'Python script that provides a telephone dial-pad in order to enter\nphone numbers to be dialed through Grandcentral.com.\n\nRequirements:\n\tan account with Grandcentral'
-S'/tmp/gc_dialer/build'
-S'/tmp/gc_dialer/gc_dialer_26.png'
-S'#!/bin/sh\n\ngtk-update-icon-cache -f /usr/share/icons/hicolor'
-S''
-S''
-S''
-S'0.6 "Daddy brain"\n\nNative login, UI updates, cleanup, and much more\n\n\n0.5\n\nAdded dialing history, changed UI.'
-S'extras'
-S'chinook'
-S'low'
-S'email@email.com'
-S''
-S'/tmp/gc_dialer/build'
-S'z2n'
-S'1'
-tp1
-.
\ No newline at end of file

diff --git a/gc_dialer/build_script.sh b/gc_dialer/build_script.sh
deleted file mode 100755 (executable)
index 5dabf22..0000000
--- a/gc_dialer/build_script.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# Create PyPackager directory structure from the original files
-# Please make sure the following files are in this directory before
-# running this script
-
-# gc_dialer_256.png
-# gc_dialer_64.png
-# gc_dialer_26.png
-# gc_dialer.py
-# gc_dialer.xml
-# gc_dialer.desktop
-# gcbackend.py
-# browser_emu.py
-
-# The script creates the directories and concatenates the .py into a
-# single python script
-
-mkdir -p build/usr/share/icons/hicolor/scalable/hildon
-mkdir -p build/usr/share/icons/hicolor/26x26/hildon
-mkdir -p build/usr/share/icons/hicolor/64x64/hildon
-mkdir -p build/usr/share/applications/hildon
-mkdir -p build/usr/local/bin
-mkdir -p build/usr/local/lib
-
-cp gc_dialer_256.png build/usr/share/icons/hicolor/scalable/hildon/gc_dialer.png
-cp gc_dialer_64.png  build/usr/share/icons/hicolor/64x64/hildon/gc_dialer.png
-cp gc_dialer_26.png  build/usr/share/icons/hicolor/26x26/hildon/gc_dialer.png
-
-cp gc_dialer.desktop build/usr/share/applications/hildon
-
-cp gc_dialer.xml     build/usr/local/lib
-
-# Compress whitespace for 30% savings, make sure we are a HildonWindow
-sed -i 's/^[ \t]*//;s/[ \t]*$//;s/GtkWindow/HildonWindow/' build/usr/local/lib/gc_dialer.xml
-
-echo "#!/usr/bin/python" > build/usr/local/bin/gc_dialer.py
-#echo "from __future__ import with_statement" >> build/usr/local/bin/gc_dialer.py
-cat gc_dialer.py gcbackend.py browser_emu.py | grep -e '^import ' | sort -u >> build/usr/local/bin/gc_dialer.py
-echo "import hildon" >> build/usr/local/bin/gc_dialer.py
-cat browser_emu.py gcbackend.py gc_dialer.py | grep -v 'import ' | grep -v "#!" >> build/usr/local/bin/gc_dialer.py
-chmod 755 build/usr/local/bin/gc_dialer.py

diff --git a/gc_dialer/gc_dialer.py b/gc_dialer/gc_dialer.py
index 9d99b32..7289d8e 100755 (executable)
--- a/gc_dialer/gc_dialer.py
+++ b/gc_dialer/gc_dialer.py
@@ -20,6 +20,9 @@ import gtk
 import gc
 #import hildon
 
+import doctest
+import optparse
+
 from gcbackend import GCDialer
 
 
@@ -286,7 +289,6 @@ class Dialpad(object):
 
 
 def run_doctest():
-       import doctest
        failureCount, testCount = doctest.testmod()
        if not failureCount:
                print "Tests Successful"
@@ -305,9 +307,7 @@ def run_dialpad():
 
 
 if __name__ == "__main__":
-       from optparse import OptionParser
-
-       parser = OptionParser()
+       parser = optparse.OptionParser()
        parser.add_option("-t", "--test", action="store_true", dest="test", help="Run tests")
        (options, args) = parser.parse_args()