Removing a warning on startup

[gc-dialer] / Makefile

diff --git a/Makefile b/Makefile
index 7df357d..9933c6a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 PROJECT_NAME=gc_dialer
+PROJECT_VERSION=0.8.0
 SOURCE_PATH=src
-SOURCE=$(SOURCE_PATH)/gc_dialer.py $(SOURCE_PATH)/gcbackend.py $(SOURCE_PATH)/browser_emu.py
+SOURCE=$(SOURCE_PATH)/gc_dialer.py $(SOURCE_PATH)/evo_backend.py $(SOURCE_PATH)/gc_backend.py $(SOURCE_PATH)/browser_emu.py
 OBJ=$(SOURCE:.py=.pyc)
 LINT_STATS_PATH=~/.pylint.d
 LINT_STATS=$(foreach file, $(addsuffix 1.stats,$(subst /,.,$(basename $(SOURCE)))), $(LINT_STATS_PATH)/$(file) )
@@ -10,6 +11,7 @@ PYPACKAGE_FILE=./support/GrandcentralDialer.pypackager
 DEB_METADATA=./support/DEBIAN
 SDK_DISPLAY=:2
 
+PY_FAST_LAUNCH=1
 PLATFORM=desktop
 ifeq ($(PLATFORM),os2007)
        LEGACY_GLADE=1
@@ -20,19 +22,20 @@ PRE_PACKAGE_PATH=./pkg-$(PLATFORM)
 PACKAGE_PATH=./deb-$(PLATFORM)
 BUILD_PATH=./build-$(PLATFORM)
 BUILD_BIN=$(BUILD_PATH)/gc_dialer.py
-DEB_PACKAGE=$(PACKAGE_PATH)/$(PROJECT_NAME)-0.7.2-$(PLATFORM).deb
+DEB_PACKAGE=$(PACKAGE_PATH)/$(PROJECT_NAME)-$(PROJECT_VERSION)_$(PLATFORM).deb
 
 DEBUGGER=winpdb
 UNIT_TEST=nosetests -w $(TEST_PATH)
 STYLE_TEST=../../Python/tools/pep8.py --ignore=W191
-LINT=pylint --rcfile=./support/pylint.rc
+LINT_RC=./support/pylint.rc
+LINT=pylint --rcfile=$(LINT_RC)
 COVERAGE_TEST=figleaf
 PROFILER=pyprofiler
 CTAGS=ctags-exuberant
 
-.PHONY: all run debug test lint tags build pre_package hand_package clean
+.PHONY: all run debug test lint tags build package clean
 
-all: test tags hand_package
+all: test package
 
 run: $(SOURCE)
        cd $(SOURCE_PATH) ; ./gc_dialer.py
@@ -57,20 +60,25 @@ lint: $(LINT_STATS)
 
 tags: $(TAG_FILE) 
 
-build: $(BUILD_BIN)
+build: $(BUILD_PATH)
+
+package: $(DEB_PACKAGE)
+
+$(BUILD_PATH): $(BUILD_BIN)
        mkdir -p $(BUILD_PATH)
 
        cp $(SOURCE_PATH)/gc_dialer_256.png $(BUILD_PATH)
        cp $(SOURCE_PATH)/gc_dialer_64.png $(BUILD_PATH)
        cp $(SOURCE_PATH)/gc_dialer_26.png $(BUILD_PATH)
 
-       cp $(SOURCE_PATH)/gc_contact.png $(BUILD_PATH)
-
        cp $(SOURCE_PATH)/gc_dialer.desktop $(BUILD_PATH)
 
        cp $(SOURCE_PATH)/gc_dialer.glade $(BUILD_PATH)
+ifneq ($(PLATFORM),desktop)
+       sed -i 's/^[ \t]*//;s/GtkWindow/HildonWindow/' $(BUILD_PATH)/gc_dialer.glade
+endif
 
-pre_package: build
+$(PRE_PACKAGE_PATH): $(BUILD_PATH)
        mkdir -p $(PRE_PACKAGE_PATH)/build/usr/share/icons/hicolor/scalable/hildon
        mkdir -p $(PRE_PACKAGE_PATH)/build/usr/share/icons/hicolor/26x26/hildon
        mkdir -p $(PRE_PACKAGE_PATH)/build/usr/share/icons/hicolor/64x64/hildon
@@ -82,26 +90,24 @@ pre_package: build
        cp $(BUILD_PATH)/gc_dialer_64.png $(PRE_PACKAGE_PATH)/build/usr/share/icons/hicolor/64x64/hildon/gc_dialer.png
        cp $(BUILD_PATH)/gc_dialer_26.png $(PRE_PACKAGE_PATH)/build/usr/share/icons/hicolor/26x26/hildon/gc_dialer.png
 
