Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

License compliances, memory-streams, posix compilation, BNode prefix, exception safety #285

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ rdf2hdt
replaceHeader
libhdt/examples/*
libhdt/.libs
libcds/.libs

# Autotools
m4/
Expand Down Expand Up @@ -66,7 +65,6 @@ stamp-h1
*.a
**/examples/*
**/tests/*
libcds-v1.0.12/includes
!**/examples/*.cpp
!**/tests/*.cpp
*.o
Expand Down
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ script:
- ./configure --prefix=$LOCAL CXX=$HDT_CPP
- make -j2
# Make and run selected tests. Most tests in HDT are failing
- make check -j2 -C libcds || ( cat libcds/tests/test-suite.log && exit -1)
- make check -j2 -C libhdt || ( cat libhdt/tests/test-suite.log && exit -1)
# Install
- make install
Expand All @@ -61,10 +60,7 @@ script:
- test -f $LOCAL/bin/replaceHeader
- test -f $LOCAL/bin/searchHeader
- test -f $LOCAL/lib/libhdt.la
- test -f $LOCAL/lib/libcds.la
- "if [ \"$TRAVIS_OS_NAME\" = \"linux\" ]; then test -L $LOCAL/lib/libhdt.so; fi"
- "if [ \"$TRAVIS_OS_NAME\" = \"linux\" ]; then test -L $LOCAL/lib/libcds.so; fi"
- "if [ \"$TRAVIS_OS_NAME\" = \"osx\" ]; then test -L $LOCAL/lib/libhdt.dylib; fi"
- "if [ \"$TRAVIS_OS_NAME\" = \"osx\" ]; then test -L $LOCAL/lib/libcds.dylib; fi"
- test -f $LOCAL/lib/pkgconfig/hdt.pc
- test -f $LOCAL/lib/pkgconfig/cds.pc
1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ RUN apt update; \

# Copy in libraries and binaries from build stage.
COPY --from=build \
/usr/local/lib/libcds* \
/usr/local/lib/libhdt* \
/usr/local/lib/
COPY --from=build \
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AUTOMAKE_OPTIONS = subdir-objects
SUBDIRS = libcds libhdt
SUBDIRS = libhdt
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = m4/gnulib-cache.m4
13 changes: 1 addition & 12 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,9 @@ AC_MSG_CHECKING(whether to enable optimizations)
AC_ARG_ENABLE([optimization],
AS_HELP_STRING([--enable-optimization],[Build library with optimization parameters [default=yes]]),
[AC_MSG_RESULT(${enableval})],
[CXXFLAGS="${CXXFLAGS} -g -O2 -std=c++11"]
[CXXFLAGS="${CXXFLAGS} -g -O2 -std=c++14"]
[AC_MSG_RESULT(yes)])

AC_MSG_CHECKING(whether to build libcds)
AC_ARG_ENABLE([libcds],
AS_HELP_STRING([--enable-libcds],[Build libcds [default=yes]]),
[AC_MSG_RESULT(${enableval})],
[enable_cds=yes]
[AC_MSG_RESULT(yes)])
AM_CONDITIONAL([WANTS_LIBCDS], [test x$enable_cds != xno])

# Dependencies
AC_ARG_WITH([zlib],
AS_HELP_STRING([--with-zlib], [Use z library [default=yes] ]),
Expand Down Expand Up @@ -94,8 +86,5 @@ AC_CONFIG_FILES([
libhdt/Makefile
libhdt/tools/Makefile
libhdt/tests/Makefile
libcds/cds.pc
libcds/Makefile
libcds/tests/Makefile
])
AC_OUTPUT
42 changes: 0 additions & 42 deletions hdt-it/.cproject

This file was deleted.

8 changes: 0 additions & 8 deletions hdt-it/.gitignore

This file was deleted.

27 changes: 0 additions & 27 deletions hdt-it/.project

This file was deleted.

Loading