Better version handling when building ipk packages

10 files changed, 17 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index ec2277e..77def29 100644
--- a/Makefile
+++ b/Makefile
@@ -162,55 +162,58 @@ variable_test: variable_info
         @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
   else
           ifndef SHARPDTMSDK
         @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
         $(error SHARPDTMSDK is not defined)
           endif
   endif
   ifdef BUILD_NO_GAMMU
         @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
   endif
         @echo --------------------------------------
 
 
 objects:
         for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
         for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
         mkdir -p libical/lib/$(PLATFORM)
 
 clean:
         rm -rf libical/lib/$(PLATFORM)/*;
         for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
           rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
           done 
 install:
+    ifdef KDEPIM_VERSION
         cd bin/kdepim; make install
         cp -r Pim $(QPEDIR)/apps
         cp db2file/db2file $(QPEDIR)/bin/db2file
         cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
         cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
         cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
-
+    else
+    @echo KDEPIM_VERSION not set.Cannot build ipk packages if version is missing.
+    endif
 dist:
         @echo Dont forget to do "make install" before "make dist"
         rm -f *arm.ipk
         rm -f *~
         cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
         ./mkipks kmicrokdelibs.control
         ./mkipks korganizer.control
         ./mkipks kaddressbook.control
   ifndef BUILD_NO_MICROMAIL
         ./mkipks kopiemail.control
   endif
         ./mkipks korganizer-alarm.control
   ifndef BUILD_NO_GAMMU
         ./mkipks kammu.control
   endif
         ./mkipks pim_TAB_icon.control
 
 tmake: objects \
        qtcompat/Makefile$(PLATFORM) \
        microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) \
        korganizer/Makefile$(PLATFORM) \
        kalarmd/Makefile$(PLATFORM) \
diff --git a/Makefile.Embedded b/Makefile.Embedded
index ec2277e..77def29 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -162,55 +162,58 @@ variable_test: variable_info
         @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
   else
           ifndef SHARPDTMSDK
         @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
         $(error SHARPDTMSDK is not defined)
           endif
   endif
   ifdef BUILD_NO_GAMMU
         @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
   endif
         @echo --------------------------------------
 
 
 objects:
         for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
         for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
         mkdir -p libical/lib/$(PLATFORM)
 
 clean:
         rm -rf libical/lib/$(PLATFORM)/*;
         for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
           rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
           done 
 install:
+    ifdef KDEPIM_VERSION
         cd bin/kdepim; make install
         cp -r Pim $(QPEDIR)/apps
         cp db2file/db2file $(QPEDIR)/bin/db2file
         cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
         cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
         cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
-
+    else
+    @echo KDEPIM_VERSION not set.Cannot build ipk packages if version is missing.
+    endif
 dist:
         @echo Dont forget to do "make install" before "make dist"
         rm -f *arm.ipk
         rm -f *~
         cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
         ./mkipks kmicrokdelibs.control
         ./mkipks korganizer.control
         ./mkipks kaddressbook.control
   ifndef BUILD_NO_MICROMAIL
         ./mkipks kopiemail.control
   endif
         ./mkipks korganizer-alarm.control
   ifndef BUILD_NO_GAMMU
         ./mkipks kammu.control
   endif
         ./mkipks pim_TAB_icon.control
 
 tmake: objects \
        qtcompat/Makefile$(PLATFORM) \
        microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) \
        korganizer/Makefile$(PLATFORM) \
        kalarmd/Makefile$(PLATFORM) \
diff --git a/kaddressbook.control b/kaddressbook.control
index 2e93f30..542ce1e 100644
--- a/kaddressbook.control
+++ b/kaddressbook.control
@@ -1,14 +1,14 @@
 Files: bin/kapi  apps/Pim/kaddressbook.desktop  pics/kdepim/kaddressbook/*  
 
 Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
-Version: 1.9.4
+Version: $KDEPIM_VERSION
 License: GPL
 Depends: 
 Description: KOrganizer/Pi and Kaddressbook/Pi
  The embedded version of KOrganizer/Platform-independend, 
     the KDE calendar and scheduling program
   optimized for 640x480 and 320x240 resolution
     on Zaurus PDA
diff --git a/kammu.control b/kammu.control
index db52c80..07559e7 100644
--- a/kammu.control
+++ b/kammu.control
@@ -1,11 +1,11 @@
 Files:  bin/kammu  lib/libkammu*
 
 Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
-Version: 1.9.4
+Version: $KDEPIM_VERSION
 License: GPL
 Depends: 
 Description: Special version of gammu / libgammu
     for Zaurus PDA and microkde
diff --git a/kmicrokdelibs.control b/kmicrokdelibs.control
index d894176..ef541a5 100644
--- a/kmicrokdelibs.control
+++ b/kmicrokdelibs.control
@@ -1,14 +1,14 @@
 Files:  bin/db2file lib/libmicro* pics/kdepim/LICENCE.TXT
 
 Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
-Version: 1.9.4
+Version: $KDEPIM_VERSION
 License: GPL
 Depends:
 Description: KOrganizer/Pi and Kaddressbook/Pi
  The embedded version of KOrganizer/Platform-independend, 
     the KDE calendar and scheduling program
   optimized for 640x480 and 320x240 resolution
     on Zaurus PDA
diff --git a/kopiemail.control b/kopiemail.control
index 52cf554..46a0235 100644
--- a/kopiemail.control
+++ b/kopiemail.control
@@ -1,14 +1,14 @@
 Files:  bin/ompi apps/Pim/kopiemail.desktop  pics/kdepim/kopiemail/*   lib/libkmicro*
 
 Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
-Version: 1.9.4
+Version: $KDEPIM_VERSION
 License: GPL
 Depends: 
 Description: KOrganizer/Pi and Kaddressbook/Pi
  The embedded version of KOrganizer/Platform-independend, 
     the KDE calendar and scheduling program
   optimized for 640x480 and 320x240 resolution
     on Zaurus PDA
diff --git a/korganizer-alarm.control b/korganizer-alarm.control
index b200ea9..68bc398 100644
--- a/korganizer-alarm.control
+++ b/korganizer-alarm.control
@@ -1,9 +1,9 @@
 Files: plugins/applets/libkopialarmapplet.* pics/ko16.png  pics/ko24.png 
 Priority: optional
 Section: qpe/applications
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
-Version: 1.9.4
+Version: $KDEPIM_VERSION
 License: GPL
 Description: KOrganizer/Pi Alarm Daemon
  The alarm daemon needed by KOrganizer/Platform-independend showing alarms.
diff --git a/korganizer.control b/korganizer.control
index ee2e1a3..f66381e 100644
--- a/korganizer.control
+++ b/korganizer.control
@@ -1,14 +1,14 @@
 Files: bin/kopi  apps/Pim/korganizer.desktop   pics/kdepim/korganizer/*  
 
 Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
-Version: 1.9.4
+Version: $KDEPIM_VERSION
 License: GPL
 Depends: 
 Description: KOrganizer/Pi and Kaddressbook/Pi
  The embedded version of KOrganizer/Platform-independend, 
     the KDE calendar and scheduling program
   optimized for 640x480 and 320x240 resolution
     on Zaurus PDA
diff --git a/pim_TAB_icon.control b/pim_TAB_icon.control
index 3b3343b..25e99ea 100644
--- a/pim_TAB_icon.control
+++ b/pim_TAB_icon.control
@@ -1,11 +1,11 @@
 Files:  apps/Pim/.directory  pics/ko24.png
 
 Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
-Version: 1.9.4
+Version: $KDEPIM_VERSION
 License: GPL
 Depends: 
 Description: Icon for Pim TAB
     for Zaurus PDA and microkde
diff --git a/setZaurus b/setZaurus
index 4767716..2493ccb 100644
--- a/setZaurus
+++ b/setZaurus
@@ -1,18 +1,19 @@
 # copy this dir to /opt/Qtopia/examples/
 # Now this file should be in the path  /opt/Qtopia/examples/kdepim/setZaurus
 # add the following line to ~/.bashrc without leading #
 # alias cz='source /opt/Qtopia/examples/kdepim/setZaurus'
 # then type in terminal cz<return> to set the variables
 # for cross-compiling
 export QPEDIR=/opt/Qtopia/sharp
 export OPIEDIR=/kde_dev/opie
 #export BUILD_NO_OPIE_PLUGIN=1
 #export BUILD_NO_SHARP_PLUGIN=1
 #export BUILD_NO_GAMMU=1
 export QTDIR=/opt/Qtopia/sharp
 export PATH=$QTDIR/bin:/opt/Embedix/tools/bin:$PATH
 export TMAKEPATH=/opt/Qtopia/tmake/lib/qws/linux-sharp-g++
 export PLATFORM=zaurus
 export RELEASE_DEBUG=release
 export SHARPDTMSDK=/opt/dtm
-#export RELEASE_DEBUG=debug
\ No newline at end of file
+#export RELEASE_DEBUG=debug
+export KDEPIM_VERSION=1.9.4a
\ No newline at end of file