-       cp $(BUILD_PATH)/gc_contact.png $(PRE_PACKAGE_PATH)/build/usr/share/icons/hicolor/scalable/hildon/gc_contact.png
-
        cp $(BUILD_PATH)/gc_dialer.desktop $(PRE_PACKAGE_PATH)/build/usr/share/applications/hildon
 
        cp $(BUILD_PATH)/gc_dialer.glade $(PRE_PACKAGE_PATH)/build/usr/local/lib
-ifneq ($(PLATFORM),desktop)
-       sed -i 's/^[ \t]*//;s/GtkWindow/HildonWindow/' $(PRE_PACKAGE_PATH)/build/usr/local/lib/gc_dialer.glade
-endif
 
        cp $(BUILD_BIN) $(PRE_PACKAGE_PATH)/build/usr/local/bin
 
        cp $(PYPACKAGE_FILE) $(PRE_PACKAGE_PATH)
        cp -R $(DEB_METADATA) $(PRE_PACKAGE_PATH)/build/
 ifeq ($(PLATFORM),desktop)
-       sed -i 's/, python2.5-hildon//' $(PRE_PACKAGE_PATH)/build/DEBIAN/control
+       #sed -i 's/, python2.5-hildon//' $(PRE_PACKAGE_PATH)/build/DEBIAN/control
 endif
+       sed -i 's/Version: 0.0.0/Version: $(PROJECT_VERSION)/' $(PRE_PACKAGE_PATH)/build/DEBIAN/control
+       #Autoguess install size
+       #du -hs pkg-desktop/build/ | sed 's/K *.*//'
+       sed -i 's/Installed-Size: 0/Installed-Size: 196/' $(PRE_PACKAGE_PATH)/build/DEBIAN/control
+       cp LICENSE $(PRE_PACKAGE_PATH)/build/DEBIAN/copyright
 
-hand_package: $(DEB_PACKAGE)
-
-$(DEB_PACKAGE): pre_package
+$(DEB_PACKAGE): $(PRE_PACKAGE_PATH)
        mkdir -p $(PACKAGE_PATH)
        dpkg-deb -b $(PRE_PACKAGE_PATH)/build/ $(DEB_PACKAGE)
 
@@ -115,17 +121,21 @@ $(BUILD_BIN): $(SOURCE)
        mkdir -p $(dir $(BUILD_BIN))
 
        #Construct the program by cat-ing all the python files together
+ifeq ($(PY_FAST_LAUNCH),1)
+       echo "#!/usr/bin/python" > $(BUILD_BIN)
+else
        echo "#!/usr/bin/python2.5" > $(BUILD_BIN)
+endif
        #echo "from __future__ import with_statement" >> $(PRE_PACKAGE_PATH)/usr/local/bin/gc_dialer.py
-       cat $(SOURCE_PATH)/gc_dialer.py $(SOURCE_PATH)/gcbackend.py $(SOURCE_PATH)/browser_emu.py | grep -e '^import ' | sort -u >> $(BUILD_BIN)
-       cat $(SOURCE_PATH)/browser_emu.py $(SOURCE_PATH)/gcbackend.py $(SOURCE_PATH)/gc_dialer.py | grep -v 'browser_emu' | grep -v 'gcbackend' | grep -v "#!" >> $(BUILD_BIN)
+       cat $(SOURCE_PATH)/gc_dialer.py $(SOURCE_PATH)/evo_backend.py $(SOURCE_PATH)/gc_backend.py $(SOURCE_PATH)/browser_emu.py | grep -e '^import ' | sort -u >> $(BUILD_BIN)
+       cat $(SOURCE_PATH)/browser_emu.py $(SOURCE_PATH)/evo_backend.py $(SOURCE_PATH)/gc_backend.py $(SOURCE_PATH)/gc_dialer.py | grep -v 'browser_emu' | grep -v 'gc_backend' | grep -v "evo_backend"| grep -v "#!" >> $(BUILD_BIN)
        chmod 755 $(BUILD_BIN)
 
 $(TAG_FILE): $(SOURCE)
        mkdir -p $(dir $(TAG_FILE))
        $(CTAGS) -o $(TAG_FILE) $(SOURCE)
 
-%1.stats: $(SOURCE)
+%1.stats: $(SOURCE) $(LINT_RC)
        @ #DESIRED DEPENDENCY: $(subst .,/,$(notdir $*)).py
        @ #DESIRED COMMAND: $(LINT) $<
        @ $(LINT) $(subst .,/,$(notdir $*)).py