X-Git-Url: http://git.maemo.org/git/?p=gonvert;a=blobdiff_plain;f=Makefile;h=63ca26f6308382d0aeec6710b4b4c495d33175b8;hp=cfefc13c4fe8df1cbdd9034764b8f50ef775d02d;hb=b1fec2bd437231ee4a05fc6dc3c79a1d8568ed61;hpb=99de0afb81d7972694d0a0f714cd189504cd7be1

diff --git a/Makefile b/Makefile
index cfefc13..63ca26f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,19 @@
 PROJECT_NAME=gonvert
-SOURCE_PATH=src
+PACKAGE_NAME=$(PROJECT_NAME)
+
+SOURCE_PATH=$(PACKAGE_NAME)
 SOURCE=$(shell find $(SOURCE_PATH) -iname "*.py")
-PROGRAM=$(SOURCE_PATH)/$(PROJECT_NAME).py
-DATA_PATH=data
-DATA_TYPES=*.ini *.map *.glade *.png
-DATA=$(foreach type, $(DATA_TYPES), $(shell find $(DATA_PATH) -iname "$(type)"))
+
+PROGRAM=Gonvert
+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)
-BUILD_PATH=./build
 TAG_FILE=~/.ctags/$(PROJECT_NAME).tags
 TODO_FILE=./TODO
 
@@ -21,12 +28,13 @@ PROFILE_VIEW=python -m pstats .profile
 TODO_FINDER=support/todo.py
 CTAGS=ctags-exuberant
 
+
 .PHONY: all run profile debug test build lint tags todo clean distclean
 
 all: test
 
 run: $(OBJ)
-	$(SOURCE_PATH)/$(PROJECT_NAME)_glade.py
+	$(PROGRAM)
 
 profile: $(OBJ)
 	$(PROFILE_GEN) $(PROGRAM)
@@ -38,31 +46,27 @@ debug: $(OBJ)
 test: $(OBJ)
 	$(UNIT_TEST)
 
-package: $(OBJ)
-	rm -Rf $(BUILD_PATH)
-
-	mkdir -p $(BUILD_PATH)/generic
-	cp $(SOURCE_PATH)/constants.py  $(BUILD_PATH)/generic
-	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/builddeb.py $(BUILD_PATH)/generic
-	cp support/py2deb.py $(BUILD_PATH)/generic
-
-	mkdir -p $(BUILD_PATH)/chinook
-	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/chinook
-	cd $(BUILD_PATH)/chinook ; python builddeb.py chinook
-	mkdir -p $(BUILD_PATH)/diablo
-	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/diablo
-	cd $(BUILD_PATH)/diablo ; python builddeb.py diablo
-	mkdir -p $(BUILD_PATH)/fremantle
-	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/fremantle
-	cd $(BUILD_PATH)/fremantle ; python builddeb.py fremantle
-	mkdir -p $(BUILD_PATH)/mer
-	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/mer
-	cd $(BUILD_PATH)/mer ; python builddeb.py mer
+package: $(OBJ) $(ICONS) $(SETUP_FILES) $(DESKTOP_FILES)
+	rm -Rf $(DIST_BASE_PATH)_*/*
+	./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
+
+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/$(PROJECT_NAME).deb
 
 lint: $(OBJ)
 	$(foreach file, $(SOURCE), $(LINT) $(file) ; )
@@ -73,18 +77,60 @@ todo: $(TODO_FILE)
 
 clean:
 	rm -Rf $(OBJ)
-	rm -Rf $(BUILD_PATH)
 	rm -Rf $(TODO_FILE)
+	rm -f $(ICONS) $(SETUP_FILES) $(DESKTOP_FILES)
+	rm -Rf $(DIST_PATHS)
 
-distclean:
-	rm -Rf $(OBJ)
-	rm -Rf $(BUILD_PATH)
-	rm -Rf $(TAG_FILE)
+distclean: clean
 	find $(SOURCE_PATH) -name "*.*~" | xargs rm -f
 	find $(SOURCE_PATH) -name "*.swp" | xargs rm -f
 	find $(SOURCE_PATH) -name "*.bak" | xargs rm -f
 	find $(SOURCE_PATH) -name ".*.swp" | xargs rm -f
 
+
+$(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 INPUT_DESKTOP_FILE=data/$(VARIANT)/$(PROJECT_NAME).desktop \
+		-D ICON_CATEGORY=hildon \
+		-D ICON_SIZES=26,32,48 \
+		-o $@ $<
+	chmod +x $@
+
+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 $@
+
+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 $@
+
+$(ICONS): SIZE=$(word 3, $(subst /, ,$@))
+$(ICONS): data/$(PROJECT_NAME).png support/scale.py
+	mkdir -p $(dir $@)
+	support/scale.py --input $< --output $@ --size $(SIZE)
+
+$(DESKTOP_FILES): VARIANT=$(word 2, $(subst /, ,$@))
+$(DESKTOP_FILES): data/template.desktop
+	mkdir -p $(dir $@)
+	cog.py -d \
+		-D VARIANT=$(VARIANT) \
+		-D PROGRAM=$(PROGRAM) \
+		-o $@ $<
+
+
 $(TAG_FILE): $(OBJ)
 	mkdir -p $(dir $(TAG_FILE))
 	$(CTAGS) -o $(TAG_FILE) $(SOURCE)