From 1a76c9ea3b686aeda8c50200d87b464c1414be29 Mon Sep 17 00:00:00 2001 From: Adrien de Sentenac Date: Tue, 3 May 2016 21:21:35 -0400 Subject: [PATCH] Add OBB (zip) support (#15515) * Add OBB support. OBB must be a zip file with audio and video files stored uncompressed. * Use introspection to be able to build with Android API level 10. Using the new audio engine to play sounds from the OBB will only work with API level 12 (Android 3.1) or above. --- cocos/audio/android/AudioEngine-inl.cpp | 29 +-- cocos/base/ZipUtils.cpp | 29 +++ cocos/base/ZipUtils.h | 9 + .../platform/android/CCFileUtils-android.cpp | 35 ++- cocos/platform/android/CCFileUtils-android.h | 4 + .../com.android.vending.expansion.zipfile.jar | Bin 0 -> 12370 bytes .../src/org/cocos2dx/lib/Cocos2dxHelper.java | 85 +++++++- .../src/org/cocos2dx/lib/Cocos2dxMusic.java | 20 +- .../src/org/cocos2dx/lib/Cocos2dxSound.java | 10 +- .../Java_org_cocos2dx_lib_Cocos2dxHelper.cpp | 25 +++ .../Java_org_cocos2dx_lib_Cocos2dxHelper.h | 1 + ..._com.android.vending.expansion.zipfile.txt | 202 ++++++++++++++++++ 12 files changed, 423 insertions(+), 26 deletions(-) create mode 100644 cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar create mode 100644 licenses/LICENSE_com.android.vending.expansion.zipfile.txt diff --git a/cocos/audio/android/AudioEngine-inl.cpp b/cocos/audio/android/AudioEngine-inl.cpp index f5dbd3a64b..2e1f2e9e14 100644 --- a/cocos/audio/android/AudioEngine-inl.cpp +++ b/cocos/audio/android/AudioEngine-inl.cpp @@ -38,6 +38,7 @@ #include "base/CCDirector.h" #include "base/CCScheduler.h" #include "platform/android/CCFileUtils-android.h" +#include "platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" using namespace cocos2d; using namespace cocos2d::experimental; @@ -104,27 +105,31 @@ bool AudioPlayer::init(SLEngineItf engineEngine, SLObjectItf outputMixObject,con SLDataFormat_MIME format_mime = {SL_DATAFORMAT_MIME, NULL, SL_CONTAINERTYPE_UNSPECIFIED}; audioSrc.pFormat = &format_mime; - if (fileFullPath[0] != '/'){ - std::string relativePath = ""; - + if (fileFullPath[0] != '/') { + off_t start, length; + std::string relativePath; size_t position = fileFullPath.find("assets/"); + if (0 == position) { // "assets/" is at the beginning of the path and we don't want it - relativePath += fileFullPath.substr(strlen("assets/")); + relativePath = fileFullPath.substr(strlen("assets/")); } else { - relativePath += fileFullPath; + relativePath = fileFullPath; } - auto asset = AAssetManager_open(cocos2d::FileUtilsAndroid::getAssetManager(), relativePath.c_str(), AASSET_MODE_UNKNOWN); - - // open asset as file descriptor - off_t start, length; - _assetFd = AAsset_openFileDescriptor(asset, &start, &length); - if (_assetFd <= 0){ + if (cocos2d::FileUtilsAndroid::getObbFile() != nullptr) { + _assetFd = getObbAssetFileDescriptorJNI(relativePath.c_str(), &start, &length); + } else { + auto asset = AAssetManager_open(cocos2d::FileUtilsAndroid::getAssetManager(), relativePath.c_str(), AASSET_MODE_UNKNOWN); + // open asset as file descriptor + _assetFd = AAsset_openFileDescriptor(asset, &start, &length); AAsset_close(asset); + } + + if (_assetFd <= 0) { + CCLOGERROR("Failed to open file descriptor for '%s'", fileFullPath.c_str()); break; } - AAsset_close(asset); // configure audio source loc_fd = {SL_DATALOCATOR_ANDROIDFD, _assetFd, start, length}; diff --git a/cocos/base/ZipUtils.cpp b/cocos/base/ZipUtils.cpp index db9d35cc61..4737384b89 100644 --- a/cocos/base/ZipUtils.cpp +++ b/cocos/base/ZipUtils.cpp @@ -645,6 +645,35 @@ unsigned char *ZipFile::getFileData(const std::string &fileName, ssize_t *size) return buffer; } +bool ZipFile::getFileData(const std::string &fileName, ResizableBuffer* buffer) +{ + bool res = false; + do + { + CC_BREAK_IF(!_data->zipFile); + CC_BREAK_IF(fileName.empty()); + + ZipFilePrivate::FileListContainer::const_iterator it = _data->fileList.find(fileName); + CC_BREAK_IF(it == _data->fileList.end()); + + ZipEntryInfo fileInfo = it->second; + + int nRet = unzGoToFilePos(_data->zipFile, &fileInfo.pos); + CC_BREAK_IF(UNZ_OK != nRet); + + nRet = unzOpenCurrentFile(_data->zipFile); + CC_BREAK_IF(UNZ_OK != nRet); + + buffer->resize(fileInfo.uncompressed_size); + int CC_UNUSED nSize = unzReadCurrentFile(_data->zipFile, buffer->buffer(), static_cast(fileInfo.uncompressed_size)); + CCASSERT(nSize == 0 || nSize == (int)fileInfo.uncompressed_size, "the file size is wrong"); + unzCloseCurrentFile(_data->zipFile); + res = true; + } while (0); + + return res; +} + std::string ZipFile::getFirstFilename() { if (unzGoToFirstFile(_data->zipFile) != UNZ_OK) return emptyFilename; diff --git a/cocos/base/ZipUtils.h b/cocos/base/ZipUtils.h index a06ac9fa1f..4a6352e32f 100644 --- a/cocos/base/ZipUtils.h +++ b/cocos/base/ZipUtils.h @@ -31,6 +31,7 @@ THE SOFTWARE. #include "platform/CCPlatformConfig.h" #include "platform/CCPlatformMacros.h" #include "platform/CCPlatformDefine.h" +#include "platform/CCFileUtils.h" #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) #include "platform/android/CCFileUtils-android.h" @@ -275,6 +276,14 @@ typedef struct unz_file_info_s unz_file_info; * @since v2.0.5 */ unsigned char *getFileData(const std::string &fileName, ssize_t *size); + + /** + * Get resource file data from a zip file. + * @param fileName File name + * @param[out] buffer If the file read operation succeeds, if will contain the file data. + * @return True if successful. + */ + bool getFileData(const std::string &fileName, ResizableBuffer* buffer); std::string getFirstFilename(); std::string getNextFilename(); diff --git a/cocos/platform/android/CCFileUtils-android.cpp b/cocos/platform/android/CCFileUtils-android.cpp index 5f4f3bdedd..8023aa6913 100644 --- a/cocos/platform/android/CCFileUtils-android.cpp +++ b/cocos/platform/android/CCFileUtils-android.cpp @@ -29,8 +29,10 @@ THE SOFTWARE. #include "platform/android/CCFileUtils-android.h" #include "platform/CCCommon.h" #include "platform/android/jni/JniHelper.h" +#include "platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h" #include "android/asset_manager.h" #include "android/asset_manager_jni.h" +#include "base/ZipUtils.h" #include #include @@ -42,6 +44,7 @@ using namespace std; NS_CC_BEGIN AAssetManager* FileUtilsAndroid::assetmanager = nullptr; +ZipFile* FileUtilsAndroid::obbfile = nullptr; void FileUtilsAndroid::setassetmanager(AAssetManager* a) { if (nullptr == a) { @@ -57,7 +60,7 @@ FileUtils* FileUtils::getInstance() if (s_sharedFileUtils == nullptr) { s_sharedFileUtils = new FileUtilsAndroid(); - if(!s_sharedFileUtils->init()) + if (!s_sharedFileUtils->init()) { delete s_sharedFileUtils; s_sharedFileUtils = nullptr; @@ -73,11 +76,22 @@ FileUtilsAndroid::FileUtilsAndroid() FileUtilsAndroid::~FileUtilsAndroid() { + if (obbfile) + { + delete obbfile; + obbfile = nullptr; + } } bool FileUtilsAndroid::init() { _defaultResRootPath = "assets/"; + + std::string assetsPath(getApkPath()); + if (assetsPath.find("/obb/") != std::string::npos) + { + obbfile = new ZipFile(assetsPath); + } return FileUtils::init(); } @@ -149,9 +163,14 @@ bool FileUtilsAndroid::isFileExistInternal(const std::string& strFilePath) const const char* s = strFilePath.c_str(); // Found "assets/" at the beginning of the path and we don't want it - if (strFilePath.find(_defaultResRootPath) == 0) s += strlen("assets/"); - - if (FileUtilsAndroid::assetmanager) { + if (strFilePath.find(_defaultResRootPath) == 0) s += _defaultResRootPath.length(); + + if (obbfile && obbfile->fileExists(s)) + { + bFound = true; + } + else if (FileUtilsAndroid::assetmanager) + { AAsset* aa = AAssetManager_open(FileUtilsAndroid::assetmanager, s, AASSET_MODE_UNKNOWN); if (aa) { @@ -165,7 +184,7 @@ bool FileUtilsAndroid::isFileExistInternal(const std::string& strFilePath) const else { FILE *fp = fopen(strFilePath.c_str(), "r"); - if(fp) + if (fp) { bFound = true; fclose(fp); @@ -249,6 +268,12 @@ FileUtils::Status FileUtilsAndroid::getContents(const std::string& filename, Res } else { relativePath = fullPath; } + + if (obbfile) + { + if (obbfile->getFileData(relativePath, buffer)) + return FileUtils::Status::OK; + } if (nullptr == assetmanager) { LOGD("... FileUtilsAndroid::assetmanager is nullptr"); diff --git a/cocos/platform/android/CCFileUtils-android.h b/cocos/platform/android/CCFileUtils-android.h index 6d77713ee7..023efb5af9 100644 --- a/cocos/platform/android/CCFileUtils-android.h +++ b/cocos/platform/android/CCFileUtils-android.h @@ -38,6 +38,8 @@ Copyright (c) 2013-2014 Chukong Technologies Inc. NS_CC_BEGIN +class ZipFile; + /** * @addtogroup platform * @{ @@ -57,6 +59,7 @@ public: static void setassetmanager(AAssetManager* a); static AAssetManager* getAssetManager() { return assetmanager; } + static ZipFile* getObbFile() { return obbfile; } /* override functions */ bool init() override; @@ -73,6 +76,7 @@ private: virtual bool isDirectoryExistInternal(const std::string& dirPath) const override; static AAssetManager* assetmanager; + static ZipFile* obbfile; }; // end of platform group diff --git a/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar b/cocos/platform/android/java/libs/com.android.vending.expansion.zipfile.jar new file mode 100644 index 0000000000000000000000000000000000000000..bbdeb8a5ee323b89dd2cf420a348080a5a7761a6 GIT binary patch literal 12370 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 B#+m>C literal 0 HcmV?d00001 diff --git a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java index 9cd24e82f9..6b14a5a9de 100644 --- a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java +++ b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxHelper.java @@ -31,19 +31,31 @@ import android.content.Intent; import android.content.ServiceConnection; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager.NameNotFoundException; +import android.content.res.AssetFileDescriptor; import android.content.res.AssetManager; import android.net.Uri; import android.os.Build; +import android.os.Environment; import android.os.IBinder; +import android.os.ParcelFileDescriptor; import android.os.Vibrator; import android.preference.PreferenceManager.OnActivityResultListener; import android.util.DisplayMetrics; +import android.util.Log; import android.view.Display; import android.view.WindowManager; +import com.android.vending.expansion.zipfile.APKExpansionSupport; +import com.android.vending.expansion.zipfile.ZipResourceFile; + import com.enhance.gameservice.IGameTuningService; +import java.io.IOException; +import java.io.File; import java.io.UnsupportedEncodingException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.util.LinkedHashSet; import java.util.Locale; import java.util.Map; @@ -55,6 +67,7 @@ public class Cocos2dxHelper { // =========================================================== private static final String PREFS_NAME = "Cocos2dxPrefsFile"; private static final int RUNNABLES_PER_FRAME = 5; + private static final String TAG = Cocos2dxHelper.class.getSimpleName(); // =========================================================== // Fields @@ -77,6 +90,12 @@ public class Cocos2dxHelper { private static final int BOOST_TIME = 7; //Enhance API modification end + // The absolute path to the OBB if it exists, else the absolute path to the APK. + private static String sAssetsPath = ""; + + // The OBB file + private static ZipResourceFile sOBBFile = null; + // =========================================================== // Constructors // =========================================================== @@ -91,11 +110,11 @@ public class Cocos2dxHelper { Cocos2dxHelper.sCocos2dxHelperListener = (Cocos2dxHelperListener)activity; if (!sInited) { final ApplicationInfo applicationInfo = activity.getApplicationInfo(); - + Cocos2dxHelper.sPackageName = applicationInfo.packageName; Cocos2dxHelper.sFileDirectory = activity.getFilesDir().getAbsolutePath(); - Cocos2dxHelper.nativeSetApkPath(applicationInfo.sourceDir); + Cocos2dxHelper.nativeSetApkPath(Cocos2dxHelper.getAssetsPath()); Cocos2dxHelper.sCocos2dxAccelerometer = new Cocos2dxAccelerometer(activity); Cocos2dxHelper.sCocos2dMusic = new Cocos2dxMusic(activity); @@ -114,9 +133,48 @@ public class Cocos2dxHelper { serviceIntent.setPackage("com.enhance.gameservice"); boolean suc = activity.getApplicationContext().bindService(serviceIntent, connection, Context.BIND_AUTO_CREATE); //Enhance API modification end + + int versionCode = 1; + try { + versionCode = Cocos2dxActivity.getContext().getPackageManager().getPackageInfo(Cocos2dxHelper.getCocos2dxPackageName(), 0).versionCode; + } catch (NameNotFoundException e) { + e.printStackTrace(); + } + try { + Cocos2dxHelper.sOBBFile = APKExpansionSupport.getAPKExpansionZipFile(Cocos2dxActivity.getContext(), versionCode, 0); + } catch (IOException e) { + e.printStackTrace(); + } } } + // This function returns the absolute path to the OBB if it exists, + // else it returns the absolute path to the APK. + public static String getAssetsPath() + { + if (Cocos2dxHelper.sAssetsPath == "") { + int versionCode = 1; + try { + versionCode = Cocos2dxHelper.sActivity.getPackageManager().getPackageInfo(Cocos2dxHelper.sPackageName, 0).versionCode; + } catch (NameNotFoundException e) { + e.printStackTrace(); + } + String pathToOBB = Environment.getExternalStorageDirectory().getAbsolutePath() + "/Android/obb/" + Cocos2dxHelper.sPackageName + "/main." + versionCode + "." + Cocos2dxHelper.sPackageName + ".obb"; + File obbFile = new File(pathToOBB); + if (obbFile.exists()) + Cocos2dxHelper.sAssetsPath = pathToOBB; + else + Cocos2dxHelper.sAssetsPath = Cocos2dxHelper.sActivity.getApplicationInfo().sourceDir; + } + + return Cocos2dxHelper.sAssetsPath; + } + + public static ZipResourceFile getObbFile() + { + return Cocos2dxHelper.sOBBFile; + } + //Enhance API modification begin private static ServiceConnection connection = new ServiceConnection() { public void onServiceConnected(ComponentName name, IBinder service) { @@ -226,6 +284,29 @@ public class Cocos2dxHelper { } return ret; } + + public static long[] getObbAssetFileDescriptor(final String path) { + long[] array = new long[3]; + if (Cocos2dxHelper.sOBBFile != null) { + AssetFileDescriptor descriptor = Cocos2dxHelper.sOBBFile.getAssetFileDescriptor(path); + if (descriptor != null) { + try { + ParcelFileDescriptor parcel = descriptor.getParcelFileDescriptor(); + Method method = parcel.getClass().getMethod("getFd", new Class[] {}); + array[0] = (Integer)method.invoke(parcel); + array[1] = descriptor.getStartOffset(); + array[2] = descriptor.getLength(); + } catch (NoSuchMethodException e) { + Log.e(Cocos2dxHelper.TAG, "Accessing file descriptor directly from the OBB is only supported from Android 3.1 (API level 12) and above."); + } catch (IllegalAccessException e) { + Log.e(Cocos2dxHelper.TAG, e.toString()); + } catch (InvocationTargetException e) { + Log.e(Cocos2dxHelper.TAG, e.toString()); + } + } + } + return array; + } public static void preloadBackgroundMusic(final String pPath) { Cocos2dxHelper.sCocos2dMusic.preloadBackgroundMusic(pPath); diff --git a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java index 0e9f2e499f..8d45f12a34 100644 --- a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java +++ b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java @@ -29,6 +29,9 @@ import android.content.Context; import android.content.res.AssetFileDescriptor; import android.media.MediaPlayer; import android.util.Log; +import android.content.res.AssetFileDescriptor; +import com.android.vending.expansion.zipfile.APKExpansionSupport; +import com.android.vending.expansion.zipfile.ZipResourceFile; import java.io.FileInputStream; @@ -134,9 +137,9 @@ public class Cocos2dxMusic { public void stopBackgroundMusic() { if (this.mBackgroundMediaPlayer != null) { - mBackgroundMediaPlayer.release(); - mBackgroundMediaPlayer = createMediaplayer(mCurrentPath); - + mBackgroundMediaPlayer.release(); + mBackgroundMediaPlayer = createMediaplayer(mCurrentPath); + /** * should set the state, if not, the following sequence will be error * play -> pause -> stop -> resume @@ -163,7 +166,7 @@ public class Cocos2dxMusic { public void rewindBackgroundMusic() { if (this.mBackgroundMediaPlayer != null) { - playBackgroundMusic(mCurrentPath, mIsLoop); + playBackgroundMusic(mCurrentPath, mIsLoop); } } @@ -250,8 +253,13 @@ public class Cocos2dxMusic { mediaPlayer.setDataSource(fis.getFD()); fis.close(); } else { - final AssetFileDescriptor assetFileDescritor = this.mContext.getAssets().openFd(path); - mediaPlayer.setDataSource(assetFileDescritor.getFileDescriptor(), assetFileDescritor.getStartOffset(), assetFileDescritor.getLength()); + if (Cocos2dxHelper.getObbFile() != null) { + final AssetFileDescriptor assetFileDescriptor = Cocos2dxHelper.getObbFile().getAssetFileDescriptor(path); + mediaPlayer.setDataSource(assetFileDescriptor.getFileDescriptor(), assetFileDescriptor.getStartOffset(), assetFileDescriptor.getLength()); + } else { + final AssetFileDescriptor assetFileDescriptor = this.mContext.getAssets().openFd(path); + mediaPlayer.setDataSource(assetFileDescriptor.getFileDescriptor(), assetFileDescriptor.getStartOffset(), assetFileDescriptor.getLength()); + } } mediaPlayer.prepare(); diff --git a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java index a54317020d..abbf2441cc 100644 --- a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java +++ b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java @@ -28,6 +28,9 @@ import android.content.Context; import android.media.AudioManager; import android.media.SoundPool; import android.util.Log; +import android.content.res.AssetFileDescriptor; +import com.android.vending.expansion.zipfile.APKExpansionSupport; +import com.android.vending.expansion.zipfile.ZipResourceFile; import java.util.ArrayList; import java.util.HashMap; @@ -273,7 +276,12 @@ public class Cocos2dxSound { if (path.startsWith("/")) { soundID = this.mSoundPool.load(path, 0); } else { - soundID = this.mSoundPool.load(this.mContext.getAssets().openFd(path), 0); + if (Cocos2dxHelper.getObbFile() != null) { + final AssetFileDescriptor assetFileDescriptor = Cocos2dxHelper.getObbFile().getAssetFileDescriptor(path); + soundID = mSoundPool.load(assetFileDescriptor, 0); + } else { + soundID = this.mSoundPool.load(this.mContext.getAssets().openFd(path), 0); + } } } catch (final Exception e) { soundID = Cocos2dxSound.INVALID_SOUND_ID; diff --git a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp index 6394a470d1..391c07063f 100644 --- a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp +++ b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp @@ -87,6 +87,31 @@ std::string getPackageNameJNI() { return JniHelper::callStaticStringMethod(className, "getCocos2dxPackageName"); } +int getObbAssetFileDescriptorJNI(const char* path, long* startOffset, long* size) { + JniMethodInfo methodInfo; + int fd = 0; + + if (JniHelper::getStaticMethodInfo(methodInfo, className.c_str(), "getObbAssetFileDescriptor", "(Ljava/lang/String;)[J")) { + jstring stringArg = methodInfo.env->NewStringUTF(path); + jlongArray newArray = (jlongArray)methodInfo.env->CallStaticObjectMethod(methodInfo.classID, methodInfo.methodID, stringArg); + jsize theArrayLen = methodInfo.env->GetArrayLength(newArray); + + if (theArrayLen == 3) { + jboolean copy = JNI_FALSE; + jlong *array = methodInfo.env->GetLongArrayElements(newArray, ©); + fd = static_cast(array[0]); + *startOffset = array[1]; + *size = array[2]; + methodInfo.env->ReleaseLongArrayElements(newArray, array, 0); + } + + methodInfo.env->DeleteLocalRef(methodInfo.classID); + methodInfo.env->DeleteLocalRef(stringArg); + } + + return fd; +} + void conversionEncodingJNI(const char* src, int byteSize, const char* fromCharset, char* dst, const char* newCharset) { JniMethodInfo methodInfo; diff --git a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h index e32a8e79c9..e545eca032 100644 --- a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h +++ b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h @@ -31,6 +31,7 @@ typedef void (*EditTextCallback)(const char* text, void* ctx); extern const char * getApkPath(); extern std::string getPackageNameJNI(); +extern int getObbAssetFileDescriptorJNI(const char* path, long* startOffset, long* size); extern void conversionEncodingJNI(const char* src, int byteSize, const char* fromCharset, char* dst, const char* newCharset); #endif /* __Java_org_cocos2dx_lib_Cocos2dxHelper_H__ */ diff --git a/licenses/LICENSE_com.android.vending.expansion.zipfile.txt b/licenses/LICENSE_com.android.vending.expansion.zipfile.txt new file mode 100644 index 0000000000..d645695673 --- /dev/null +++ b/licenses/LICENSE_com.android.vending.expansion.zipfile.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License.