Commit Graph

158 Commits

Author SHA1 Message Date
Vadim Zeitlin
7b36d72b44 Merge branch 'vc-pmdpi' of https://github.com/MaartenBent/wxWidgets
Add DPI Awareness option to nmake makefiles and MSVC projects.

See https://github.com/wxWidgets/wxWidgets/pull/1664
2019-12-03 02:29:25 +01:00
Maarten Bent
e36cdaddfd Specify CPU parameter for AppVeyor nmake builds
Don't use DPI aware manifest with VC9.
Build minimal samples with msbuild and nmake.
2019-12-01 00:06:44 +01:00
Maarten Bent
147dab61b3 Check for more webkit packages on TravisCI 2019-11-29 00:21:26 +01:00
Maarten Bent
a45afd2f98 Add uninstall icon to installer script 2019-11-29 00:21:25 +01:00
Vadim Zeitlin
0a02f4c190 Increment version number to 3.1.4
Done by running misc/scripts/inc_release, manually updating version.bkl,
rebaking and rerunning autoconf.

Also a header for the next version to the change log.
2019-10-28 14:11:00 +01:00
Danny Scott
dc3e685e3a Fix package path when adding wx_setup.props
Closes https://github.com/wxWidgets/wxWidgets/pull/1618
2019-10-25 16:33:48 +02:00
Vadim Zeitlin
8949f441fd Also include build/msw/wx_setup.props with MSVC "Dev" binaries
This file is a dependency of wxwidgets.props and must be present.

Closes #18510.
2019-10-21 01:27:51 +02:00
Vadim Zeitlin
f8289ffad5 Include wxwidgets.props into MSVS binaries distribution
Add wxMSVC_VERSION_ABI_COMPAT definition to the version of the file
included in the binary distribution to make it compatible with the
actual DLL names.

Closes #18510.
2019-10-20 17:06:07 +02:00
dos
5413f68c61 Build vc14x libraries in official binaries build script
Replace vc140,vc141,vc142 builds using VS2015,VS2017,VS2019
with a single set of libraries using vc14x toolset built with VS2015.

Closes https://github.com/wxWidgets/wxWidgets/pull/1607
2019-10-17 17:02:07 +02:00
Vadim Zeitlin
7425fd0c50 Explicitly request 24bpp screen with Xvfb
Older versions of the server default to 8bpp, which breaks some of our
tests (admittedly, this shouldn't be the case, but it's probably better
to test in the same configuration as is used by 99.99% of the users
rather than adjusting or disabling tests in the remaining 0.01%).
2019-07-18 17:45:20 +02:00
Vadim Zeitlin
342494e5f4 Only run GUI tests for the selected wxGTK builds
The tests are known to fail for the other tested ports, so don't enable
them for now.

Also, using a special environment variable allows to detect when the
test is being run under Xvfb, which behaves differently from the normal
X server in some cases.
2019-07-18 17:45:20 +02:00
Scott Talbert
e5b76a3b13 Run GUI tests under Travis using xvfb-run
Closes https://github.com/wxWidgets/wxWidgets/pull/905
2019-07-18 17:45:20 +02:00
dos
d846cfae6f Add use of Visual Studio 2019 (vc142) to official build scripts
Build binaries using MSVS 2019/vc142 toolset too.

Closes https://github.com/wxWidgets/wxWidgets/pull/1384
2019-07-08 10:42:26 +02:00
Maarten Bent
d111053151 Use CMake script to check Travis installation 2019-02-03 21:51:50 +01:00
Maarten Bent
ea2c8543d3 Build some samples on AppVeyor with CMake
Remove unused toolsets.
Remove extra popd.
2019-02-03 19:00:03 +01:00
Maarten Bent
42c602bddf CMake: test installation with Travis CI
With wx-config working, test installing and building the minimal sample
with Travis CI.

