Trying to make building clearer

git-svn-id: file:///svnroot/gc-dialer/trunk@91 c39d3808-3fe2-4d86-a59f-b7f623ee9f21

diff --git a/GrandcentralDialer.pypackager b/GrandcentralDialer.pypackager
deleted file mode 100644 (file)
index 3bdcce0..0000000
--- a/GrandcentralDialer.pypackager
+++ /dev/null
@@ -1,25 +0,0 @@
-(S'Grandcentral_Dialer'
-S'0.6'
-S'user/Communication'
-S'all'
-S'Optional'
-S'Mark Bergman <bergman@mertech.com>'
-S'python2.5, python2.5-hildon, python2.5-gtk2'
-S'Python script that provides a telephone dial-pad in order to enter\nphone numbers to be dialed through Grandcentral.com.\n\nRequirements:\n\tan account with Grandcentral'
-S'/tmp/gc_dialer/build'
-S'/tmp/gc_dialer/gc_dialer_26.png'
-S'#!/bin/sh\n\ngtk-update-icon-cache -f /usr/share/icons/hicolor'
-S''
-S''
-S''
-S'0.6 "Daddy brain"\n\nNative login, UI updates, cleanup, and much more\n\n\n0.5\n\nAdded dialing history, changed UI.'
-S'extras'
-S'chinook'
-S'low'
-S'email@email.com'
-S''
-S'/tmp/gc_dialer/build'
-S'z2n'
-S'1'
-tp1
-.
\ No newline at end of file

diff --git a/Makefile b/Makefile
index 39c3ca9..669db40 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ SOURCE=$(SOURCE_PATH)/gc_dialer.py $(SOURCE_PATH)/gcbackend.py $(SOURCE_PATH)/br
 OBJ=$(SOURCE:.py=.pyc)
 TEST_PATH=./tests
 TAG_FILE=~/.ctags/$(PROJECT_NAME).tags
 OBJ=$(SOURCE:.py=.pyc)
 TEST_PATH=./tests
 TAG_FILE=~/.ctags/$(PROJECT_NAME).tags

+PYPACKAGE_FILE=./support/GrandcentralDialer.pypackager

 
 PLATFORM=desktop
 ifeq ($(PLATFORM),os2007)
 
 PLATFORM=desktop
 ifeq ($(PLATFORM),os2007)

@@ -46,22 +47,24 @@ build: $(BUILD_BIN)
        cp $(SOURCE_PATH)/gc_dialer.glade $(BUILD_PATH)
 
 package: build
        cp $(SOURCE_PATH)/gc_dialer.glade $(BUILD_PATH)
 
 package: build

-       mkdir -p $(PACKAGE_PATH)/usr/share/icons/hicolor/scalable/hildon
-       mkdir -p $(PACKAGE_PATH)/usr/share/icons/hicolor/26x26/hildon
-       mkdir -p $(PACKAGE_PATH)/usr/share/icons/hicolor/64x64/hildon
-       mkdir -p $(PACKAGE_PATH)/usr/share/applications/hildon
-       mkdir -p $(PACKAGE_PATH)/usr/local/lib
-       mkdir -p $(PACKAGE_PATH)/usr/local/bin
+       mkdir -p $(PACKAGE_PATH)/build/usr/share/icons/hicolor/scalable/hildon
+       mkdir -p $(PACKAGE_PATH)/build/usr/share/icons/hicolor/26x26/hildon
+       mkdir -p $(PACKAGE_PATH)/build/usr/share/icons/hicolor/64x64/hildon
+       mkdir -p $(PACKAGE_PATH)/build/usr/share/applications/hildon
+       mkdir -p $(PACKAGE_PATH)/build/usr/local/lib
+       mkdir -p $(PACKAGE_PATH)/build/usr/local/bin

 
 

-       cp $(BUILD_PATH)/gc_dialer_256.png $(PACKAGE_PATH)/usr/share/icons/hicolor/scalable/hildon/gc_dialer.png
-       cp $(BUILD_PATH)/gc_dialer_64.png $(PACKAGE_PATH)/usr/share/icons/hicolor/64x64/hildon/gc_dialer.png
-       cp $(BUILD_PATH)/gc_dialer_26.png $(PACKAGE_PATH)/usr/share/icons/hicolor/26x26/hildon/gc_dialer.png
+       cp $(BUILD_PATH)/gc_dialer_256.png $(PACKAGE_PATH)/build/usr/share/icons/hicolor/scalable/hildon/gc_dialer.png
+       cp $(BUILD_PATH)/gc_dialer_64.png $(PACKAGE_PATH)/build/usr/share/icons/hicolor/64x64/hildon/gc_dialer.png
+       cp $(BUILD_PATH)/gc_dialer_26.png $(PACKAGE_PATH)/build/usr/share/icons/hicolor/26x26/hildon/gc_dialer.png

 
 

-       cp $(BUILD_PATH)/gc_dialer.desktop $(PACKAGE_PATH)/usr/share/applications/hildon
+       cp $(BUILD_PATH)/gc_dialer.desktop $(PACKAGE_PATH)/build/usr/share/applications/hildon

 
 

-       cp $(BUILD_PATH)/gc_dialer.glade $(PACKAGE_PATH)/usr/local/lib
+       cp $(BUILD_PATH)/gc_dialer.glade $(PACKAGE_PATH)/build/usr/local/lib

        
        

-       cp $(BUILD_BIN) $(PACKAGE_PATH)/usr/local/bin
+       cp $(BUILD_BIN) $(PACKAGE_PATH)/build/usr/local/bin
+
+       cp $(PYPACKAGE_FILE) $(PACKAGE_PATH)

 
 clean:
        rm -Rf $(PACKAGE_PATH) $(BUILD_PATH)
 
 clean:
        rm -Rf $(PACKAGE_PATH) $(BUILD_PATH)

diff --git a/README b/README
index 2c1ecde..5b52c84 100644 (file)
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ Building a package
 ===================
 Run
        ./build_script.sh PLATFORM
 ===================
 Run
        ./build_script.sh PLATFORM

-which will create a "./build-PLATFORM/..." heirarchy.  Move this structure to somewhere on the tablet, then run pypackager. 
+which will create a "./pkg-PLATFORM/..." heirarchy.  Move this structure to somewhere on the tablet, then run pypackager. 

 
 Supported PLATFORMs include
        desktop
 
 Supported PLATFORMs include
        desktop

diff --git a/support/GrandcentralDialer.pypackager b/support/GrandcentralDialer.pypackager
new file mode 100644 (file)
index 0000000..3bdcce0
--- /dev/null
+++ b/support/GrandcentralDialer.pypackager
@@ -0,0 +1,25 @@
+(S'Grandcentral_Dialer'
+S'0.6'
+S'user/Communication'
+S'all'
+S'Optional'
+S'Mark Bergman <bergman@mertech.com>'
+S'python2.5, python2.5-hildon, python2.5-gtk2'
+S'Python script that provides a telephone dial-pad in order to enter\nphone numbers to be dialed through Grandcentral.com.\n\nRequirements:\n\tan account with Grandcentral'
+S'/tmp/gc_dialer/build'
+S'/tmp/gc_dialer/gc_dialer_26.png'
+S'#!/bin/sh\n\ngtk-update-icon-cache -f /usr/share/icons/hicolor'
+S''
+S''
+S''
+S'0.6 "Daddy brain"\n\nNative login, UI updates, cleanup, and much more\n\n\n0.5\n\nAdded dialing history, changed UI.'
+S'extras'
+S'chinook'
+S'low'
+S'email@email.com'
+S''
+S'/tmp/gc_dialer/build'
+S'z2n'
+S'1'
+tp1
+.
\ No newline at end of file