Skip to content

Commit 9967753

Browse files
committed
Merge tag 'v0.5.96' into release
2 parents 26e8e1e + 95102e2 commit 9967753

File tree

162 files changed

+140300
-131591
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+140300
-131591
lines changed

3rd-party/gcc-mxe/README

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
make-source.sh creates a tarball of MXE.cc and the sources files which are
2+
required to build gcc C/C++ toolchains for
3+
- i686-w64-mingw32.shared
4+
- x86_64-w64-mingw32.shared
5+
6+
See make-source.sh for modifications which are applied to MXE.cc before
7+
packaging.
8+
9+
To build gcc and its dependencies from the extracted tarball, run
10+
11+
make gcc
12+
13+
This will use the sources which came with this package.
14+
15+
To build gdb, run
16+
17+
make gdb
18+
19+
The sources of gdb and of its dependencies will be downloaded on first build.
20+

3rd-party/gcc-mxe/make-source.sh

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
#/bin/sh -e
2+
#
3+
# (C) 2014 Kai Pastor
4+
#
5+
# This file is part of OpenOrienteering.
6+
#
7+
# OpenOrienteering is free software: you can redistribute it and/or modify
8+
# it under the terms of the GNU General Public License as published by
9+
# the Free Software Foundation, either version 3 of the License, or
10+
# (at your option) any later version.
11+
#
12+
# OpenOrienteering is distributed in the hope that it will be useful,
13+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
# GNU General Public License for more details.
16+
#
17+
# You should have received a copy of the GNU General Public License
18+
# along with OpenOrienteering. If not, see <http://www.gnu.org/licenses/>.
19+
20+
LANG=C
21+
MXE_TARGET="i686-w64-mingw32.shared x86_64-w64-mingw32.shared"
22+
MXE_DIR=gcc-mxe-$(date +%Y%m%d)
23+
PKG_LIST="binutils cloog gcc gcc-cloog gcc-isl gcc-gmp gcc-mpc gcc-mpfr gmp isl mingw-w64 mpc mpfr pkgconf"
24+
PKG_LIST="$PKG_LIST gdb expat libiconv pdcurses readline zlib"
25+
26+
git clone -b master https://github.com/mxe/mxe.git $MXE_DIR
27+
28+
( cd $MXE_DIR ; git show-branch --list --reflog=1 ) > $MXE_DIR/GIT_SHOW_BRANCH
29+
30+
for I in $MXE_DIR/.git* $MXE_DIR/assets $MXE_DIR/doc $MXE_DIR/tools/* src/cmake
31+
do
32+
echo $I
33+
case "$I" in
34+
*/tools/compat-init.sh)
35+
;; # keep it
36+
*/tools/make-shared-from-static)
37+
;; # keep it
38+
*/tools/update-*)
39+
;; # keep it
40+
*)
41+
rm -Rf "$I"
42+
;;
43+
esac
44+
done
45+
46+
for I in $(sed -n 's/^.* class="package">\([^<]*\)<.*$/\1/p' "$MXE_DIR/index.html")
47+
do
48+
echo " $PKG_LIST " | grep " $I " > /dev/null && I=
49+
if [ -n "$I" ]
50+
then
51+
rm $MXE_DIR/src/$I.mk $MXE_DIR/src/$I-* 2>/dev/null || true
52+
sed -i -e '/<tr>/N;/^.* class="package">'"$I"'</{N;N;d}' "$MXE_DIR/index.html"
53+
fi
54+
done
55+
56+
sed -i -e '/enable-languages/{s/,objc//;s/,fortran//};/addprefix/s/ gfortran//' $MXE_DIR/src/gcc.mk
57+
58+
sed -i -e "1ifirst: gcc" $MXE_DIR/Makefile
59+
sed -i -e "s/git show-branch --list --reflog=1/echo '$MXE_DIR'/" $MXE_DIR/Makefile
60+
61+
cat > $MXE_DIR/settings.mk << END_SETTINGS
62+
MXE_TARGETS := $MXE_TARGET
63+
#JOBS := 6
64+
65+
END_SETTINGS
66+
67+
mkdir $MXE_DIR/OpenOrienteering
68+
cp "$0" $MXE_DIR/OpenOrienteering/
69+
cat > $MXE_DIR/README << END_README
70+
$(LANG=C date) OpenOrienteering
71+
72+
This is a clone of MXE.cc modified to fulfil the sole purpose of a controlled
73+
build of a $(echo ${MXE_TARGET} | sed -e 's/ /\//') C/C++ toolchain.
74+
See OpenOrienteering/make-source.sh for the modifications.
75+
76+
To build gcc and its dependencies, run
77+
78+
make gcc
79+
80+
This will use existing sources which came with this package.
81+
82+
To build gdb, run
83+
84+
make gdb
85+
86+
The sources of gdb and of its dependencies will be downloaded on first build.
87+
88+
END_README
89+
90+
make -C $MXE_DIR download-gcc
91+
92+
fakeroot tar cvzf $MXE_DIR-src.tar.gz $MXE_DIR
93+

