Skip to content

Commit

Permalink
Rename the libWPEBackend library just to libwpe
Browse files Browse the repository at this point in the history
This library does not actually implement any backend for WPE, and
therefore its name can be misleading. Instead, it contains the code
needed by WebKit to interface with actual backend implementations,
loading them, and some utility code. The libwpe name is much more
fitting.

This is a good moment to do this rename, because the API version will
be bumped for release 1.0.0 as well: packagers and users of the library
will need to update anyway for the API version change and rebuild
software which uses libWPEBackend^W libwpe anyway.

Fixes Igalia#27
  • Loading branch information
aperezdc committed Aug 20, 2018
1 parent ce40c39 commit 0066d95
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
20 changes: 10 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ set(WPE_API_VERSION "0.1")
# - If binary compatibility has been broken (eg removed or changed interfaces)
# change to C+1:0:0
# - If the interface is the same as the previous version, change to C:R+1:A
CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(LIBWPEBACKEND 1 0 0)
CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(LIBWPE 1 0 0)

project(wpebackend VERSION "${PROJECT_VERSION}")
project(libwpe VERSION "${PROJECT_VERSION}")

set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -D_POSIX_SOURCE")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
Expand Down Expand Up @@ -75,17 +75,17 @@ set(WPE_PUBLIC_HEADERS
include/wpe/wpe.h
)

add_library(WPEBackend SHARED ${WPE_SOURCES})
target_include_directories(WPEBackend PRIVATE ${WPE_INCLUDE_DIRECTORIES})
target_link_libraries(WPEBackend ${WPE_LIBRARIES})
add_library(wpe SHARED ${WPE_SOURCES})
target_include_directories(wpe PRIVATE ${WPE_INCLUDE_DIRECTORIES})
target_link_libraries(wpe ${WPE_LIBRARIES})

set_target_properties(WPEBackend PROPERTIES
OUTPUT_NAME WPEBackend-${WPE_API_VERSION}
VERSION ${LIBWPEBACKEND_VERSION}
SOVERSION ${LIBWPEBACKEND_VERSION_MAJOR}
set_target_properties(wpe PROPERTIES
OUTPUT_NAME wpe-${WPE_API_VERSION}
VERSION ${LIBWPE_VERSION}
SOVERSION ${LIBWPE_VERSION_MAJOR}
)

install(TARGETS WPEBackend
install(TARGETS wpe
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
install(
Expand Down
2 changes: 1 addition & 1 deletion include/wpe/keysyms.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifndef wpe_keysyms_h
#define wpe_keysyms_h

/* This file is autogenerated; use https://github.com/WebPlatformForEmbedded/WPEBackend/blob/master/scripts/update-keysyms-header to update it. */
/* This file is autogenerated; use https://github.com/WebPlatformForEmbedded/libwpe/blob/master/scripts/update-keysyms-header to update it. */
/***********************************************************
Copyright 1987, 1994, 1998 The Open Group
Expand Down
2 changes: 1 addition & 1 deletion scripts/update-keysyms-header
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ output.write('''#if !defined(__WPE_H_INSIDE__) && !defined(WPE_COMPILATION)
#ifndef wpe_keysyms_h
#define wpe_keysyms_h
/* This file is autogenerated; use https://github.com/WebPlatformForEmbedded/WPEBackend/blob/master/scripts/update-keysyms-header to update it. */
/* This file is autogenerated; use https://github.com/WebPlatformForEmbedded/libwpe/blob/master/scripts/update-keysyms-header to update it. */
''')

with open('/usr/include/X11/keysymdef.h') as header:
Expand Down
2 changes: 1 addition & 1 deletion wpe.pc.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ Description: The wpe library
Version: @PROJECT_VERSION@
Requires: xkbcommon
Cflags: -I${includedir}/wpe-@WPE_API_VERSION@
Libs: -L${libdir} -lWPEBackend-@WPE_API_VERSION@
Libs: -L${libdir} -lwpe-@WPE_API_VERSION@

0 comments on commit 0066d95

Please sign in to comment.