From 26edf4767fe09ce576f88fa1b9ca0017a62826d4 Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Wed, 30 Jan 2013 01:29:01 +0000 Subject: [PATCH 1/1] Windows build installation steps in installer.bat script file. --- win32/README | 13 -------- win32/README.txt | 13 ++++++++ win32/installer.bat | 44 ++++++++++++++++++++++++++ win32/installer/pixmaps/viking_icon.rc | 1 + win32/link.bat | 1 - win32/make.bat | 1 - win32/makeall.bat | 33 ------------------- win32/setpath.bat | 1 - 8 files changed, 58 insertions(+), 49 deletions(-) delete mode 100644 win32/README create mode 100644 win32/README.txt create mode 100644 win32/installer.bat create mode 100644 win32/installer/pixmaps/viking_icon.rc delete mode 100644 win32/link.bat delete mode 100644 win32/make.bat delete mode 100644 win32/makeall.bat delete mode 100644 win32/setpath.bat diff --git a/win32/README b/win32/README deleted file mode 100644 index 10942681..00000000 --- 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 index 00000000..542aa591 --- /dev/null +++ b/win32/README.txt @@ -0,0 +1,13 @@ + +The build under Windows follows the same process as the traditional Linux build: + + cd ../src + sh configure + make + +There is a separate installer method using NSIS to generate the viking-1.X.Y.Z.exe installer file. + +To generate the installer (once the code has been compiled as above) run the installer.bat + +For further details (especially about how to set up the development dependencies) see: +http://sourceforge.net/apps/mediawiki/viking/index.php?title=WindowsBuildInstructions diff --git a/win32/installer.bat b/win32/installer.bat new file mode 100644 index 00000000..06a26c03 --- /dev/null +++ b/win32/installer.bat @@ -0,0 +1,44 @@ +@echo OFF +echo STARTING INSTALLER PROCESS... + +echo Create Icon +pushd installer\pixmaps +windres.exe viking_icon.rc -o viking_icon.o +popd + +echo Remove debugging symbols +pushd ..\src +strip.exe -g viking.exe +popd + +set MYCOPY=copy /y +set DESTINATION=installer\bin +echo Copying locale files into layout required by NSIS +dir ..\po\*.gmo /B > gmolist.txt +:: Create directories like de\LC_MESSAGES +for /f %%i in (gmolist.txt) do mkdir %DESTINATION%\%~ni\LC_MESSAGES +for /f %%i in (gmolist.txt) do %MYCOPY% ..\po\%%i %DESTINATION%\%~ni\LC_MESSAGES\viking.mo +del gmolist.txt + +echo Copying other stuff +%MYCOPY% ..\src\viking.exe %DESTINATION% +%MYCOPY% installer\pixmaps\viking_icon.ico %DESTINATION% +%MYCOPY% ..\COPYING %DESTINATION%\COPYING_GPL.txt +:: +:: It is assumed you've tested the code after building it :) +:: Thus GPSBabel should be here +%MYCOPY% ..\src\gpsbabel.exe %DESTINATION% +:: Otherwise install it from http://www.gpsbabel.org/download.html +:: (or get it from an old Viking Windows release) +:: and copy the command line program into ..\src +:: +%MYCOPY% C:\MinGW\bin\libcurl.dll %DESTINATION% +%MYCOPY% C:\MinGW\bin\libexif-12.dll %DESTINATION% +:: +%MYCOPY% installer\translations\*nsh %DESTINATION% + +echo Run NSIS +pushd installer +"C:\Program Files\NSIS\makensisw.exe" viking-installer.nsi +popd + diff --git a/win32/installer/pixmaps/viking_icon.rc b/win32/installer/pixmaps/viking_icon.rc new file mode 100644 index 00000000..e45f1ea9 --- /dev/null +++ b/win32/installer/pixmaps/viking_icon.rc @@ -0,0 +1 @@ +100 ICON "viking_icon.ico" diff --git a/win32/link.bat b/win32/link.bat deleted file mode 100644 index e11f3aff..00000000 --- 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 index 7b099d78..00000000 --- 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 index 1db7c6db..00000000 --- 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 index 146febfe..00000000 --- a/win32/setpath.bat +++ /dev/null @@ -1 +0,0 @@ -path=%path%;c:\gtk\lib;c:\gtk\bin;c:\mingw\bin -- 2.39.5