fix:windows:fix the windows build (#680)

* Update circle.yml

* Add:circleci:Upgrade linux build image to latest ubuntu LTS (#656)

* Fix:scripts:WinCE build script (remove sample map, add espeak-data) (#632)

* Fixing WinCE build script

Remove inclusion of sample map in zip package (which, in addition, fails currently because map server is down)
Allow running script twice by performing cleanup on directories if already created
Adding missing espeak-data to zip package (currently missing and makes navit speech synthesis fail on current WinCE builds)

* Adding xslt processor to build env

* Pre-filling <vehicle> tag for WinCE

* Refactoring:graphics Improving quality of circles on platforms without native circle method (#628)

* Improving quality of circles on platforms without native circle draw methods. Adding doxygen comments.

* Updating verbiage

* in circle_to_points(): renaming pnt to center and making in const

* update in-tree espeak to espeak-1.48.04 (#624)

* update in-tree espeak to espeak-1.48.04

Update the C-ified version of espeak to espeak-1.48.04.
Currently builds and links for Sailfish. Untested for
Windows builds yet.
Throws a lot of warnings still.

* Make private functions static in espeak.

Convert the obviously private functions to static in order to fix
warnings. There are a lot not so obvious left that are used in other
files by extern statement. Silly.

* correctly assign exported methods to headers

This asigns exported functions to headers avoiding missing prototypes
warning.

* move vars out of for loop as Sailfish disallows c99

Standard build under Sailfosh disallows c99 features. Therefore move
variables out of for loop declaration.

* espeak prepare for Windows build

* fix:speech:espeak Adapt to newer espeak version 1.48.04

* redo. removing the files from build was the false way

* Disable mbrola support as this fails on windows

* remove uneccesary posix calls on windows

* Add:build:Ignore gradle artifacts

Signed-off-by: mvglasow <michael -at- vonglasow.com>

* Add:build:Make gradlew executable

Signed-off-by: mvglasow <michael -at- vonglasow.com>

* Fix:build:Disable vehicle/gpsd on Android

Signed-off-by: mvglasow <michael -at- vonglasow.com>

* Fix:build:Disable map/garmin on Android

Signed-off-by: mvglasow <michael -at- vonglasow.com>

* Fix build on circleci for android

* Refactor:core:Minor documentation amendment

Signed-off-by: mvglasow <michael -at- vonglasow.com>

* Fix latlon2bookmark (#627)

* fix:latlon2bookmark:Fix to be able to compile latlon2bookmark

* fix:latlon2bookmark:Add Wall

* Fix Android apk VersionCode  (#633)

* Create git-scm-version.gradle

* Update build.gradle

* Update git-scm-version.gradle

* Update build.gradle

* Update git-scm-version.gradle

* Update git-scm-version.gradle

* Update git-scm-version.gradle

* Update git-scm-version.gradle

* Update git-scm-version.gradle

* Update git-scm-version.gradle

* Update git-scm-version.gradle

* chnage to get release tags

* Revert Fix because the docker image was fixed

* cleanup:maptool: use g_strcmp0 instead of strcmp (#434)

* Refactor:gui/internal: Add pointer and label when using function "view on map" (#631)

* Factorizing gui_internal_cmd_results_to_map() to also highlight points selected by command "View on map"

* Adding comments on displayed text for type_waypoint and type_route_end

* Adding comments

* Restoring zoom_to_rect in gui_internal_cmd_results_to_map()

* Making zoom_to_rect conditional, moving results_map preparation code to a dedicated function

* Moving "search_results" map preparation into a dedicated function

* Removing unused var

* Adding doxygen comments and disabling widget dealloc (causes segfault)

* Fixing segfault at next do_drawy() when adding pointer for view on map

* Reformatting labels to be displayed in a compact square area rather than all on a line

* Applying astyle to comply to ci_sanity_checks.sh

* Handling newlines in labels associated to element_circle

* Fixing hardcoded nblines

* Moving multi-line label processing to a dedicated function multiline_label_draw()

* Rework on arg naming to line-up with other simular functions. Minor update on doxygen comments

* Moving unsigned int sqrt calculation to utils

* Minor improvement of comment

* Fixing typo on comment

* Also applying size xslt processing to layer itemgra

This allows to also process the size of item_types="found_item", which is used by "View on map" and "Show results on map"

* cleanup:scripts:Fix condefactor complaints (#646)

* Curley distance poi (#638)

* 1) Changed the translation string for "Distance(m)" from "" to "Distance". Rational: the "m" is ambiguous, it could be meters or miles. However, in the POI context, feet are more likely than miles. So take it out entirely. I did it this way rather than run sed on the entire collection of po input files.

2) The display code sorts the entries by distance. It has no way of knowing if "5" is five miles or five feet. So we leave the distances in feet or meters (depending on the setting for imperial). Allowing kilometers or miles might be a future enhancement.

3) See bug 556 (https://github.com/navit-gps/navit/issues/556). Rather than remove the spurious one as part of this fix, I will leave that to later. But both now have the same English "translation", "Select a search radius from screen center". This hides the problem, at least from English users. This affects all four en_*.po.in files.

4) Someone who knows more than I do about the translation strings might have a better idea. Particularly, is there a graceful way to indicate the input units, either miles or kilometers?

	modified:   navit/gui/gtk/gui_gtk_poi.c
	modified:   po/en.po.in
	modified:   po/en_AU.po.in
	modified:   po/en_CA.po.in
	modified:   po/en_GB.po.in

* Made it prettier. Reformatted one commented and tabified the thing.

	modified:   navit/gui/gtk/gui_gtk_poi.c

* Replaced one of the two source strings for the PoI window prompt for inputting the search radius. Pull Request 557.

	modified:   navit/gui/gtk/gui_gtk_poi.c
	modified:   po/af.po.in
	modified:   po/ar.po.in
	modified:   po/ast.po.in
	modified:   po/be.po.in
	modified:   po/bg.po.in
	modified:   po/bs.po.in
	modified:   po/ca.po.in
	modified:   po/ckb.po.in
	modified:   po/cs.po.in
	modified:   po/cy.po.in
	modified:   po/da.po.in
	modified:   po/de.po.in
	modified:   po/de_CH.po.in
	modified:   po/el.po.in
	modified:   po/en.po.in
	modified:   po/en_AU.po.in
	modified:   po/en_CA.po.in
	modified:   po/en_GB.po.in
	modified:   po/eo.po.in
	modified:   po/es.po.in
	modified:   po/et.po.in
	modified:   po/eu.po.in
	modified:   po/fa.po.in
	modified:   po/fi.po.in
	modified:   po/fil.po.in
	modified:   po/fo.po.in
	modified:   po/fr.po.in
	modified:   po/fr_CH.po.in
	modified:   po/fy.po.in
	modified:   po/gl.po.in
	modified:   po/he.po.in
	modified:   po/hi.po.in
	modified:   po/hr.po.in
	modified:   po/hu.po.in
	modified:   po/id.po.in
	modified:   po/it.po.in
	modified:   po/ja.po.in
	modified:   po/jv.po.in
	modified:   po/kk.po.in
	modified:   po/kn.po.in
	modified:   po/ko.po.in
	modified:   po/ku.po.in
	modified:   po/lb.po.in
	modified:   po/lt.po.in
	modified:   po/lv.po.in
	modified:   po/mk.po.in
	modified:   po/ml.po.in
	modified:   po/mn.po.in
	modified:   po/mr.po.in
	modified:   po/nb.po.in
	modified:   po/nds.po.in
	modified:   po/nl.po.in
	modified:   po/nn.po.in
	modified:   po/pl.po.in
	modified:   po/pms.po.in
	modified:   po/pt.po.in
	modified:   po/pt_BR.po.in
	modified:   po/ro.po.in
	modified:   po/ru.po.in
	modified:   po/sc.po.in
	modified:   po/si.po.in
	modified:   po/sk.po.in
	modified:   po/sl.po.in
	modified:   po/sq.po.in
	modified:   po/sr.po.in
	modified:   po/sv.po.in
	modified:   po/sw.po.in
	modified:   po/ta.po.in
	modified:   po/te.po.in
	modified:   po/th.po.in
	modified:   po/tr.po.in
	modified:   po/uk.po.in
	modified:   po/ur.po.in
	modified:   po/vi.po.in
	modified:   po/zh_CN.po.in
	modified:   po/zh_HK.po.in
	modified:   po/zh_TW.po.in

* The distance to points of interest has been rendered in kilometers
even if the user has asked for imperial. This commit fixes that.

We convert to feet only, and not miles, because the code sorts on the
numeric value of the distance, so it doesn't like two different
units. Currently, the distance is an int. Can it be made a float?
Possible future enhancement?

	modified:   navit/gui/gtk/gui_gtk_poi.c

* Improved comment.

	modified:   navit/gui/gtk/gui_gtk_poi.c

* cleanup:android:Fix android checkstyle complains (#645)

* Add files via upload

store translations in artefacts

* Add files via upload

* Add files via upload

* Add files via upload

* remove the last java files from cmakelists in po

* move all java UI strings into strings.xml

* translate UI strings by their id's

* Fix android indentation

* cleanup:android:Fix WhitespaceAround checkstyle issues

* cleanup:android:Fix NeedBraces checkstyle issues

* cleanup:android:Fix EmptyLineSeparator checkstyle issues

* cleanup:android:Fix WhitespaceAround checkstyle issues

* Fix linebreaks for codefactor

* cleanup:android:Fix a forgotten linebreak issue

* cleanup:android:Fix ArrayTypeStyle checkstyle issues

* cleanup:android:Fix CustomImportOrder checkstyle issues

* Fix checkstyle indentation warnings on NavitRestoreTask

* cleanup:android:Use try-with-resource construct to avoid emtpy catch block + fix AbbreviationAsWordInName in NavitRestoreTask

* cleanup:android:We support Java pre-7 so no try-with-resource block

* cleanup:android:Some more indentation cleanup and case fix

* fix:checkstyle:The array indentation should be 4 like the rest

* cleanup:android:Fix indentation warnings from checkstyle

* cleanup:android:Fix checkstyle OperatorWrap

* cleanup:android:Fix checkstyle LineLength

* cleanup:android:Fix checkstyle MethodParamPad and ParenPad

* cleanup:android:Fix checkstyle SeparatorWrapComma

* cleanup:android:Fix checkstyle NoWhitespaceBefore

* update:doc:Update AUTHORS file

* update:release:Add more keywords for gitchangelog

* Update CHANGELOG.md for release 0.5.2

* Update Sailfish spec for release 0.5.2

* Update Cmake NAVIT_VERSION_PATCH for release 0.5.2

Navi version shown in internal GUI is created by patching in cmake
PACKAGE_VERSION to the translation .po files. Increase
NAVIT_VERSION_PATCH to 2 in order to make this show 0.5.2 as well.

* Update Patch version for release 0.5.3

* Update Sailfish spec for release 0.5.3

* Update CHANGELOG.md for release 0.5.3

* Update Doxyfile

* add:helper:Add a pre-commit hook script for users to use locally (#603)

* Add netbean project folder to gitignore (#653)

* Fix:gui/internal:Handling "spacing" attribute properly for tag <gui type="internal"> (#636)

Feature was introduced in SVN r1456 (commit 5dea1c6d5ea177a39ba0a9ce29cd247a30005960) but was not applying tag properly from config file

* Update README.md

* Remove tomtom Docker files because they moved to https://github.com/navit-gps/Dockerfiles/

* Add:circleci:Upgrade tomtom build image (#655)

* Add:circleci:Upgrade linux build image to latest ubuntu LTS (#656)

* Add rsync

* add:18n:added script to import one launchpad translation via its url (#658)

* add:18n:added script to import one launchpad translation via its url

* Making CodeFactor happier

* Making CodeFactor happier

* removed import_translations.sh, replaced by single-file import script

* cosmetic:core:Reformat callback.c to fit our standards (#664)

*  cleanup:core:Make sure we use g_* for malloc/free/strncpy (#663)

* cleanup:coord:Make sure we use g_* for malloc/free

* cosmetic:coord:Fix some function declaration format

* cleanup:coord:Move from strncpy to g_strlcpy

* Fix:Circleci Fix on indentation warning and enabling xmllint on android builds (#665)

* Fixing indentation on config.yml (warning ci_sanity_checks.sh)

* Adding libxml2-utils to fix circleci error on missing xmllint command for android builds

* Remove one tailing space

* Revert "Adding libxml2-utils to fix circleci error on missing xmllint command for android builds"

This reverts commit 763f4658c1dab4ec6f900a4f3a032ffb2cf18e0b.

* Adding libxml2-utils to fix circleci error on missing xmllint command during sanity_check

* build:win32: fix build errors of win32
	ändrad:        CMakeLists.txt
	ändrad:        navit/support/gettext_intl/localealias.c
	ändrad:        navit/zipfile.h

* WIP fixing win32 build

	ändrad:        CMakeLists.txt

* fix: changed predefined macro form _WIN32 to __MINGW32__
	ändrad:        navit/support/gettext_intl/localealias.c

* fix: build error for win32
	ändrad:        navit/support/gettext_intl/dcigettext.c
	ändrad:        navit/support/gettext_intl/localealias.c

* fix: repair broken wince build

	ändrad:        navit/support/gettext_intl/dcigettext.c
	ändrad:        navit/support/gettext_intl/localealias.c

* WIP progress fixing wince build

	ändrad:        navit/support/gettext_intl/dcigettext.c

* WIP fixing wince

	ändrad:        navit/support/gettext_intl/dcigettext.c

* WIP fixing wince build

	ändrad:        navit/support/gettext_intl/dcigettext.c
	ändrad:        navit/support/gettext_intl/localealias.c

* fix: correcting codefactor merge issues

	ändrad:        navit/gui/gtk/gui_gtk_poi.c

* corrected merge conflict as pointed out by @metalstrolch

	ändrad:        contrib/sailfish/navit-sailfish.spec

* fix: moved comment as demanded by @metalstrolch

	ändrad:        CMakeLists.txt

1 files changed, 6 insertions, 6 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 105766811..681b27b9d 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -576,12 +576,6 @@ if(WIN32 OR WINCE)
 	add_plugin(support/win32 "Windows detected" TRUE)
 
 	SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -I ${CMAKE_CURRENT_SOURCE_DIR}/navit/gui/win32/resources <DEFINES> -i <SOURCE> -o <OBJECT>")
-	set_with_reason(support/ezxml "Windows detected" TRUE)
-	set_with_reason(speech/espeak "Windows detected" TRUE)
-	#speech/espeak does use windows threads, and therefore needs only parts of
-	#espeak lib. INTERNAL_ESPEAK_COMPLETE controls this.
-	set_with_reason(INTERNAL_ESPEAK_COMPLETE "Windows detected" FALSE)
-	set_with_reason(support/espeak "Windows detected" TRUE)
 	set_with_reason(binding/win32 "Windows detected" TRUE)
 
 	# vehicle_file is broken for windows. use vehicle_wince instead
@@ -647,6 +641,12 @@ if(WINCE)
 	set(HAVE_PRAGMA_PACK 1)
 	set_with_reason(vehicle/file "wince: currently broken" FALSE)
 	set_with_reason(vehicle/wince "wince detected" TRUE)
+	set_with_reason(support/ezxml "Windows detected" TRUE)
+	set_with_reason(speech/espeak "Windows detected" TRUE)
+	#speech/espeak does use windows threads, and therefore needs only parts of
+	#espeak lib. INTERNAL_ESPEAK_COMPLETE controls this.
+	set_with_reason(INTERNAL_ESPEAK_COMPLETE "Windows detected" FALSE)
+	set_with_reason(support/espeak "Windows detected" TRUE)
 endif()
 if (APPLE OR USE_UIKIT)
 	set_with_reason(vehicle/iphone "apple detected" TRUE)