Windows build installation steps in installer.bat script file.

diff --git a/win32/README b/win32/README
deleted file mode 100644 (file)
index 1094268..0000000
--- a/win32/README
+++ /dev/null
@@ -1,13 +0,0 @@
-Files of this directory are probably not needed anymore (just use the regular makefile),
-but are left as reference for the old compile method on Windows ;)
-
-However the installer directory is used for the named purpose.
-Instructions on how to use the installer will follow in due course (probably on the Wiki first).
-
-----
-If your GTK path isn't c:\gtk and/or your mingw path isn't c:\mingw, you will have to edit the scripts to compile.
-Then run
-
-setpath
-makeall
-link

diff --git a/win32/README.txt b/win32/README.txt
new file mode 100644 (file)
index 0000000..542aa59
--- /dev/null
+++ b/win32/README.txt
@@ -0,0 +1,13 @@
+\r
+The build under Windows follows the same process as the traditional Linux build:\r
+\r
+    cd ../src\r
+    sh configure <options>\r
+    make\r
+\r
+There is a separate installer method using NSIS to generate the viking-1.X.Y.Z.exe installer file.\r
+\r
+To generate the installer (once the code has been compiled as above) run the installer.bat\r
+\r
+For further details (especially about how to set up the development dependencies) see:\r
+http://sourceforge.net/apps/mediawiki/viking/index.php?title=WindowsBuildInstructions\r

diff --git a/win32/installer.bat b/win32/installer.bat
new file mode 100644 (file)
index 0000000..06a26c0
--- /dev/null
+++ b/win32/installer.bat
@@ -0,0 +1,44 @@
+@echo OFF\r
+echo STARTING INSTALLER PROCESS...\r
+\r
+echo Create Icon\r
+pushd installer\pixmaps\r
+windres.exe viking_icon.rc -o viking_icon.o\r
+popd\r
+\r
+echo Remove debugging symbols\r
+pushd ..\src\r
+strip.exe -g viking.exe\r
+popd\r
+\r
+set MYCOPY=copy /y\r
+set DESTINATION=installer\bin\r
+echo Copying locale files into layout required by NSIS\r
+dir ..\po\*.gmo /B > gmolist.txt\r
+:: Create directories like de\LC_MESSAGES\r
+for /f %%i in (gmolist.txt) do mkdir %DESTINATION%\%~ni\LC_MESSAGES\r
+for /f %%i in (gmolist.txt) do %MYCOPY% ..\po\%%i %DESTINATION%\%~ni\LC_MESSAGES\viking.mo\r
+del gmolist.txt\r
+\r
+echo Copying other stuff\r
+%MYCOPY% ..\src\viking.exe %DESTINATION%\r
+%MYCOPY% installer\pixmaps\viking_icon.ico %DESTINATION%\r
+%MYCOPY% ..\COPYING %DESTINATION%\COPYING_GPL.txt\r
+::\r
+:: It is assumed you've tested the code after building it :)\r
+::  Thus GPSBabel should be here\r
+%MYCOPY% ..\src\gpsbabel.exe %DESTINATION%\r
+:: Otherwise install it from http://www.gpsbabel.org/download.html\r
+::  (or get it from an old Viking Windows release)\r
+::  and copy the command line program into ..\src\r
+::\r
+%MYCOPY% C:\MinGW\bin\libcurl.dll %DESTINATION%\r
+%MYCOPY% C:\MinGW\bin\libexif-12.dll %DESTINATION%\r
+::\r
+%MYCOPY% installer\translations\*nsh %DESTINATION%\r
+\r
+echo Run NSIS\r
+pushd installer\r
+"C:\Program Files\NSIS\makensisw.exe" viking-installer.nsi\r
+popd\r
+\r

diff --git a/win32/installer/pixmaps/viking_icon.rc b/win32/installer/pixmaps/viking_icon.rc
new file mode 100644 (file)
index 0000000..e45f1ea
--- /dev/null
+++ b/win32/installer/pixmaps/viking_icon.rc
@@ -0,0 +1 @@
+100 ICON "viking_icon.ico"\r

diff --git a/win32/link.bat b/win32/link.bat
deleted file mode 100644 (file)
index e11f3af..0000000
--- a/win32/link.bat
+++ /dev/null
@@ -1 +0,0 @@
-gcc -o viking.exe *.o -Lc:\gtk\lib -lgtk-win32-2.0 -lgdk-win32-2.0 -lglib-2.0 -lgobject-2.0 -lgdk_pixbuf-2.0 -lgmodule-2.0 -ljpeg -lwsock32

diff --git a/win32/make.bat b/win32/make.bat
deleted file mode 100644 (file)
index 7b099d7..0000000
--- a/win32/make.bat
+++ /dev/null
@@ -1 +0,0 @@
-gcc -mms-bitfields -DWINDOWS -Ic:\gtk\include\pango-1.0 -Ic:\gtk\lib\gtk-2.0\include -Ic:\gtk\include\atk-1.0 -Ic:\gtk\include -Ic:\gtk\include\gtk-2.0 -Ic:\gtk\include\glib-2.0 -Ic:\gtk\lib\glib-2.0\include -c ..\%1

diff --git a/win32/makeall.bat b/win32/makeall.bat
deleted file mode 100644 (file)
index 1db7c6d..0000000
--- a/win32/makeall.bat
+++ /dev/null
@@ -1,33 +0,0 @@
-call make background.c
-call make clipboard.c
-call make coords.c
-call make dialog.c
-call make expedia.c
-call make file.c
-call make gpsmapper.c
-call make gpspoint.c
-call make gtkcellrendererprogress.c
-call make gtkcolorbutton.c
-call make http.c
-call make main.c
-call make mapcache.c
-call make terraserver.c
-call make thumbnails.c
-call make vikaggregatelayer.c
-call make vikcoord.c
-call make vikcoordlayer.c
-call make vikfileentry.c
-call make vikgeoreflayer.c
-call make viklayer.c
-call make viklayerspanel.c
-call make vikmapslayer.c
-call make vikradiogroup.c
-call make vikstatus.c
-call make viktrack.c
-call make viktreeview.c
-call make viktrwlayer.c
-call make viktrwlayer_propwin.c
-call make viktrwlayer_tpwin.c
-call make vikviewport.c
-call make vikwaypoint.c
-call make vikwindow.c

diff --git a/win32/setpath.bat b/win32/setpath.bat
deleted file mode 100644 (file)
index 146febf..0000000
--- a/win32/setpath.bat
+++ /dev/null
@@ -1 +0,0 @@
-path=%path%;c:\gtk\lib;c:\gtk\bin;c:\mingw\bin