Cleanup: removal of mer, making things cleaner, etc

[quicknote] / Makefile

diff --git a/Makefile b/Makefile
index 9ede64b..3642f91 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,10 @@ BUILD_PATH=./builddeb/
 
 TEXT_DOMAIN=$(PROJECT_NAME)
 POTFILES=$(wildcard src/quicknoteclasses/*.py)
+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,E501
@@ -38,10 +41,6 @@ debug: $(OBJ)
 test: $(OBJ)
        $(UNIT_TEST)
 
-package: clean $(OBJ) all
-       dpkg-buildpackage -rfakeroot 
-       dpkg -i ../$(PROJECT_NAME)_$(PROJECT_VERSION)_all.deb
-
 update_po: po/templates.pot
        @for lang in $(basename $(notdir $(wildcard po/*.po))); do \
                msgmerge -U --strict --no-wrap po/$$lang.po po/templates.pot; \
@@ -56,23 +55,40 @@ build_mo:
                msgfmt --statistics -c -o locale/$$lang/LC_MESSAGES/$(TEXT_DOMAIN).mo po/$$lang.po; \
        done
 
-build: $(OBJ) build_mo
+package: $(OBJ) build_mo
        rm -Rf $(BUILD_PATH)
-       mkdir $(BUILD_PATH)
-       cp $(PROGRAM)  $(BUILD_PATH)
-       cp src/constants.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)) ; )
-       $(foreach file, $(LOCALE_FILES), cp $(file) $(BUILD_PATH)/$(subst /,-,$(file)) ; )
-       cp data/$(PROJECT_NAME).desktop $(BUILD_PATH)
-       cp data/$(PROJECT_NAME).service $(BUILD_PATH)
-       cp data/low/$(PROJECT_NAME).png $(BUILD_PATH)/26x26-$(PROJECT_NAME).png
-       cp data/40/$(PROJECT_NAME).png $(BUILD_PATH)/40x40-$(PROJECT_NAME).png
-       cp data/48/$(PROJECT_NAME).png $(BUILD_PATH)/48x48-$(PROJECT_NAME).png
-       cp data/scale/$(PROJECT_NAME).png $(BUILD_PATH)/scale-$(PROJECT_NAME).png
-       cp support/builddeb.py $(BUILD_PATH)
-       cp support/fake_py2deb.py $(BUILD_PATH)
+
+       mkdir -p $(BUILD_PATH)/generic
+       cp $(SOURCE_PATH)/constants.py $(BUILD_PATH)/generic
+       cp $(PROGRAM)  $(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)) ; )
+       $(foreach file, $(LOCALE_FILES), cp $(file) $(BUILD_PATH)/generic/$(subst /,-,$(file)) ; )
+       cp data/$(PROJECT_NAME).desktop $(BUILD_PATH)/generic
+       cp data/$(PROJECT_NAME).service $(BUILD_PATH)/generic
+       cp data/low/$(PROJECT_NAME).png $(BUILD_PATH)/generic/26x26-$(PROJECT_NAME).png
+       cp data/40/$(PROJECT_NAME).png $(BUILD_PATH)/generic/40x40-$(PROJECT_NAME).png
+       cp data/48/$(PROJECT_NAME).png $(BUILD_PATH)/generic/48x48-$(PROJECT_NAME).png
+       cp data/scale/$(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) ; )