Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielweck
danielweck committed Feb 2, 2017
2 parents 6ce815f + ae7c0b8 commit 7fe6413
Show file tree
Hide file tree
Showing 112 changed files with 75 additions and 17,710 deletions.
6 changes: 6 additions & 0 deletions Platform/Android/epub3/src/main/jni/packagejni.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,12 @@ JNIEXPORT jstring JNICALL Java_org_readium_sdk_android_Package_nativeGetISBN
jni::StringUTF str(env, (std::string&) PCKG(pckgPtr)->ISBN().stl_str());
return (jstring) str;
}
JNIEXPORT jstring JNICALL Java_org_readium_sdk_android_Package_nativeGetPublisher
(JNIEnv* env, jobject thiz, jlong pckgPtr)
{
jni::StringUTF str(env, (std::string&) PCKG(pckgPtr)->Publisher().stl_str());
return (jstring) str;
}
JNIEXPORT jstring JNICALL Java_org_readium_sdk_android_Package_nativeGetLanguage
(JNIEnv* env, jobject thiz, jlong pckgPtr)
{
Expand Down
8 changes: 8 additions & 0 deletions Platform/Android/lib/src/main/java/org/readium/sdk/android/Package.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ public class Package {
private String type;
private String version;
private String isbn;
private String publisher;
private String language;
private String copyrightOwner;
private String source;
Expand Down Expand Up @@ -155,6 +156,7 @@ private void loadData() {
type = nativeGetType(__nativePtr);
version = nativeGetVersion(__nativePtr);
isbn = nativeGetISBN(__nativePtr);
publisher = nativeGetPublisher(__nativePtr);
language = nativeGetLanguage(__nativePtr);
copyrightOwner = nativeGetCopyrightOwner(__nativePtr);
source = nativeGetSource(__nativePtr);
Expand Down Expand Up @@ -186,6 +188,7 @@ private void loadData() {
Log.i(TAG, "type: "+type);
Log.i(TAG, "version: "+version);
Log.i(TAG, "isbn: "+isbn);
Log.i(TAG, "publisher:" +publisher);
Log.i(TAG, "language: "+language);
Log.i(TAG, "copyrightOwner: "+copyrightOwner);
Log.i(TAG, "source: "+source);
Expand Down Expand Up @@ -263,6 +266,10 @@ public String getIsbn() {
return isbn;
}

public String getPublisher() {
return publisher;
}

public String getLanguage() {
return language;
}
Expand Down Expand Up @@ -513,6 +520,7 @@ public JSONObject toJSON() {
private native String nativeGetType(long nativePtr);
private native String nativeGetVersion(long nativePtr);
private native String nativeGetISBN(long nativePtr);
private native String nativeGetPublisher(long nativePtr);
private native String nativeGetLanguage(long nativePtr);
private native String nativeGetCopyrightOwner(long nativePtr);
private native String nativeGetSource(long nativePtr);
Expand Down
1 change: 1 addition & 0 deletions Platform/Apple/RDServices/Main/RDPackage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
@property (nonatomic, readonly) NSDictionary *dictionary;
@property (nonatomic, readonly) NSString *fullTitle;
@property (nonatomic, readonly) NSString *isbn;
@property (nonatomic, readonly) NSString *publisher;
@property (nonatomic, readonly) NSString *language;
@property (nonatomic, readonly) RDNavigationElement *listOfFigures;
@property (nonatomic, readonly) RDNavigationElement *listOfIllustrations;
Expand Down
4 changes: 4 additions & 0 deletions Platform/Apple/RDServices/Main/RDPackage.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,10 @@ - (NSString *)isbn {
return [NSString stringWithUTF8String:s.c_str()];
}

- (NSString *)publisher {
const ePub3::string s = m_package->Publisher();
return [NSString stringWithUTF8String:s.c_str()];
}

- (NSString *)language {
const ePub3::string s = m_package->Language();
Expand Down
47 changes: 40 additions & 7 deletions Platform/Apple/ePub3.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1944,7 +1944,7 @@
ABA72C1B1655382E003125FF /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0510;
LastUpgradeCheck = 0800;
ORGANIZATIONNAME = "The Readium Foundation and contributors";
};
buildConfigurationList = ABA72C1E1655382E003125FF /* Build configuration list for PBXProject "ePub3" */;
Expand Down Expand Up @@ -2358,7 +2358,7 @@
/usr/include/libxml2,
"$(SRCROOT)/include",
);
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LIBRARY_SEARCH_PATHS = "";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -2381,7 +2381,7 @@
/usr/include/libxml2,
"$(SRCROOT)/include",
);
IPHONEOS_DEPLOYMENT_TARGET = 6.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LIBRARY_SEARCH_PATHS = "";
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -2395,14 +2395,24 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"BUILDING_EPUB3=1",
Expand All @@ -2412,36 +2422,59 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MACOSX_DEPLOYMENT_TARGET = 10.9;
ONLY_ACTIVE_ARCH = YES;
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-Wno-inconsistent-missing-override",
);
SDKROOT = macosx;
STRIP_INSTALLED_PRODUCT = NO;
};
name = Debug;
};
ABA72C301655382E003125FF /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_NO_COMMON_BLOCKS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
"BUILDING_EPUB3=1",
"NDEBUG=1",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.8;
MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-Wno-inconsistent-missing-override",
);
SDKROOT = macosx;
STRIP_INSTALLED_PRODUCT = NO;
};
name = Release;
};
Expand Down
35 changes: 0 additions & 35 deletions ePub3/ThirdParty/google-url/.svn/all-wcprops
View file

This file was deleted.

Loading

0 comments on commit 7fe6413

Please sign in to comment.