From 757a7274c6976e1566f8c19f9b932a29b5b4c436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Sun, 4 Mar 2012 18:15:01 +0100
Subject: [PATCH] Work on Win32 packaging

---
 Makefile               |  1 -
 tools/package_win32.sh | 11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index e1c7415..50d2923 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,6 @@ MOCS=$(MOC_HEADERS:.hpp=.objs)
 MOCS_OBJS=$(MOC_HEADERS:.hpp=.moc)
 
 CXXFLAGS+=-Ilib/libkdchart/include -Ilib/libkdchart/src -Ilib/libkdchart/kdablibfakes/include
-CXXFLAGS+=-DKDCHART_BUILD_KDCHART_LIB
 KDCHART_SOURCES=$(shell find lib/libkdchart/src -name '*.cpp' -type f | tr '\n' ' ')
 KDCHART_OBJS=$(KDCHART_SOURCES:.cpp=.o)
 UI_CHARTSELECTOR=lib/libkdchart/src/ui_KDChartDatasetSelector.h
diff --git a/tools/package_win32.sh b/tools/package_win32.sh
index 2aba7d2..f61e0f5 100755
--- a/tools/package_win32.sh
+++ b/tools/package_win32.sh
@@ -2,9 +2,9 @@
 
 DATE=`date +%d.%m.%Y`
 [ -z "$ARCH" ] && ARCH=`${PREFIX}gcc -dumpmachine | cut -d- -f1`
-VERSION=`cat src/controller/KissCount.h | grep APP_VERSION | cut -d\" -f2`
+VERSION=`cat src/controller/KissCount.hpp | grep APP_VERSION | cut -d\" -f2`
 DIR="KissCount_build_${VERSION}_${DATE}_${ARCH}"
-FILE="$DIR.tar.bz2"
+FILE="$DIR.zip"
 
 rm -f "$FILE"
 rm -rf "$DIR"
@@ -13,9 +13,10 @@ make clean
 fi
 make || (echo "Compilation failed" ; exit 1)
 mkdir -p "$DIR"
-cp -r lib/freechart/lib/*.dll* lib/wxsqlite3-1.9.9/lib/*.dll* "$DIR"
-cp -r kc init.sql ressources tools/launch_kc.sh TODO CONTRIBUTORS COPYING README README.fr www "$DIR"
+cp -r lib/*.dll* "$DIR"
+cp -r kc ressources TODO CONTRIBUTORS COPYING README README.fr www "$DIR"
+mv "$DIR"/kc "$DIR"/kc.exe
 find "$DIR" -type f -executable -exec ${PREFIX}strip \{\} \;
-tar -jcf "$FILE" "$DIR"
+zip "$FILE" "$DIR"
 rm -rf "$DIR"
 echo "Packaged into $FILE !"
\ No newline at end of file