3rd-party/qt5/CMakeLists.txt

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,16 @@ set(QT5_VERSION ${QT5_VERSION_DEFAULT} CACHE STRING
3030
"Version number of the Qt5 library, recommended value: ${QT5_VERSION_DEFAULT}")
3131
mark_as_advanced(QT5_VERSION)
3232

33+
string(REGEX MATCH "5.." QT5_MAJOR_MINOR ${QT5_VERSION})
34+
string(REGEX MATCH "5...." QT5_MAJOR_MINOR_REVISION ${QT5_VERSION})
35+
set(QT5_MAJOR_MINOR_REVISION ${QT5_MAJOR_MINOR_REVISION} CACHE STRING
36+
"The Qt version number without additional release markers" FORCE) # Export
37+
if (NOT "${QT5_VERSION}" MATCHES "^${QT5_MAJOR_MINOR_REVISION}")
38+
message(WARNING
39+
"The Qt5 library version is different from the current recommended version "
40+
"(${QT5_VERSION} vs. ${QT5_VERSION_DEFAULT}).")
41+
endif()
42+
3343

3444
if(NOT MAPPER_LIBRARY_DESTINATION AND CMAKE_BUILD_TYPE MATCHES "Debug")
3545
# stand-alone debug build of Qt5
@@ -44,18 +54,13 @@ mark_as_advanced(QT5_DEBUG)
4454

4555
message(STATUS "Configuring Qt ${QT5_VERSION}")
4656

47-
if (NOT ${QT5_VERSION} STREQUAL ${QT5_VERSION_DEFAULT})
48-
message(WARNING
49-
"The Qt5 library version is different from the current recommended version "
50-
"(${QT5_VERSION} vs. ${QT5_VERSION_DEFAULT}).")
51-
endif()
52-
5357
set(QT5_MD5SUMS
5458
# Schema: VERSION:MD5[:DOWNLOAD_URL]
5559
5.2.1:a78408c887c04c34ce615da690e0b4c8
5660
5.3.1:a355749e4f200a6392ecad151d1d0cdc
5761
5.3.2:febb001129927a70174467ecb508a682
58-
5.3.2-openorienteering-2014-10-12:96f2029f208ac68b7c5543b496f22892:https://sourceforge.net/projects/oorienteering/files/Mapper/Source/3rd-party/qt-everywhere-opensource-src-5.3.2-openorienteering-2014-10-12.tar.gz
62+
5.3.2-openorienteering-2014-10-12:96f2029f208ac68b7c5543b496f22892
63+
5.4.0-beta:a9b848f0a4f34273b248177637490b32:http://download.qt-project.org/development_releases/qt/5.4/5.4.0-beta/single/qt-everywhere-opensource-src-5.4.0-beta.tar.gz
5964
)
6065
foreach(line ${QT5_MD5SUMS})
6166
if(${line} MATCHES "^${QT5_VERSION}:")
@@ -70,14 +75,13 @@ if(NOT QT5_MD5)
7075
"or specify the correct QT5_MD5 value at the command line.")
7176
endif()
7277

