Cleanup, removed /gnuwin32 directory

4 files changed, 135 insertions, 6 deletions

diff --git a/Makefile.mingw b/Makefile.mingw
new file mode 100644
index 0000000..8dd05ad
--- /dev/null
+++ b/Makefile.mingw
@@ -0,0 +1,134 @@
+# Makefile.mingw
+#
+# Author: Bruno Coudoin (from GAIM example)
+# Description: Top Makefile for win32 (mingw) port of GCompris
+#
+
+VERSION = "8.3.12"
+
+pkgdatadir = gcompris
+
+GCOMPRIS_SRC = ./src/gcompris
+GCOMPRIS_BOARDS = ./src/boards
+GCOMPRIS_INSTALL_DIR = ./win32-install-dir
+
+include global_win32.mak
+
+MAKENSIS := "/c/Program Files/NSIS/makensis.exe"
+
+# These will be copied in the win32-install-dir ready to be packaged.
+NEEDED_DLLS =		$(GNUCAP_TOP)/src/MSW/gnucap.exe \
+			$(GNUCHESS_TOP)/bin/gnuchess.exe \
+			$(GNUCHESS_TOP)/bin/libreadline.dll \
+	    		$(GNUCHESS_TOP)/bin/pthreadGC2.dll \
+			$(GTK_TOP)/bin/freetype6.dll \
+			$(GTK_TOP)/bin/gspawn-win32-helper.exe \
+			$(GTK_TOP)/bin/iconv.dll \
+			$(GTK_TOP)/bin/intl.dll \
+			$(GTK_TOP)/bin/libexpat.dll \
+			$(GTK_TOP)/bin/jpeg62.dll \
+			$(GTK_TOP)/bin/libatk-1.0-0.dll \
+			$(GTK_TOP)/bin/libcairo-2.dll \
+			$(GTK_TOP)/bin/libfontconfig-1.dll \
+			$(GTK_TOP)/bin/libgdk-win32-2.0-0.dll \
+			$(GTK_TOP)/bin/libgdk_pixbuf-2.0-0.dll \
+			$(GTK_TOP)/bin/libglib-2.0-0.dll \
+			$(GTK_TOP)/bin/libgmodule-2.0-0.dll \
+			$(GTK_TOP)/bin/libgobject-2.0-0.dll \
+			$(GTK_TOP)/bin/libgthread-2.0-0.dll \
+			$(GTK_TOP)/bin/libgtk-win32-2.0-0.dll \
+			$(GTK_TOP)/bin/libpango-1.0-0.dll \
+			$(GTK_TOP)/bin/libpangocairo-1.0-0.dll \
+			$(GTK_TOP)/bin/libpangoft2-1.0-0.dll \
+			$(GTK_TOP)/bin/libpangowin32-1.0-0.dll \
+			$(GTK_TOP)/bin/libpng13.dll \
+			$(GTK_TOP)/bin/zlib1.dll \
+			$(LIBXML2_TOP)/bin/libxml2.dll \
+			$(PYTHON_TOP)/python24.dll \
+			$(SDL_TOP)/bin/SDL.dll \
+			$(SDL_TOP)/bin/SDL_mixer.dll \
+			$(SQLITE_TOP)/sqlite3.dll \
+			/c/WINDOWS/system32/msvcr71.dll
+
+NEEDED_FILES =		README \
+	     		README.mingw \
+			COPYING \
+			Changelog
+
+##
+##
+
+all:
+	cp config.h.mingw config.h
+	$(MAKE) -C ./src/libart_lgpl -f Makefile.mingw
+	$(MAKE) -C ./src/libgnomecanvas -f Makefile.mingw
+	$(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw
+	$(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw
+
+
+install: all
+	mkdir -p $(GCOMPRIS_INSTALL_DIR)/share
+	$(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw install
+	$(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw install
+	cp -r $(GCOMPRIS_BOARDS)/python $(GCOMPRIS_INSTALL_DIR)/share/gcompris
+	rm -f $(GCOMPRIS_INSTALL_DIR)/share/gcompris/python/Makefile*
+	rm -f $(GCOMPRIS_INSTALL_DIR)/share/gcompris/python/gcompris/Makefile*
+	rm -f $(GCOMPRIS_INSTALL_DIR)/share/gcompris/python/admin/Makefile*
+	cp -r $(GCOMPRIS_BOARDS)/python $(GCOMPRIS_INSTALL_DIR)/share/gcompris
+	rm -f $(GCOMPRIS_INSTALL_DIR)/share/gcompris/python/Makefile*
+	rm -f $(GCOMPRIS_INSTALL_DIR)/share/gcompris/python/gcompris/Makefile*
+	rm -f $(GCOMPRIS_INSTALL_DIR)/share/gcompris/python/admin/Makefile*
+
+
+# Copy mandratory files for the package in the package directory
+prepack:
+	mkdir -p $(GCOMPRIS_INSTALL_DIR)/GTK
+	cp $(NEEDED_DLLS) $(GCOMPRIS_INSTALL_DIR)
+	cp $(NEEDED_FILES) $(GCOMPRIS_INSTALL_DIR)
+	cp -r $(GTK_TOP)/etc $(GCOMPRIS_INSTALL_DIR)
+	mkdir -p $(GCOMPRIS_INSTALL_DIR)/GTK/share
+	cp -r $(GTK_TOP)/share/themes $(GCOMPRIS_INSTALL_DIR)/share
+	mkdir -p $(GCOMPRIS_INSTALL_DIR)/lib
+	cp -r $(GTK_TOP)/lib/locale $(GCOMPRIS_INSTALL_DIR)/lib
+	cp -r $(GTK_TOP)/lib/gtk-2.0 $(GCOMPRIS_INSTALL_DIR)/lib
+
+python:
+	cp $(PYTHON_TOP)/DLLs/tcl84.dll $(GCOMPRIS_INSTALL_DIR)
+	cp $(PYTHON_TOP)/DLLs/tk84.dll $(GCOMPRIS_INSTALL_DIR)
+	cp tools/py2exe/gcompris.py $(GCOMPRIS_INSTALL_DIR)
+	cp tools/py2exe/setup.py $(GCOMPRIS_INSTALL_DIR)
+	cd $(GCOMPRIS_INSTALL_DIR);$(PYTHON_TOP)/python.exe setup.py py2exe;cp dist/library.zip python24.zip;cp dist/*.pyd .;rm -rf dist build;rm -f gcompris.py*;cd ..
+	rm -f $(GCOMPRIS_INSTALL_DIR)/tcl84.dll
+	rm -f $(GCOMPRIS_INSTALL_DIR)/tk84.dll
+
+installer:
+	$(MAKENSIS) gcompris-installer.nsi
+
+clean:
+	$(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw clean
+	$(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw clean
+	rm -rf config.h
+	rm -rf gcompris*.exe
+
+#
+# Run this on Linux to prepare datadir for windows
+#
+prep:
+	mkdir $(GCOMPRIS_INSTALL_DIR)
+
+	mkdir -p $(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards
+	cd boards ; tar cf -  --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude .svn --exclude .xvpics * | ( cd ../$(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards ; tar xf -) ; cd .. ;
+	@echo "-------------------------------------------------------------------------------"
+	@echo " WARNING: MAKE SURE TO HAVE RUN A MAKE INSTALL OF GCOMPRIS IN /USR/LOCAL FIRST"
+	@echo "-------------------------------------------------------------------------------"
+	mkdir -p $(GCOMPRIS_INSTALL_DIR)/share/locale
+	cp -r /usr/local/share/locale/* $(GCOMPRIS_INSTALL_DIR)/share/locale/
+	@echo "Remove other .mo file not from gcompris"
+	find ./win32-install-dir/share/locale/ -name \*.mo | grep -v gcompris.mo | xargs rm -f
+	@echo "Copy pixmap"
+	mkdir $(GCOMPRIS_INSTALL_DIR)/share/pixmaps
+	cp gcompris.png $(GCOMPRIS_INSTALL_DIR)/share/pixmaps
+	@echo remove tuxpaint activity
+	rm -f $(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards/tuxpaint.xml
+	@echo "Create the file gcompris-win-prepack.tar.gz"
+	tar --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude .svn --exclude .xvpics -czf gcompris-win-prepack.tar.gz win32-install-dir nsis tools Makefile.mingw config.h.mingw
diff --git a/global_win32.mak b/global_win32.mak
index 4defcff..d2b6938 100644
--- a/global_win32.mak
+++ b/global_win32.mak
@@ -22,11 +22,10 @@ DLL_LD_FLAGS += -Wl,--enable-auto-image-base
 
 DEFINES += 	-DHAVE_CONFIG_H
 
-LOCAL_PREFIX:=
+LOCAL_PREFIX:=/home/bruno/Projets/gcompris/windows
 GTK_TOP :=		$(LOCAL_PREFIX)/gtk
 GLIB_TOP :=		$(LOCAL_PREFIX)/gtk
 CAIRO_TOP :=		$(LOCAL_PREFIX)/gtk
-GNUWIN32_TOP :=		$(LOCAL_PREFIX)/gnuwin32
 LIBXML2_TOP :=		$(LOCAL_PREFIX)/libxml2
 SDL_TOP :=		$(LOCAL_PREFIX)/sdl
 GNUCHESS_TOP :=		$(LOCAL_PREFIX)/gnuchess
diff --git a/src/boards/Makefile.mingw b/src/boards/Makefile.mingw
index 9267936..44d18de 100644
--- a/src/boards/Makefile.mingw
+++ b/src/boards/Makefile.mingw
@@ -49,7 +49,6 @@ INCLUDE_PATHS +=	-I$(GCOMPRIS_PLUGINS) \
 			-I$(LIBART_TOP) \
 			-I$(GTK_TOP)/include/freetype2 \
 			-I$(LIBXML2_TOP)/include \
-			-I$(GNUWIN32_TOP)/include \
 			-I$(GCOMPRIS_TOP) \
 			-I$(GCOMPRIS_TOP)/src \
 			-I$(CAIRO_TOP)/include/cairo \
@@ -61,7 +60,6 @@ INCLUDE_PATHS +=	-I$(GCOMPRIS_PLUGINS) \
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
 			-L$(LIBXML2_TOP)/lib \
-			-L$(GNUWIN32_TOP)/lib \
 			-L$(SDL_TOP)/lib \
 			-L$(GCOMPRIS_TOP)/src/gcompris \
 			-L$(PYTHON_TOP)/lib
diff --git a/src/gcompris/Makefile.mingw b/src/gcompris/Makefile.mingw
index 70ad7a8..b21ebda 100644
--- a/src/gcompris/Makefile.mingw
+++ b/src/gcompris/Makefile.mingw
@@ -56,7 +56,6 @@ INCLUDE_PATHS +=	-I$(INCLUDE_DIR) \
 			-I$(GTK_TOP)/include/freetype2 \
 			-I$(SDL_TOP)/include/SDL \
 			-I$(LIBXML2_TOP)/include \
-			-I$(GNUWIN32_TOP)/include \
 			-I$(CAIRO_TOP)/include/cairo \
 			-I$(SQLITE_TOP) \
 			-I$(GCOMPRIS_TOP) \
@@ -66,7 +65,6 @@ INCLUDE_PATHS +=	-I$(INCLUDE_DIR) \
 LIB_PATHS =		-L$(GTK_TOP)/lib \
 	  		-L$(GLIB_TOP)/lib \
 			-L$(LIBXML2_TOP)/lib \
-			-L$(GNUWIN32_TOP)/lib \
 			-L$(SDL_TOP)/lib \
 			-L$(CANVAS_TOP) \
 			-L$(PYTHON_TOP)/libs \