smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #529 from kiwix/libkiwix-github-url-fix 

Fix Libkiwix Github repository URLS
This commit is contained in:
Matthieu Gautier 2021-05-21 16:09:15 +02:00 committed by GitHub
parent fc7484ac86 c8b7f8772a
commit 6e37cabaea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -6,12 +6,12 @@ suite core. It contains the code shared by all Kiwix ports (Windows,
GNU/Linux, macOS, Android, iOS, ...). GNU/Linux, macOS, Android, iOS, ...).
[![Download](https://api.bintray.com/packages/kiwix/kiwix/kiwixlib/images/download.svg)](https://bintray.com/kiwix/kiwix/kiwixlib/_latestVersion) [![Download](https://api.bintray.com/packages/kiwix/kiwix/kiwixlib/images/download.svg)](https://bintray.com/kiwix/kiwix/kiwixlib/_latestVersion)
[![Build Status](https://github.com/kiwix/kiwix-lib/workflows/CI/badge.svg?query=branch%3Amaster)](https://github.com/kiwix/kiwix-lib/actions?query=branch%3Amaster) [![Build Status](https://github.com/kiwix/libkiwix/workflows/CI/badge.svg?query=branch%3Amaster)](https://github.com/kiwix/libkiwix/actions?query=branch%3Amaster)
[![CodeFactor](https://www.codefactor.io/repository/github/kiwix/kiwix-lib/badge)](https://www.codefactor.io/repository/github/kiwix/kiwix-lib) [![CodeFactor](https://www.codefactor.io/repository/github/kiwix/libkiwix/badge)](https://www.codefactor.io/repository/github/kiwix/libkiwix)
[![Codecov](https://codecov.io/gh/kiwix/kiwix-lib/branch/master/graph/badge.svg)](https://codecov.io/gh/kiwix/kiwix-lib) [![Codecov](https://codecov.io/gh/kiwix/libkiwix/branch/master/graph/badge.svg)](https://codecov.io/gh/kiwix/libkiwix)
[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) [![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
[![Packaging status](https://repology.org/badge/vertical-allrepos/kiwix-lib.svg)](https://repology.org/project/kiwix-lib/versions) [![Packaging status](https://repology.org/badge/vertical-allrepos/libkiwix.svg)](https://repology.org/project/libkiwix/versions)
Disclaimer Disclaimer
---------- ----------
@ -56,7 +56,7 @@ In the worse case, you will have to download and compile bleeding edge
version by hand. version by hand.
If you want to install these dependencies locally, then use the If you want to install these dependencies locally, then use the
`kiwix-lib` directory as install prefix. `libkiwix` directory as install prefix.
Environment Environment
------------- -------------

8
android-kiwix-lib-publisher/kiwixLibAndroid/build.gradle
View File

@ -29,7 +29,7 @@ task writePom {
version '10.0.0' + (System.env.KIWIXLIB_BUILDVERSION == null ? '' : '-'+System.env.KIWIXLIB_BUILDVERSION) version '10.0.0' + (System.env.KIWIXLIB_BUILDVERSION == null ? '' : '-'+System.env.KIWIXLIB_BUILDVERSION)
packaging 'aar' packaging 'aar'
name 'kiwixlib' name 'kiwixlib'
url 'https://github.com/kiwix/kiwix-lib' url 'https://github.com/kiwix/libkiwix'
licenses { licenses {
license { license {
name 'GPLv3' name 'GPLv3'
@ -44,9 +44,9 @@ task writePom {
} }
} }
scm { scm {
connection 'https://github.com/kiwix/kiwix-lib.git' connection 'https://github.com/kiwix/libkiwix.git'
developerConnection 'https://github.com/kiwix/kiwix-lib.git' developerConnection 'https://github.com/kiwix/libkiwix.git'
url 'https://github.com/kiwix/kiwix-lib' url 'https://github.com/kiwix/libkiwix'
} }
} }
}.withXml { }.withXml {

2
debian/control vendored
View File

@ -15,7 +15,7 @@ Build-Depends: debhelper-compat (= 13),
zlib1g-dev zlib1g-dev
Standards-Version: 4.5.0 Standards-Version: 4.5.0
Section: libs Section: libs
Homepage: https://github.com/kiwix/kiwix-lib Homepage: https://github.com/kiwix/libkiwix
Rules-Requires-Root: no Rules-Requires-Root: no
Package: libkiwix-dev Package: libkiwix-dev

2
meson.build
View File

@ -18,7 +18,7 @@ if wrapper.contains('java')
add_languages('java') add_languages('java')
endif endif
# See https://github.com/kiwix/kiwix-lib/issues/371 # See https://github.com/kiwix/libkiwix/issues/371
if ['arm', 'mips', 'm68k', 'ppc', 'sh4'].contains(target_machine.cpu_family()) if ['arm', 'mips', 'm68k', 'ppc', 'sh4'].contains(target_machine.cpu_family())
extra_libs += '-latomic' extra_libs += '-latomic'
endif endif

6
test/data/library.xml
View File

@ -2,7 +2,7 @@
<book <book
id="raycharles" id="raycharles"
path="./zimfile.zim" path="./zimfile.zim"
url="https://github.com/kiwix/kiwix-lib/raw/master/test/data/zimfile.zim" url="https://github.com/kiwix/libkiwix/raw/master/test/data/zimfile.zim"
title="Ray Charles" title="Ray Charles"
description="Wikipedia articles about Ray Charles" description="Wikipedia articles about Ray Charles"
language="eng" language="eng"
@ -18,7 +18,7 @@
<book <book
id="raycharles_uncategorized" id="raycharles_uncategorized"
path="./zimfile.zim" path="./zimfile.zim"
url="https://github.com/kiwix/kiwix-lib/raw/master/test/data/zimfile.zim" url="https://github.com/kiwix/libkiwix/raw/master/test/data/zimfile.zim"
title="Ray (uncategorized) Charles" title="Ray (uncategorized) Charles"
description="No category is assigned to this library entry." description="No category is assigned to this library entry."
language="eng" language="eng"
@ -34,7 +34,7 @@
<book <book
id="charlesray" id="charlesray"
path="./zimfile.zim" path="./zimfile.zim"
url="https://github.com/kiwix/kiwix-lib/raw/master/test/data/zimfile.zim" url="https://github.com/kiwix/libkiwix/raw/master/test/data/zimfile.zim"
title="Charles, Ray" title="Charles, Ray"
description="Wikipedia articles about Ray Charles" description="Wikipedia articles about Ray Charles"
language="eng" language="eng"

2
test/library.cpp
View File

@ -186,7 +186,7 @@ const char sampleLibraryXML[] = R"(
<book <book
id="raycharles" id="raycharles"
path="./zimfile.zim" path="./zimfile.zim"
url="https://github.com/kiwix/kiwix-lib/raw/master/test/data/zimfile.zim" url="https://github.com/kiwix/libkiwix/raw/master/test/data/zimfile.zim"
title="Ray Charles" title="Ray Charles"
description="Wikipedia articles about Ray Charles" description="Wikipedia articles about Ray Charles"
language="eng" language="eng"

6
test/server.cpp
View File

@ -630,7 +630,7 @@ std::string maskVariableOPDSFeedData(std::string s)
" <publisher>\n" \ " <publisher>\n" \
" <name>Kiwix</name>\n" \ " <name>Kiwix</name>\n" \
" </publisher>\n" \ " </publisher>\n" \
" <link rel=\"http://opds-spec.org/acquisition/open-access\" type=\"application/x-zim\" href=\"https://github.com/kiwix/kiwix-lib/raw/master/test/data/zimfile.zim\" length=\"569344\" />\n" \ " <link rel=\"http://opds-spec.org/acquisition/open-access\" type=\"application/x-zim\" href=\"https://github.com/kiwix/libkiwix/raw/master/test/data/zimfile.zim\" length=\"569344\" />\n" \
" </entry>\n" " </entry>\n"
#define RAY_CHARLES_CATALOG_ENTRY \ #define RAY_CHARLES_CATALOG_ENTRY \
@ -654,7 +654,7 @@ std::string maskVariableOPDSFeedData(std::string s)
" <publisher>\n" \ " <publisher>\n" \
" <name>Kiwix</name>\n" \ " <name>Kiwix</name>\n" \
" </publisher>\n" \ " </publisher>\n" \
" <link rel=\"http://opds-spec.org/acquisition/open-access\" type=\"application/x-zim\" href=\"https://github.com/kiwix/kiwix-lib/raw/master/test/data/zimfile.zim\" length=\"569344\" />\n" \ " <link rel=\"http://opds-spec.org/acquisition/open-access\" type=\"application/x-zim\" href=\"https://github.com/kiwix/libkiwix/raw/master/test/data/zimfile.zim\" length=\"569344\" />\n" \
" </entry>\n" " </entry>\n"
#define UNCATEGORIZED_RAY_CHARLES_CATALOG_ENTRY \ #define UNCATEGORIZED_RAY_CHARLES_CATALOG_ENTRY \
@ -678,7 +678,7 @@ std::string maskVariableOPDSFeedData(std::string s)
" <publisher>\n" \ " <publisher>\n" \
" <name>Kiwix</name>\n" \ " <name>Kiwix</name>\n" \
" </publisher>\n" \ " </publisher>\n" \
" <link rel=\"http://opds-spec.org/acquisition/open-access\" type=\"application/x-zim\" href=\"https://github.com/kiwix/kiwix-lib/raw/master/test/data/zimfile.zim\" length=\"125952\" />\n" \ " <link rel=\"http://opds-spec.org/acquisition/open-access\" type=\"application/x-zim\" href=\"https://github.com/kiwix/libkiwix/raw/master/test/data/zimfile.zim\" length=\"125952\" />\n" \
" </entry>\n" " </entry>\n"
TEST_F(LibraryServerTest, catalog_root_xml) TEST_F(LibraryServerTest, catalog_root_xml)