X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=Makefile;h=15eff8c7d9306e20abe58a3b29df4075ba69389c;hb=51c530762545f37f6d8c73695cdadfc913729c42;hp=88e8bf8c2ddc1507e7d8c501cc0441df5b26b7f6;hpb=3ca7385bd450cee5f6226de8456ff7e538c01127;p=gc-dialer

diff --git a/Makefile b/Makefile
index 88e8bf8..15eff8c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,14 +5,14 @@ PROGRAM=$(SOURCE_PATH)/$(PROJECT_NAME).py
 DATA_TYPES=*.ini *.map *.glade *.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
 
 DEBUGGER=winpdb
 UNIT_TEST=nosetests --with-doctest -w .
 SYNTAX_TEST=support/test_syntax.py
-STYLE_TEST=../../Python/tools/pep8.py --ignore=W191
+STYLE_TEST=../../Python/tools/pep8.py --ignore=W191,E501
 LINT_RC=./support/pylint.rc
 LINT=pylint --rcfile=$(LINT_RC)
 PROFILE_GEN=python -m cProfile -o .profile
@@ -37,19 +37,36 @@ debug: $(OBJ)
 test: $(OBJ)
 	$(UNIT_TEST)
 
-build: $(OBJ)
-	@# @todo Add a PYC generation step
+package: $(OBJ)
 	rm -Rf $(BUILD_PATH)
-	mkdir $(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/hicolor/26x26/hildon/$(PROJECT_NAME).png $(BUILD_PATH)/26x26-$(PROJECT_NAME).png
-	cp support/icons/hicolor/64x64/hildon/$(PROJECT_NAME).png $(BUILD_PATH)/64x64-$(PROJECT_NAME).png
-	cp support/icons/hicolor/scalable/hildon/$(PROJECT_NAME).png $(BUILD_PATH)/scale-$(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/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/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) ; )
@@ -61,6 +78,7 @@ todo: $(TODO_FILE)
 clean:
 	rm -Rf $(OBJ)
 	rm -Rf $(BUILD_PATH)
+	rm -Rf $(TODO_FILE)
 
 distclean:
 	rm -Rf $(OBJ)