X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=c239d05abd728cf37254f3d8333cb96b9311a6c6;hb=7f9ee87fb51f89a9c2a3b89b85a5849d90fbfaa4;hp=bafdbc7333c79080d41a2f8b0986259b5098c49a;hpb=36ec16c132a01e90b145af0b2cdfcc9dc34463ec;p=ejpi

diff --git a/Makefile b/Makefile
index bafdbc7..c239d05 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,10 @@ PROJECT_NAME=ejpi
 SOURCE_PATH=src
 SOURCE=$(shell find $(SOURCE_PATH) -iname "*.py")
 PROGRAM=$(SOURCE_PATH)/$(PROJECT_NAME).py
-DATA_TYPES=*.ini *.map *.glade *.png
+DATA_TYPES=*.ini *.png
 DATA=$(foreach type, $(DATA_TYPES), $(shell find $(SOURCE_PATH) -iname "$(type)"))
 OBJ=$(SOURCE:.py=.pyc)
-BUILD_PATH=./build/
+BUILD_PATH=./build
 TAG_FILE=~/.ctags/$(PROJECT_NAME).tags
 TODO_FILE=./TODO
 
@@ -25,7 +25,7 @@ CTAGS=ctags-exuberant
 all: test
 
 run: $(OBJ)
-	$(SOURCE_PATH)/$(PROJECT_NAME)_glade.py
+	$(SOURCE_PATH)/$(PROJECT_NAME).py
 
 profile: $(OBJ)
 	$(PROFILE_GEN) $(PROGRAM)
@@ -37,18 +37,36 @@ debug: $(OBJ)
 test: $(OBJ)
 	$(UNIT_TEST)
 
-build: $(OBJ)
+package: $(OBJ)
 	rm -Rf $(BUILD_PATH)
-	mkdir $(BUILD_PATH)
-	cp $(SOURCE_PATH)/constants.py  $(BUILD_PATH)
-	cp $(SOURCE_PATH)/$(PROJECT_NAME).py  $(BUILD_PATH)
-	$(foreach file, $(DATA), cp $(file) $(BUILD_PATH)/$(subst /,-,$(file)) ; )
-	$(foreach file, $(SOURCE), cp $(file) $(BUILD_PATH)/$(subst /,-,$(file)) ; )
-	$(foreach file, $(OBJ), cp $(file) $(BUILD_PATH)/$(subst /,-,$(file)) ; )
-	cp support/$(PROJECT_NAME).desktop $(BUILD_PATH)
-	cp support/icons/26.png $(BUILD_PATH)/26x26-$(PROJECT_NAME).png
-	cp support/icons/64.png $(BUILD_PATH)/64x64-$(PROJECT_NAME).png
-	cp support/builddeb.py $(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)) ; )
+	cp support/$(PROJECT_NAME).desktop $(BUILD_PATH)/generic
+	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
+
+	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)/debian
+	cp -R $(BUILD_PATH)/generic/* $(BUILD_PATH)/debian
+	cd $(BUILD_PATH)/debian ; python builddeb.py debian
+
+upload:
+	dput fremantle-extras-builder $(BUILD_PATH)/fremantle/$(PROJECT_NAME)*.changes
+	dput diablo-extras-builder $(BUILD_PATH)/diablo/$(PROJECT_NAME)*.changes
+	cp $(BUILD_PATH)/debian/*.deb ./www/$(PROJECT_NAME).deb
 
 lint: $(OBJ)
 	$(foreach file, $(SOURCE), $(LINT) $(file) ; )