Skip to content
This repository was archived by the owner on May 7, 2025. It is now read-only.

Commit 6106356

Browse files
committed
Merge branch 'develop'
2 parents ff87a55 + e8e4a3a commit 6106356

File tree

103 files changed

+879
-317
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+879
-317
lines changed

.github/CONTRIBUTING.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# How to contribute to Readium
2+
3+
Please visit this link for more information:
4+
http://readium.github.io/contributing.html

.github/ISSUE_TEMPLATE.md

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
*General Instructions*
2+
3+
- *Please use a short, but meaningful title.*
4+
- *Delete everything in italics before submitting issue*
5+
- *Make sure to fill in as much information as possible*
6+
7+
#### This issue is a Bug|Feature Request|Enhancement|Question|Task|Other
8+
*(choose ONE from the above list and delete the others)*
9+
10+
#### Related issue(s) and/or pull request(s)
11+
*Example: See also #NUMBER*
12+
13+
#### Expected Behaviour
14+
*What you expected Readium to do...*
15+
16+
#### Observed behaviour
17+
*Instead, Readium does...*
18+
19+
#### Steps to reproduce
20+
1. First, do this
21+
2. Then do this
22+
3. etc.
23+
24+
#### Test file(s)
25+
*If relevant, please indicate public EPUB URL(s), or whether you can share ebook(s) privately. It is often next to impossible to reproduce bugs without the original file.*
26+
27+
### Product
28+
*Choose one of the following (and delete the others)*
29+
30+
* Readium Chrome extension
31+
* latest official version available from the Chrome Web Store
32+
* Version of the Chrome browser
33+
* OS and version
34+
* Readium cloud reader app
35+
* latest development build uploaded at https://readium.firebaseapp.com OR a custom integration (list public deployment URL, if any)
36+
* Browser and version
37+
* OS and version
38+
* Native application (Readium SDK C++)
39+
* official "launcher" sample OR propietary app
40+
* OS and version
41+
* Hybrid app (ReadiumJS)
42+
* Electron OR Apache Cordova OR ?
43+
* OS and version
44+
* Other?
45+
46+
#### Additional information
47+
*Please list any additional information that might help us*

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
*General Instructions*
2+
3+
- *Please use a short, but meaningful title.*
4+
- *Delete everything in italics before submitting the pull request*
5+
- *Make sure to fill in as much information as possible*
6+
7+
#### This pull request is a Work In Progress|Finalized|Other
8+
*(choose ONE from the above list and delete the others)*
9+
10+
#### Related issue(s) and/or pull request(s)
11+
*Example: See also #NUMBER*
12+
13+
#### Test cases, sample files
14+
15+
*(if relevant, please indicate public EPUB URL(s), or whether you can share ebook(s) privately)*
16+
17+
18+
### Additional information
19+
*Please provide any and all information that might help us*

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
# generated files
1717
bin/
1818
gen/
19+
build/
20+
.gradle/
1921

2022
# Local configuration file (sdk path, etc)
2123
local.properties
@@ -27,6 +29,10 @@ local.properties
2729
# IDEA project files
2830
.idea
2931

32+
SDKLauncher-Android/app/src/main/assets/readium-shared-js/builds
3033
SDKLauncher-Android/assets/readium-shared-js/epubReadingSystem_.js
3134
SDKLauncher-Android/.settings/org.eclipse.core.resources.prefs
32-
SDKLauncher-Android/lint.xml
35+
SDKLauncher-Android/lint.xml
36+
37+
SDKLauncher-Android/SDKLauncher-Android.iml
38+
SDKLauncher-Android/app/app.iml