Closes https://github.com/wxWidgets/wxWidgets/pull/1172
2019-01-24 13:20:38 +01:00
Vadim Zeitlin
e1185d8bf0 Increment version number to 3.1.3
Done by running misc/scripts/inc_release, manually updating version.bkl,
rebaking and rerunning autoconf.
2018-12-10 19:06:18 +01:00
Vadim Zeitlin
b8f791877e Fix SHA-1 update script to work with the current release.md
Change the regex used to find the lines to update to actually find them.
2018-12-09 16:52:40 +01:00
Vadim Zeitlin
2b612603d3 Give an error from build/tools/post-release.sh if it didn't work
The script gave a misleading success message even if it didn't find
anything to update.
2018-12-09 16:51:29 +01:00
Vadim Zeitlin
f456f52493 Add a text file to be shown after finishing wxMSW installation
We used docs/msw/install.txt for this previously, but it was too long to
be comfortably viewed in the installation wizard and also incidentally
doesn't exist any more, so add a new, short file just referring the user
to its replacement.
2018-12-09 16:40:08 +01:00
Vadim Zeitlin
653f9b14f0 Don't reference inexistent docs/msw/install.txt in wxwidgets.iss
Use install.md which is probably not ideal, but it at least allows Inno
Setup to successfully build the installer.
2018-12-09 16:18:06 +01:00
Vadim Zeitlin
a18fc6ce96 Normalize line endings in wxwidgets.iss
This file was a mix of DOS and Unix EOLs, convert it entirely to the
former.

No real changes.
2018-12-09 16:10:51 +01:00
Maarten Bent
de4eecc575 Install additional packages on Travis CI
Install packages for gstreamer, webkit, opengl and libsecret.
First check if the package is available.
2018-11-04 22:00:32 +01:00
Maarten Bent
f7d1f46144 Build WXQT toolkit with AppVeyor 2018-09-30 17:23:58 +02:00
Maarten Bent
d3628d8373 Build more toolkits with Travis CI 2018-09-19 22:00:01 +02:00
Maarten Bent
5b2c905fb9 Log MSBuild AppVeyor messages
Provide better integration for the AppVeyor CI builds.

Closes https://github.com/wxWidgets/wxWidgets/pull/895
2018-08-24 20:08:51 +02:00
Maarten Bent
33ea26c8b6 Use same ctest command on Travis and AppVeyor
Do not run the GUI tests on Travis, these fail with:
Error: Unable to initialize GTK+, is DISPLAY set properly?
2018-08-02 20:50:55 +02:00
Maarten Bent
f074557f00 Check all error codes of AppVeyor tests
A test might return a different error code than 1,
for example when a segfault occurs.
2018-08-02 20:50:54 +02:00
Maarten Bent
a7b8897846 Fix running CMake tests under AppVeyor 2018-07-29 21:14:30 +02:00
dos
6e093f5a84 Add wxrc.exe to the MSVS release archives
Include wxrc.exe in the release.

Also change the way checksums are calculated due to fciv tool
limitations.

Closes #18124.

Closes https://github.com/wxWidgets/wxWidgets/pull/800
2018-05-02 18:29:40 +02:00
Vadim Zeitlin
2ec2837f6d Update version to 3.1.2
Run misc/scripts/inc_release and rebake.
2018-02-20 00:08:01 +01:00
Danny Scott
a52b839f66 Use vswhere to set environment variables for MSVS 2017
Allow building official releases with MSVS 2017 without doing it from
its "developer command prompt" by using the vswhere utility to set up
the paths correctly.

Closes #18083.
2018-02-17 13:40:41 +01:00
Vadim Zeitlin
35d2823601 Tweak post-release script and documentation
For the release candidates, allow passing the version (e.g. "3.1.1-rc")
to post-release.sh on the command line and document this.

Also don't commit automatically, this is annoying, especially as the
script doesn't check for errors.

Finally, fix the problem with the CHM file name: it must be zipped,
presumably to avoid problems with some firewalls blocking downloading
CHM files (as there is really no advantage in compressing the already
compressed CHM file otherwise).
2018-02-05 15:44:19 +01:00
Danny Scott
cf588d7a64 Handle current directory with MSVS 2017 in a better way
Set VSCMD_START_DIR to "%CD%" to prevent MSVS 2017 build scripts from
changing the directory.

See #18075.
2018-02-02 18:17:42 +01:00
Danny Scott
94e201df78 Update batch file for MSW binaries for MSVS 2017
VS2017 environment bat files change the working directory so the build
directory is returned to after calling them.

A warning has been added that the VS150COMNTOOLS environment variable
needs to be set or a VS2017 command prompt needs to be used for VS2017
builds. MS no longer sets this variable on install.

For vc110 and vc120 builds the x64 switch has been changed to x86_amd64.

