4edb4f04d0
Fix comment.
2015-07-15 11:41:38 +02:00
17fd0ccf56
Merge pull request #22 from tomhughes/license
...
Include GPLv3 text
2015-06-24 11:38:36 +02:00
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
3730430577
Fix build.xml to work with Ubuntu 12.04 where protobuf jar has different name
2014-03-30 21:28:14 +02:00
08947fde4d
Merge pull request #17 from kayrus/master
...
Added redhat/centos spec file
2014-03-26 16:05:28 +01:00
c8844a6e90
Updated redhat spec and Makefile
2014-03-26 18:45:48 +04:00
f5e20cd33e
Typo fixed
2014-03-19 18:37:33 +04:00
038213bc18
Typo fixed
2014-03-19 18:36:43 +04:00
53938b17e1
Updated spec file
2014-03-19 18:36:07 +04:00
2a7663aeec
Added redhat/centos spec file
2014-03-19 14:37:01 +04:00
779715f1a0
Add support for large files
2014-03-17 22:01:55 +01:00
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
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
72cd8e5abc
Version 1.3.3 released
2014-03-15 16:11:32 +01:00
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
ed1101bd59
Changes to debian setup to bring it in line with official Debian repos
2014-03-13 21:42:57 +01:00
2b25893e41
Release 1.3.2
2014-03-12 14:18:41 +01:00
8f134bfece
Use same debian copyright file as official debian repos
2014-03-12 14:12:40 +01:00
237240107f
Various fixes for easier Debian packaging
2014-03-12 14:09:13 +01:00
3199c9fa6f
Fixed email address of debian maintainer list
2014-03-11 11:44:44 +01:00
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
3c7756e965
Check if input file could be opened.
2014-03-11 11:24:18 +01:00
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
89c61197d2
Formatting and fixes one formatting-related bug.
...
There was a semikolon after an if()...
2014-03-10 20:57:20 +01:00
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
5fda268b7c
osmpbf-outline.cpp: fixed incorrect text in debug-output
2014-02-24 01:52:27 +01:00
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
38323f8a56
1.3.1 Release
2013-12-11 21:49:36 +01:00
0d9ce00257
Add IWYU pragmas.
...
These pragmas are used by the IWYU (Include-What-You-Use) program to find out
which header files need to be included in your C/C++ program. The pragmas
added tell IWYU that osmpbf.h acts as a "facade" for the other header files.
2013-11-27 10:07:37 +01:00
ee52133e05
Fix Debian build
2013-09-02 20:50:33 +02:00
73c5bd159d
Fix line endings (CRLF->LF), remove spaces at end of lines
2013-09-02 20:44:02 +02:00
0ff626d442
Merge branch 'master' of https://github.com/michaeltandy/OSM-binary into mergetest
2013-09-02 12:34:01 -05:00
5fb1760122
Merge pull request #12 from alex85k/master
...
CMake support
2013-09-02 10:14:38 -07:00
3d5dd4b7bb
merged
2013-09-02 12:15:24 -05:00
538425c954
merged
2013-09-02 11:51:59 -05:00
1bcf58a6e1
Merge pull request #14 from AMDmi3/master
...
Make CXX/CXXFLAGS overridable
2013-09-02 09:46:03 -07:00
2cd0806c92
Compile with -fPIC
...
This is needed on 64bit machines when the resulting static library will later
be included in a dynamic library.
2013-08-30 17:42:14 +02:00
2c281c9bf8
Make CXX/CXXFLAGS overridable
...
This makes it easier to support systemwide compiler settings.
While here, link with pthreads in a more correct way (-pthread instead
of -lpthread).
2013-08-27 22:16:22 +04:00
f84c2ea5e2
Use #define instead of const char* for version.
...
You can't initialize strings in header files, because they might be included from several source files and the linker will see several copies of the same string.
2013-08-26 10:30:39 +02:00
56337c31d7
one more fix to install
2013-07-23 12:10:39 +05:00
1078fd47f3
More compilation fixes
2013-07-22 23:13:26 +06:00
05772fdf5d
Fix building example and installation
2013-07-09 11:36:17 +06:00
a06d895f63
Fix CMake scripts
2013-06-13 22:51:02 +06:00
72fdfb4ccb
Added CMAKE project files and windows-compatibilty to osmpbf-outline
2013-06-04 17:38:55 +05:00
b8266ac09f
Do not set file user:group to 'root:root' during installation
...
When run as root, files will be 'root:root' anyway. When run as user
changing user:group will fail. Furthermore, the group 'root' is not
available on all systems.
2013-03-09 13:19:56 +01:00
1cbcd0078e
Install to /usr/local per default
2013-03-09 12:46:58 +01:00
2b7a332957
Allow overriding protoc path from the command line
2013-03-09 12:42:20 +01:00
705e60496b
Allow overriding Makefile variables from the command line
2013-03-09 12:42:11 +01:00
d9be2d1024
Update tags for v1.3.0
2012-12-04 22:14:05 -06:00
9db1087b54
Merge pull request #7 from woodpeck/timestamp
...
Add fields for replication support.
2012-12-04 19:59:40 -08:00
Jochen Topf