Skip to content

Commit

Permalink
Merge pull request #325 from maxmind/greg/windows-cleanup
Browse files Browse the repository at this point in the history
Clean up Windows build
  • Loading branch information
horgh authored Nov 7, 2023
2 parents 80bfed7 + 3412437 commit 23c0354
Show file tree
Hide file tree
Showing 39 changed files with 57 additions and 2,523 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: daily
2 changes: 1 addition & 1 deletion .github/workflows/clang-analyzer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ jobs:
- run: ./bootstrap
- run: scan-build ./configure
env:
CFLAGS: -std=c99 -Wall -Wextra -Werror -Wno-unused-function -Wno-unused-parameter -Wno-unknown-pragmas
CFLAGS: -std=c99 -Wall -Wextra -Werror -Wno-unused-function -Wno-unused-parameter
- run: cd src; scan-build --status-bugs make; cd ..
- run: cd bin; scan-build --status-bugs make; cd ..
4 changes: 1 addition & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ jobs:
- run: ./bootstrap
- run: ./configure
env:
# -Wno-unknown-pragmas because we have some Clang specific pragmas
# which aren't interesting to cause failures for.
CFLAGS: -std=c99 -Wall -Wextra -Werror -Wno-unused-function -Wno-unused-parameter -Wno-unknown-pragmas ${{ matrix.posix }}
CFLAGS: -std=c99 -Wall -Wextra -Werror -Wno-unused-function -Wno-unused-parameter ${{ matrix.posix }}
- run: make
- run: make check

Expand Down
5 changes: 5 additions & 0 deletions Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@

* `PACKAGE_VERSION` is now a private compile definition when building
with CMake. Pull request by bsergean. GitHub #308.
* `PACKAGE_VERSION` is no longer defined in `maxminddb.h` on
Windows.
* The feature test macro `_POSIX_C_SOURCE` is no longer set by
`maxminddb.h`. As discussed in GitHub #318, this should be set by
applications rather than by libraries.
* `assert()` is no longer used outside test code.
* The deprecated Visual Studio 12 project files in the `projects/`
directory have been removed. CMake should be used when building on
Windows.

## 1.7.1 - 2022-09-30

Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SUBDIRS += \
t
endif

EXTRA_DIST = doc Changes.md LICENSE NOTICE README.md projects/VS12 projects/VS12-tests \
EXTRA_DIST = doc Changes.md LICENSE NOTICE README.md \
CMakeLists.txt t/CMakeLists.txt bin/CMakeLists.txt \
include/maxminddb_config.h.cmake.in

Expand Down
54 changes: 0 additions & 54 deletions dev-bin/regen-win32-test-projs.pl

This file was deleted.

4 changes: 0 additions & 4 deletions include/maxminddb.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ extern "C" {
#include <winsock2.h>
#include <ws2tcpip.h>
/* libmaxminddb package version from configure */
#ifndef PACKAGE_VERSION
/* This is used by msbuild. Once we delete those files, we can remove this. */
#define PACKAGE_VERSION "1.7.1"
#endif

typedef ADDRESS_FAMILY sa_family_t;

Expand Down
105 changes: 0 additions & 105 deletions projects/VS12-tests/bad_pointers.vcxproj

This file was deleted.

105 changes: 0 additions & 105 deletions projects/VS12-tests/basic_lookup.vcxproj

This file was deleted.

Loading

0 comments on commit 23c0354

Please sign in to comment.