Closes #18075.
2018-02-02 15:37:10 +01:00
Maarten Bent
c341d72a92 Remove downloading CppUnit and CMake in Travis CI
CppUnit has been replaced by Catch.
The Precise build environment is not used, so no need to download CMake for it.
2018-01-28 16:31:12 +01:00
Maarten Bent
4171f9b808 Use parallel builds in Travis CI
Don't use it when building samples. It randomly results in build errors with 'file not recognized: File truncated'.
2018-01-28 15:49:34 +01:00
Vadim Zeitlin
62af6a648f Run tests for cmake build from test bat file under AppVeyor
The tests need to be run from appveyor-test.bat and not the main
appveyor.bat itself with the current approach, so move ctest invocation
there.
2017-12-10 22:41:44 +01:00
Vadim Zeitlin
c66c9c5ae6 Merge branch 'build_cmake' of https://github.com/TcT2k/wxWidgets
Add CMake-based build system.

Merge the original branch without any changes except for resolving the
conflict due to moving the contents of .travis.yml to a separate file by
propagating the changes done in this file since then to the new script
and rerunning ./build/update-setup-h and ./build/cmake/update_files.py
to update the file lists changed in the meanwhile.

Closes https://github.com/wxWidgets/wxWidgets/pull/330
2017-12-09 15:09:47 +01:00
Vadim Zeitlin
b29aa3f785 Run unit tests on AppVeyor too
Launch the tests after building them.
2017-11-25 17:30:51 +01:00
Vadim Zeitlin
f10bd1279d Remove the correct directory from PATH for MinGW AppVeyor builds
We need to remove the directory containing sh.exe from the PATH as
otherwise mingw32-make seems to use it and not cmd.exe for executing the
commands in the makefile, but the wrong directory was being removed in
appveyor.yml, having no effect.

Fix this and undo 5f2ccde269 which
compensated for it by (almost) clearing the PATH entirely which, in
turn, broke one of our unit tests (and could break other things in the
future, as having an empty PATH is rather unexpected).

Also use the full path for head program now that its directory is not in
the PATH any more. Alternative could be to use PowerShell, but while

powershell -Command "'gcc','mingw32-make','ar'|%%{ iex \"$_ --version\"|select -first 1 }"

does work, it looks really ugly, so avoid it for now.

See https://github.com/wxWidgets/wxWidgets/pull/142

See #17274.
2017-11-25 17:28:42 +01:00
Vadim Zeitlin
bc100ff31e Build tests under AppVeyor too 2017-11-24 22:55:11 +01:00
Vadim Zeitlin
2ee40f8a60 Add a build using GTK+ 3 to Travis
We need to test both wxGTK2 and wxGTK3 builds.
2017-11-22 02:33:53 +01:00
Vadim Zeitlin
38e441bdd8 Don't install libcppunit-dev under Travis CI any more
It is not needed since the switch to Catch for unit tests.
2017-11-22 02:31:47 +01:00
Vadim Zeitlin
34e6c7cccc Silence "make allmo" during release archives build
The commands used and their output are not important and there are many
of them, don't display them.
2017-11-16 23:37:24 +01:00
Vadim Zeitlin
7fd25de661 Update release script to include submodules in the archives
Use "git submodule foreach" to run "git archive" in all of the
submodules as well.

Also document the requirement to have GNU tar which is needed to be able
to successfully extract several concatenated tar archives.
2017-11-16 23:37:24 +01:00
Vadim Zeitlin
6471933857 Fix getting SHA-1 sums in the post-release script
sha1sum doesn't return just the SHA-1, unlike "git hash-object", so get
only the part of its output we need here.
2017-11-16 23:36:35 +01:00
Vadim Zeitlin
a80210f0d7 Allow running pre/post-release scripts from any directory
Don't assume they're run from the directory containing them, especially
as this is not how they are shown to be invoked in the release
instructions.

Now running ./build/tools/pre-release.sh works too.
2017-11-16 18:49:45 +01:00
Vadim Zeitlin
2fc4b76cf0 Use Bash for release scripts using non-POSIX features
A script using "declare -a" can't use /bin/sh as it's non-POSIX and not
supported by e.g. Dash which is /bin/sh on Debian systems.
2017-11-16 18:45:59 +01:00
Cătălin Răceanu
45c33d2a17 Add scripts for automating more parts of the release process
Update dates in various files before the release automatically.

Also automatically update SHA-1 of the release files both before the
release (to zero them) and afterwards (to use the correct values).

Closes https://github.com/wxWidgets/wxWidgets/pull/443
2017-11-16 18:45:17 +01:00