streamlined the build process

We now can submit the same .changes/.dsc/.tgz files to the autobuilder
for Fremantle and Diablo.
I changed debian/optify to 'auto', so now the auto-builder will
automatically 'optify' the package in fremantle, and leave it alone
in diablo.
I also commented out the py_compilefiles part (for now), since the diablo
auto-builder doesn't like it.

diff --git a/package/Makefile b/package/Makefile
index 324db6a..7fa13ea 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -10,30 +10,14 @@ PKG_VER='9'
 compile:
        perl -ni -e 'print; exit if /^XB-Maemo-Icon-26:$$/' debian/control
        uuencode -m share/mevemon-48.png - | perl -ne 'print " $$_" unless $$. == 1 or /^====$$/' >>debian/control
-       py_compilefiles src/* src/eveapi/* src/ui/* src/ui/*/*
+       # this causes the build to fail in diablo auto-builder, so comment it out for now
+       #py_compilefiles src/* src/eveapi/* src/ui/* src/ui/*/*
 
 
-install_fremantle:
-       mkdir -p ${DESTDIR}/opt/mevemon/ ${DESTDIR}/opt/mevemon/eveapi ${DESTDIR}/opt/mevemon/ui \
-       ${DESTDIR}/opt/mevemon/ui/diablo ${DESTDIR}/opt/mevemon/ui/fremantle ${DESTDIR}/usr/bin \
-       ${DESTDIR}/opt/mevemon/imgs/
-       install -D -m 0644 -o root -g root src/*.py* ${DESTDIR}/opt/mevemon/
-       ln -s /opt/mevemon/mevemon.py ${DESTDIR}/usr/bin/mevemon
-       install -D -m 0644 -o root -g root src/eveapi/*.py* ${DESTDIR}/opt/mevemon/eveapi/
-       install -m 0644 -o root -g root src/imgs/*.jpg ${DESTDIR}/opt/mevemon/imgs/
-       install -m 0644 -o root -g root src/ui/*.py*  ${DESTDIR}/opt/mevemon/ui/
-       install -D -m 0644 -o root -g root src/ui/fremantle/*.py*  ${DESTDIR}/opt/mevemon/ui/fremantle/
-       install -D -m 0644 -o root -g root src/ui/diablo/*.py*  ${DESTDIR}/opt/mevemon/ui/diablo/
-       install -D -m 0644 -o root -g root share/mevemon-64.png \
-       ${DESTDIR}/usr/share/icons/hicolor/scalable/hildon/mevemon.png
-       install -D -m 0644 -o root -g root share/mevemon-48.png \
-       ${DESTDIR}/usr/share/icons/hicolor/48x48/hildon/mevemon.png
-       install -D -m 0644 -o root -g root share/mevemon.desktop \
-       ${DESTDIR}/usr/share/applications/hildon/mevemon.desktop
-       chmod 755 ${DESTDIR}/opt/mevemon/mevemon.py
-       chmod 755 ${DESTDIR}/usr/bin/mevemon
-
-install_diablo:
+install:
+       # the paths can be the same for both diablo and fremantle, since the Extras
+       # auto-builder will 'optify' the fremantle package for us
+       # 
        mkdir -p ${DESTDIR}/usr/share/mevemon/ ${DESTDIR}/usr/share/mevemon/eveapi \
        ${DESTDIR}/usr/share/mevemon/ui ${DESTDIR}/usr/share/mevemon/ui/diablo \
        ${DESTDIR}/usr/share/mevemon/ui/fremantle ${DESTDIR}/usr/bin ${DESTDIR}/usr/share/mevemon/imgs/
@@ -63,20 +47,11 @@ clean:
        rm -rf debian/mevemon
        find . -name *~ -exec rm -f {} \;       
 
-package_fremantle:
+package:
        # modify debian/changelog to show current version, and then
-       # modify debian/rules build option to call 'make install_fremantle'
-       # There's got to be a  better way...
-       # 
-       sed -i 's:mevemon (.*):mevemon (${MAJOR_VER}.${MINOR_VER}-fremantle${PKG_VER}):g' debian/changelog      
-       sed -i 's:$${MAKE} DESTDIR=$${CURDIR}/debian/mevemon.*:$${MAKE} DESTDIR=$${CURDIR}/debian/mevemon install_fremantle:g' debian/rules
+       # NOTE: if you want to use the deb in fremantle, then run maemo-optify-deb on the package
+       #               first.
+       #               This is done automatically by the Extras auto-builder 
+       sed -i 's:mevemon (.*):mevemon (${MAJOR_VER}.${MINOR_VER}-${PKG_VER}):g' debian/changelog       
        dpkg-buildpackage -rfakeroot -uc -us
 
-package_diablo:
-       # modify debian/changelog to show current version, and then
-       # modify debian/rules build option to call 'make install_fremantle'
-       # There's got to be a  better way...
-       #
-       sed -i 's:mevemon (.*):mevemon (${MAJOR_VER}.${MINOR_VER}-diablo${PKG_VER}):g' debian/changelog 
-       sed -i 's:$${MAKE} DESTDIR=$${CURDIR}/debian/mevemon.*:$${MAKE} DESTDIR=$${CURDIR}/debian/mevemon install_diablo:g' debian/rules
-       dpkg-buildpackage -rfakeroot -uc -us

diff --git a/package/debian/optify b/package/debian/optify
index c86c3f3..865faf1 100644 (file)
--- a/package/debian/optify
+++ b/package/debian/optify
@@ -1 +1 @@
-none
\ No newline at end of file
+auto

diff --git a/package/debian/rules b/package/debian/rules
index 110b586..daed7a5 100755 (executable)
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -48,7 +48,7 @@ install: build
        dh_testroot
        dh_clean -k
        dh_installdirs
-       ${MAKE} DESTDIR=${CURDIR}/debian/mevemon install_fremantle
+       ${MAKE} DESTDIR=${CURDIR}/debian/mevemon install
 
 # Build architecture-independent files here.
 binary-indep: build install