README.md

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,27 @@ develop [![Build Status](http://jenkinsmaster.datalogics-cloud.com:8080/buildSta
1313

1414
How to get source from github
1515
-------------------------------
16-
git clone --recursive https://github.com/readium/Launcher-Android.git
16+
git clone --recursive https://github.com/readium/SDKLauncher-Android.git
1717

18-
How to build Readium SDK
19-
-------------------------------
18+
19+
Debug C++ code on Android Studio 2
20+
----------------------------------
21+
22+
Gradle experimental build plugin and Android Studio 2 are required to debug C++ code.
23+
By default the project uses stable version of gradle plugin but you can switch easily to the experimental one by adding the following line to local.properties file:
2024
````
21-
cd readium-sdk/Platform/Android
22-
./ndk-compile.sh build your-ndk-path
25+
readium.ndk_debug=true
2326
````
24-
How to open eclipse project
25-
----------------------
26-
Use File->Import... menu, don't use File->New menu
27+
28+
This settings will switch the build system to the gradle experimental version and allow you to debug, add breakpoints on the C++ code.
29+
30+
You must be careful that if you switch from the stable to the experimental version, you have first to delete all intermediate build files in:
31+
- Platform/Android/epub3/build
32+
- Platform/Android/include
33+
- Platform/Android/obj
34+
- Platform/Android/libs
35+
36+
If you forget to delete these files, the application will crash because of bad version of shared and static libraries.
2737

2838
Licensing info
2939
----------------

SDKLauncher-Android/.classpath

Lines changed: 0 additions & 9 deletions
This file was deleted.

SDKLauncher-Android/.externalToolBuilders/navigator.epubReadingSystem Git version info CLEANUP.launch

Lines changed: 0 additions & 10 deletions
This file was deleted.

SDKLauncher-Android/.externalToolBuilders/navigator.epubReadingSystem Git version info.launch

Lines changed: 0 additions & 10 deletions
This file was deleted.

SDKLauncher-Android/.project

Lines changed: 0 additions & 57 deletions
This file was deleted.

SDKLauncher-Android/.settings/org.eclipse.jdt.core.prefs

Lines changed: 0 additions & 5 deletions
This file was deleted.

SDKLauncher-Android/app/build.gradle

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
if (rootProject.hasProperty("readium_ndk_debug") && rootProject.readium_ndk_debug) {
2+
// Use gradle experimental receipt to debug C/C++ code
3+
println "${project.name}: Use gradle experimental to build application"
4+
apply from: 'build_experimental.gradle'
5+
} else {
6+
apply from: 'build_stable.gradle'
7+
}
8+
9+
repositories {
10+
mavenCentral()
11+
flatDir {
12+
dirs '../libs'
13+
}
14+
}
15+
16+
dependencies {
17+
compile fileTree(dir: '../libs', include: '*.jar')
18+
}
19+
20+
task buildCssAssets(type: Copy) {
21+
from '../../readium-shared-js/build-output/css'
22+
into './src/main/assets/readium-shared-js/builds/css'
23+
}
24+
25+
task buildSingleBundleAssets(type: Copy) {
26+
from '../../readium-shared-js/build-output/_multiple-bundles'
27+
into './src/main/assets/readium-shared-js/builds/multiple-bundle'
28+
}
29+
30+
task buildMultipleBundleAssets(type: Copy) {
31+
from '../../readium-shared-js/build-output/_single-bundle'
32+
into './src/main/assets/readium-shared-js/builds/single-bundle'
33+
}
34+
35+
task buildAssets {
36+
println "Build Js Assets"
37+
}
38+
39+
buildAssets.dependsOn "buildCssAssets",
40+
"buildSingleBundleAssets",
41+
"buildMultipleBundleAssets"
42+
43+
apply from: 'build_epubReadingSystem.gradle'
44+
45+
tasks.whenTaskAdded { task ->
46+
def taskName = task.name
47+
48+
if (taskName.startsWith("compile")) {
49+
task.dependsOn "buildAssets",
50+
":epub3:buildMk",
51+
"buildEpubReadingSystem"
52+
}
53+
}

0 commit comments

Comments
 (0)