73-
string(REGEX MATCH "5.." QT5_MAJOR_MINOR ${QT5_VERSION})
74-
string(REGEX MATCH "5...." QT5_MAJOR_MINOR_REVISION ${QT5_VERSION})
75-
set(QT5_MAJOR_MINOR_REVISION ${QT5_MAJOR_MINOR_REVISION} CACHE STRING
76-
"The Qt version number without additional release markers" FORCE) # Export
77-
if(QT5_MD5 MATCHES :)
78+
if(QT5_MD5 MATCHES ":")
7879
message(WARNING "Not using an official release of Qt.")
7980
string(REGEX REPLACE "^[0-9a-fA-F]*:" "" QT5_URL "${QT5_MD5}")
8081
string(REGEX REPLACE ":.*" "" QT5_MD5 "${QT5_MD5}")
82+
elseif(QT5_VERSION MATCHES "-openorienteering-")
83+
message(STATUS "Using a Qt tarball from OpenOrienteering")
84+
set(QT5_URL "https://sourceforge.net/projects/oorienteering/files/Mapper/Source/3rd-party/qt-everywhere-opensource-src-${QT5_VERSION}.tar.gz")
8185
else()
8286
set(QT5_URL "http://download.qt-project.org/archive/qt/${QT5_MAJOR_MINOR}/${QT5_VERSION}/single/qt-everywhere-opensource-src-${QT5_VERSION}.tar.gz")
8387
endif()
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
2014-10-21 Kai Pastor (OpenOrienteering)
2+
- Updated for Qt-5.4.0-beta
3+
4+
2014-09-19 Kai Pastor (OpenOrienteering)
5+
- Never fail on missing CMake tests, as we remove all tests from source dir.
6+
7+
diff -up Qt5/qtbase/mkspecs/features/create_cmake.prf.orig Qt5/qtbase/mkspecs/features/create_cmake.prf
8+
--- Qt5/qtbase/mkspecs/features/create_cmake.prf.orig
9+
+++ Qt5/qtbase/mkspecs/features/create_cmake.prf
10+
@@ -305,7 +305,8 @@
11+
# with 'CONFIG -= create_cmake'
12+
!equals(CMAKE_MODULE_TESTS, -) {
13+
isEmpty(CMAKE_MODULE_TESTS): CMAKE_MODULE_TESTS = $$MODULE_BASE_INDIR/tests/auto/cmake
14+
- !exists($$CMAKE_MODULE_TESTS): \
15+
- error("Missing CMake tests. Either create tests in tests/auto/cmake," \
16+
- "or disable cmake config file creation with CONFIG-=create_cmake.")
17+
+ # Test dirs were removed in OpenOrienteering build.
18+
+ #!exists($$CMAKE_MODULE_TESTS): \
19+
+ # error("Missing CMake tests. Either create tests in tests/auto/cmake," \
20+
+ # "or disable cmake config file creation with CONFIG-=create_cmake.")
21+
}

3rd-party/qt5/qt5-patchqt.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ for I in \
8282
qttools/src/designer/designer/* \
8383
qttools/src/designer/plugins/* \
8484
qttools/src/designer/src/lib/extensions/* \
85+
qtwayland \
86+
qtwebchannel \
87+
qtwebengine \
8588
qtwebkit \
8689
qtwebkit-examples \
8790
qtwebkit-examples-and-demos \

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,21 @@
1717
# along with OpenOrienteering. If not, see <http://www.gnu.org/licenses/>.
1818

1919
cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
20+
cmake_policy(SET CMP0020 OLD)
21+
2022
include(FeatureSummary)
2123

2224
# Project declaration
2325

2426
project(Mapper)
2527

28+
set(Mapper_COPYRIGHT "(C) 2012-2014 OpenOrienteering developers")
29+
2630
# All version components must be integers.
2731
# We use 99 to mark development builds.
2832
SET(Mapper_VERSION_MAJOR 0)
2933
SET(Mapper_VERSION_MINOR 5)
30-
SET(Mapper_VERSION_PATCH 95)
34+
SET(Mapper_VERSION_PATCH 96)
3135

3236
if(${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
3337
message(FATAL_ERROR "You must not use the source directory as build directory.")

0 commit comments

Comments
 (0)