Updates to unused code

[ejpi] / Makefile

diff --git a/Makefile b/Makefile
index 6351708..3dd83f7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,13 +4,13 @@ PACKAGE_NAME=$(PROJECT_NAME)
 SOURCE_PATH=$(PACKAGE_NAME)
 SOURCE=$(shell find $(SOURCE_PATH) -iname "*.py")
 
-PROGRAM=$(PROJECT_NAME)-calc
-DIST_BASE_PATH=./dist
-ICON_SIZES=22 28 32 48 80
+PROGRAM=ejpi-calc
+ICON_SIZES=26 32 48 80
 ICONS=$(foreach size, $(ICON_SIZES), data/icons/$(size)/$(PROJECT_NAME).png)
 PACKAGE_VARIANTS=fremantle harmattan ubuntu
 DESKTOP_FILES=$(foreach variant, $(PACKAGE_VARIANTS), data/$(variant)/$(PROJECT_NAME).desktop)
 SETUP_FILES=$(foreach variant, $(PACKAGE_VARIANTS), ./setup.$(variant).py)
+DIST_BASE_PATH=./dist
 DIST_PATHS=$(foreach variant, $(PACKAGE_VARIANTS), $(DIST_BASE_PATH)_$(variant)) $(DIST_BASE_PATH)_diablo
 
 OBJ=$(SOURCE:.py=.pyc)
@@ -48,10 +48,17 @@ test: $(OBJ)
 
 package: $(OBJ) $(ICONS) $(SETUP_FILES) $(DESKTOP_FILES)
        rm -Rf $(DIST_BASE_PATH)_*/*
-       ./setup.fremantle.py sdist_diablo -d $(DIST_BASE_PATH)_diablo
-       ./setup.fremantle.py sdist_fremantle -d $(DIST_BASE_PATH)_fremantle
-       ./setup.harmattan.py sdist_harmattan -d $(DIST_BASE_PATH)_harmattan
-       ./setup.ubuntu.py sdist_ubuntu -d $(DIST_BASE_PATH)_ubuntu
+       ./setup.fremantle.py sdist_diablo \
+               -d $(DIST_BASE_PATH)_diablo \
+               --install-purelib=/usr/lib/python2.5/site-packages
+       ./setup.fremantle.py sdist_fremantle \
+               -d $(DIST_BASE_PATH)_fremantle \
+               --install-purelib=/usr/lib/python2.5/site-packages
+       ./setup.harmattan.py sdist_harmattan \
+               -d $(DIST_BASE_PATH)_harmattan
+               --install-purelib=/usr/lib/python2.6/dist-packages
+       ./setup.ubuntu.py sdist_ubuntu \
+               -d $(DIST_BASE_PATH)_ubuntu
        mkdir $(DIST_BASE_PATH)_ubuntu/build
        cd $(DIST_BASE_PATH)_ubuntu/build ; tar -zxvf ../*.tar.gz
        cd $(DIST_BASE_PATH)_ubuntu/build ; dpkg-buildpackage -tc -rfakeroot -us -uc
@@ -59,7 +66,7 @@ package: $(OBJ) $(ICONS) $(SETUP_FILES) $(DESKTOP_FILES)
 upload:
        dput diablo-extras-builder $(DIST_BASE_PATH)_diablo/$(PROJECT_NAME)*.changes
        dput fremantle-extras-builder $(DIST_BASE_PATH)_fremantle/$(PROJECT_NAME)*.changes
-       cp $(DIST_BASE_PATH)_ubuntu/*.deb www/ejpi.deb
+       cp $(DIST_BASE_PATH)_ubuntu/*.deb www/$(PROJECT_NAME).deb
 
 lint: $(OBJ)
        $(foreach file, $(SOURCE), $(LINT) $(file) ; )
@@ -85,8 +92,10 @@ $(SETUP_FILES): VARIANT=$(word 2, $(subst ., ,$@))
 
 setup.fremantle.py: setup.py src/constants.py
        cog.py -c \
-               -D DESKTOP_FILE_PATH==/usr/share/applications/hildon \
+               -D DESKTOP_FILE_PATH=/usr/share/applications/hildon \
                -D INPUT_DESKTOP_FILE=data/$(VARIANT)/$(PROJECT_NAME).desktop \
+               -D ICON_CATEGORY=hildon \
+               -D ICON_SIZES=26,32,48 \
                -o $@ $<
        chmod +x $@
 
@@ -94,6 +103,8 @@ setup.harmattan.py: setup.py src/constants.py
        cog.py -c \
                -D DESKTOP_FILE_PATH=/usr/share/applications \
                -D INPUT_DESKTOP_FILE=data/$(VARIANT)/$(PROJECT_NAME).desktop \
+               -D ICON_CATEGORY=hildon \
+               -D ICON_SIZES=32,80 \
                -o $@ $<
        chmod +x $@
 
@@ -101,6 +112,8 @@ setup.ubuntu.py: setup.py src/constants.py
        cog.py -c \
                -D DESKTOP_FILE_PATH=/usr/share/applications \
                -D INPUT_DESKTOP_FILE=data/$(VARIANT)/$(PROJECT_NAME).desktop \
+               -D ICON_CATEGORY=apps \
+               -D ICON_SIZES=32,48 \
                -o $@ $<
        chmod +x $@
 
@@ -112,7 +125,7 @@ $(ICONS): data/$(PROJECT_NAME).png support/scale.py
 $(DESKTOP_FILES): VARIANT=$(word 2, $(subst /, ,$@))
 $(DESKTOP_FILES): data/template.desktop
        mkdir -p $(dir $@)
-       cog.py -c \
+       cog.py -d \
                -D VARIANT=$(VARIANT) \
                -D PROGRAM=$(PROGRAM) \
                -o $@ $<