Pulling in Maemo skeleton
authorEd Page <eopage@byu.net>
Wed, 9 Jun 2010 00:30:52 +0000 (19:30 -0500)
committerEd Page <eopage@byu.net>
Wed, 9 Jun 2010 00:30:52 +0000 (19:30 -0500)
1  2 
Makefile
src/constants.py
src/hildonize.py
support/builddeb.py

diff --cc Makefile
+++ b/Makefile
@@@ -45,11 -45,10 +45,10 @@@ package: $(OBJ
        cp $(SOURCE_PATH)/$(PROJECT_NAME).py  $(BUILD_PATH)/generic
        $(foreach file, $(DATA), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
        $(foreach file, $(SOURCE), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
-       #$(foreach file, $(OBJ), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
        cp support/$(PROJECT_NAME).desktop $(BUILD_PATH)/generic
 -      cp support/icons/hicolor/26x26/hildon/$(PROJECT_NAME).png $(BUILD_PATH)/generic/26x26-$(PROJECT_NAME).png
 -      cp support/icons/hicolor/64x64/hildon/$(PROJECT_NAME).png $(BUILD_PATH)/generic/64x64-$(PROJECT_NAME).png
 -      cp support/icons/hicolor/scalable/hildon/$(PROJECT_NAME).png $(BUILD_PATH)/generic/scale-$(PROJECT_NAME).png
 +      cp support/icons/26.png $(BUILD_PATH)/generic/26x26-$(PROJECT_NAME).png
 +      cp support/icons/64.png $(BUILD_PATH)/generic/64x64-$(PROJECT_NAME).png
 +      cp support/icons/scalable.png $(BUILD_PATH)/generic/scale-$(PROJECT_NAME).png
        cp support/builddeb.py $(BUILD_PATH)/generic
        cp support/py2deb.py $(BUILD_PATH)/generic
        cp support/fake_py2deb.py $(BUILD_PATH)/generic
@@@ -1,9 -1,10 +1,10 @@@
  import os
  
 -__pretty_app_name__ = "REPLACEME"
 -__app_name__ = "REPLACEME"
 -__version__ = "0.1.0"
 +__pretty_app_name__ = "e**(j pi) + 1 = 0"
 +__app_name__ = "ejpi"
 +__version__ = "0.9.8"
  __build__ = 0
- _data_path_ = os.path.join(os.path.expanduser("~"), ".ejpi")
  __app_magic__ = 0xdeadbeef
- _user_logpath_ = "%s/ejpi.log" % _data_path_
+ _data_path_ = os.path.join(os.path.expanduser("~"), ".%s" % __app_name__)
+ _user_settings_ = "%s/settings.ini" % _data_path_
+ _user_logpath_ = "%s/%s.log" % (_data_path_, __app_name__)
index 77d585a,339eb2a..339eb2a
mode 100755,100644..100755
@@@ -27,50 -22,8 +27,8 @@@ __email__ = "eopage@byu.net
  __version__ = constants.__version__
  __build__ = constants.__build__
  __changelog__ = """
- 0.9.8
- * Fixing log support
- 0.9.7
- * Added shortcut to copy result
- * Shortcuts: Backspace - as expected, Ctrl+Backspace - unpops, Enter - pops
- * BugFix: Attempt two at bigger X button
- * Bugfix: Inconsistent location of pie items on the computer section
- * Added support for creating .deb generic linux package files
- 0.9.6
- * Fullscreen by Ctrl+Enter
- * "Enter" in number entry causes a push
- * Reversed stack order to be more proper
- * Logging support, Ctrl+l to copy the log
- * Fremantle Support
- 0.9.4
-  * Added icons
-  * Minor improvements
-  * Swapping the keyboard positions, seem more friendly to my thumb location this way
- 0.9.3 - ""
-  * Added +/-, !, sq, and sqrt functions
-  * Improved Documentation
-  * Copy of calculation result and the corresponding equation
-  * Bug fixes
- 0.9.2 - ""
-  * Experimenting with faster startup by including pyc files in package
-  * Minor tweaks and bug fixes
- 0.9.1 - "Laziness doesn't always pay off"
-  * Profiled the code with an especial focus on the pie menus
-  * Tried to reduce potential bugs with double clicks
-  * Fixed a visual artifact issue on popup
- 0.9.0 - "Feed is for horses, so what about feedback?"
-  * Initial public release
-  * Pie menus for keys
-  * Modifiable history
-  * Supports different number types and bases
-  * Basic trig support
- """
 -REPLACEME
++* Port to QT
+ """.strip()
  
  
  __postinstall__ = """#!/bin/sh -e
@@@ -110,8 -66,7 +71,7 @@@ def build_package(distribution)
        p = py2deb.Py2deb(__appname__)
        p.prettyName = constants.__pretty_app_name__
        p.description = __description__
 -      p.bugTracker = "REPLACEME"
 +      p.bugTracker = "https://bugs.maemo.org/enter_bug.cgi?product=ejpi"
-       #p.upgradeDescription = __changelog__.split("\n\n", 1)[0]
        p.author = __author__
        p.mail = __email__
        p.license = "lgpl"
        p.repository = "extras"
        p.changelog = __changelog__
        p.postinstall = __postinstall__
 -      p.preremove = __preremove__
        p.icon = {
 -              "debian": "REPLACEME",
 -              "diablo": "REPLACEME",
 -              "fremantle": "REPLACEME", # Fremantle natively uses 48x48
 +              "debian": "26x26-ejpi.png",
 +              "diablo": "26x26-ejpi.png",
 +              "fremantle": "64x64-ejpi.png", # Fremantle natively uses 48x48
        }[distribution]
-       p["/usr/bin"] = [ "ejpi.py" ]
-       for relPath, files in unflatten_files(find_files(".")).iteritems():
-               fullPath = "/usr/lib/ejpi"
+       p["/opt/%s/bin" % constants.__appname__] = [ "%s.py" % constants.__appname__ ]
+       for relPath, files in unflatten_files(find_files("src", ".")).iteritems():
+               fullPath = "/opt/%s/lib" % constants.__appname__
                if relPath:
                        fullPath += os.sep+relPath
                p[fullPath] = list(
                        "|".join((oldName, newName))
                        for (oldName, newName) in files
                )
-       p["/usr/share/applications/hildon"] = ["ejpi.desktop"]
+       p["/usr/share/applications/hildon"] = ["%s.desktop" % constants.__appname__]
 -      p["/usr/share/icons/hicolor/26x26/hildon"] = ["%s.png" % constants.__appname__]
 -      p["/usr/share/icons/hicolor/64x64/hildon"] = ["%s.png" % constants.__appname__]
 -      p["/usr/share/icons/hicolor/scalable/hildon"] = ["%s.png" % constants.__appname__]
 +      p["/usr/share/icons/hicolor/26x26/hildon"] = ["26x26-ejpi.png|ejpi.png"]
 +      p["/usr/share/icons/hicolor/64x64/hildon"] = ["64x64-ejpi.png|ejpi.png"]
 +      p["/usr/share/icons/hicolor/scalable/hildon"] = ["scale-ejpi.png|ejpi.png"]
  
        if distribution == "debian":
                print p