natas_hw
/
OSM-binary
mirror of https://github.com/openstreetmap/OSM-binary
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
161 Commits 1 Branch 17 Tags 504 KiB
Commit Graph

161 Commits

Author SHA1 Message Date
Simon Legner 7a05c39ea5 Deploy to Maven Central 2020-10-20 01:27:44 +02:00
Jochen Topf 78381f3d12
Merge pull request #43 from openstreetmap/dependabot/maven/junit-junit-4.13.1 
Bump junit from 3.8.1 to 4.13.1
 2020-10-14 08:43:16 +02:00
dependabot[bot] 08bfb84ebb
Bump junit from 3.8.1 to 4.13.1 
Bumps [junit](https://github.com/junit-team/junit4) from 3.8.1 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md)
- [Commits](https://github.com/junit-team/junit4/commits/r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-13 09:51:56 +00:00
Jochen Topf ab88d6867a
Merge pull request #42 from simon04/maven-warnings 
Fix Maven warnings
 2020-10-02 10:03:34 +02:00
Simon Legner 14c0f4e52f Fix Maven warnings 2020-10-02 09:57:27 +02:00
Jochen Topf c8837cd8e8
Merge pull request #41 from simon04/github-actions-protoc 
GitHub Actions: setup protoc
 2020-09-28 21:46:23 +02:00
Simon Legner 435b4cac35 GitHub Actions: setup protoc 2020-09-28 20:25:11 +02:00
Jochen Topf 9b7fd5d8f5 README.md formatting fix 2020-09-28 20:17:42 +02:00
Jochen Topf f9679b83d9 Markdownify README 2020-09-28 20:14:07 +02:00
Jochen Topf d002af804a
Merge pull request #40 from simon04/github-actions 
Enable GitHub Actions for Java
 2020-09-28 18:15:55 +02:00
Simon Legner fcdf48d942 Enable GitHub Actions for Java 2020-09-28 17:36:56 +02:00
Jochen Topf 3cd71060e5
Merge pull request #39 from simon04/fix-java-build 
Fix Java build
 2020-09-28 17:27:41 +02:00
Simon Legner 87d7739682 Fix Java build 
- Java 8 (since Java 1.5 is no longer supported by modern Maven)
- Use org.xolstice.maven.plugins (the other one is no longer available)
- Upgrade to protobuf-java 3.13.0
 2020-09-28 17:26:14 +02:00
Jochen Topf 982393066e
Merge pull request #38 from sebastic/optimize_for-LITE_RUNTIME 
Disable deprecated optimize_for = LITE_RUNTIME option.
 2020-08-22 16:23:26 +02:00
Jochen Topf 8959517944
Merge branch 'master' into optimize_for-LITE_RUNTIME 2020-08-22 16:23:06 +02:00
Jochen Topf 0f48055af1
Merge pull request #29 from sebastic/proto2-syntax 
Specify proto2 syntax to fix warnings with protobuf 3.0.0.
 2020-08-22 16:21:29 +02:00
Bas Couwenberg f7b77826e4 Disable deprecated optimize_for = LITE_RUNTIME option. 
Fixes warnings with protobuf >= 3.8.0:

> The optimize_for = LITE_RUNTIME option is no longer supported by protobuf
> Java code generator and is ignored--protoc will always generate full
> runtime code for Java. To use Java Lite runtime, users should use the
> Java Lite plugin instead. See:
> https://github.com/protocolbuffers/protobuf/blob/master/java/lite.md
 2020-03-22 08:12:06 +01:00
Scott Crosby cb942b9e29
Merge pull request #35 from pnorman/proto-license 
License the .proto and header files under MIT
 2019-10-14 12:41:20 -05:00
Paul Norman 5a4c8c1156
License the .proto and header files under MIT 2019-07-11 13:59:00 -07:00
Jochen Topf 4e32fa236e Add comment to roles_sid. 
See #30.
 2016-10-05 09:36:07 +02:00
Bas Couwenberg 17f2228ca8 Specify proto2 syntax to fix warnings with protobuf 3.0.0. 2016-09-02 18:28:45 +02:00
Jochen Topf 1283c4a48d Merge pull request #21 from tomhughes/shlib 
Build and install a shared library
 2015-08-14 08:48:45 +02:00
Tom Hughes cfea70cdc8 Build and install a shared library 2015-07-22 10:19:33 +01:00
Jochen Topf 4edb4f04d0 Fix comment. 2015-07-15 11:41:38 +02:00
Jochen Topf 17fd0ccf56 Merge pull request #22 from tomhughes/license 
Include GPLv3 text
 2015-06-24 11:38:36 +02:00
Tom Hughes 2b945f22ff Include GPLv3 text 
Because LGPLv3 builds on top of GPLv3 the text of both licenses
need to be included. Also use the names that FSF reccomend.
 2015-06-23 17:08:59 +01:00
Jochen Topf 3730430577 Fix build.xml to work with Ubuntu 12.04 where protobuf jar has different name 2014-03-30 21:28:14 +02:00
Jochen Topf 08947fde4d Merge pull request #17 from kayrus/master 
Added redhat/centos spec file
 2014-03-26 16:05:28 +01:00
kayrus c8844a6e90 Updated redhat spec and Makefile 2014-03-26 18:45:48 +04:00
kayrus f5e20cd33e Typo fixed 2014-03-19 18:37:33 +04:00
kayrus 038213bc18 Typo fixed 2014-03-19 18:36:43 +04:00
kayrus 53938b17e1 Updated spec file 2014-03-19 18:36:07 +04:00
kayrus 2a7663aeec Added redhat/centos spec file 2014-03-19 14:37:01 +04:00
Jochen Topf 779715f1a0 Add support for large files 2014-03-17 22:01:55 +01:00
Jochen Topf b7a621927b Merge pull request #16 from sebastic/header-copy 
Copy header files individually, instead of both files twice.
 2014-03-17 18:06:39 +01:00
Bas Couwenberg a4919d86ec Copy header files individually, instead of both files twice. 
The osmpbf (1.3.3-1) build for Debian failed on the mipsel architecture.

The Debian package uses parallel builds which caused the following failure:

```
protoc --proto_path=. --cpp_out=. fileformat.proto
protoc --proto_path=. --cpp_out=. osmformat.proto
cp *.pb.h ../include/osmpbf/
cp *.pb.h ../include/osmpbf/
g++ -g -O2 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wno-long-long -fPIC -c -o osmformat.pb.o osmformat.pb.cc
cp: cannot create regular file '../include/osmpbf/fileformat.pb.h': File exists
```

This change fixes the race condition by copying the header files separately,
instead of copying both header files twice.

With this patch applied, the builds succeeded on all architectures where
OpenJDK 7 is available.

Origin: http://anonscm.debian.org/gitweb/?p=pkg-grass/osmpbf.git;a=commitdiff;h=adcf891b95609e375130438dc431e96017bbbbf8
 2014-03-17 14:09:38 +01:00
Jochen Topf 72cd8e5abc Version 1.3.3 released 2014-03-15 16:11:32 +01:00
Jochen Topf 5e82288d12 Fix ant build script. 
Apparently the old version failed with older ants or older Java versions.
 2014-03-15 16:06:25 +01:00
Jochen Topf ed1101bd59 Changes to debian setup to bring it in line with official Debian repos 2014-03-13 21:42:57 +01:00
Jochen Topf 2b25893e41 Release 1.3.2 2014-03-12 14:18:41 +01:00
Jochen Topf 8f134bfece Use same debian copyright file as official debian repos 2014-03-12 14:12:40 +01:00
Jochen Topf 237240107f Various fixes for easier Debian packaging 2014-03-12 14:09:13 +01:00
Jochen Topf 3199c9fa6f Fixed email address of debian maintainer list 2014-03-11 11:44:44 +01:00
Jochen Topf deef7f0b0a Improved build script. 
The debian build has been changed to not use dh_auto_build etc. because they
pick up the CMake files instead of using the Makefiles.
 2014-03-11 11:25:07 +01:00
Jochen Topf 3c7756e965 Check if input file could be opened. 2014-03-11 11:24:18 +01:00
Jochen Topf f0da31fd79 Improved debian build, better README 
This brings the debian build more in line with the actual released debian
packages which split up the program into three packages.
The tools Makefile has more warnings enabled.
The README goes into a bit more detail.
 2014-03-10 22:00:35 +01:00
Jochen Topf 89c61197d2 Formatting and fixes one formatting-related bug. 
There was a semikolon after an if()...
 2014-03-10 20:57:20 +01:00
Jochen Topf ed845badf9 Merge pull request #15 from keine-ahnung/patch-1 
osmpbf-outline.cpp: fixed incorrect text in debug-output
 2014-02-26 10:19:31 +01:00
keine-ahnung 5fda268b7c osmpbf-outline.cpp: fixed incorrect text in debug-output 2014-02-24 01:52:27 +01:00
Jochen Topf 81985fec4a Force building with -fPIC. 
The debian build wasn't picking up the -fPIC because it sets CXXFLAGS.
 2013-12-12 22:56:41 +01:00