diff --git a/guava/LICENSE b/guava/LICENSE new file mode 100644 index 0000000000..d645695673 --- /dev/null +++ b/guava/LICENSE @@ -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. diff --git a/guava/Makefile b/guava/Makefile index da3c277ce9..0a41546e84 100644 --- a/guava/Makefile +++ b/guava/Makefile @@ -54,7 +54,10 @@ DIST_LIBRARY = $(ARCH_LIB_DIR)/libguava.a JAR = $(BUILD_DIR)/j2objc_guava.jar DIST_JAR = $(DIST_JAR_DIR)/j2objc_guava.jar -dist: $(DIST_LIBRARY) $(DIST_JAR) +GUAVA_LICENSE = LICENSE +GUAVA_LICENSE_DIST = $(DIST_LICENSE_DIR)/guava_license.txt + +dist: $(DIST_LIBRARY) $(DIST_JAR) $(GUAVA_LICENSE_DIST) @(cd $(GEN_OBJC_DIR) && tar cf - $(TRANSLATE_HEADERS:$(GEN_OBJC_DIR)/%=%)) \ | (cd $(ARCH_INCLUDE_DIR); tar xfp -) @@ -63,6 +66,7 @@ test: $(FAT_LIB_LIBRARY) clean: @rm -rf $(BUILD_DIR) $(DIST_LIBRARY) $(ARCH_INCLUDE_DIR)/com/google/common $(DIST_JAR) + @rm -rf $(GUAVA_LICENSE_DIST) java: $(DIST_JAR) @@ -81,6 +85,10 @@ $(DIST_JAR): $(JAR) | $(DIST_JAR_DIR) $(DIST_LIBRARY): $(FAT_LIB_LIBRARY) | $(ARCH_LIB_DIR) install -m 0644 $< $@ +$(GUAVA_LICENSE_DIST): $(GUAVA_LICENSE) + @mkdir -p $(@D) + @install -m 0644 $< $@ + $(JAVA_SOURCES_MANIFEST): $(JAVA_SOURCES) | $(BUILD_DIR) @echo "Building $$(basename $@)" @if [ -e $@ ]; then rm $@; fi diff --git a/inject/javax_inject/LICENSE b/inject/javax_inject/LICENSE new file mode 100644 index 0000000000..bd9c7f0237 --- /dev/null +++ b/inject/javax_inject/LICENSE @@ -0,0 +1,202 @@ +JSR-330 + 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. diff --git a/inject/javax_inject/Makefile b/inject/javax_inject/Makefile index cf5abd78b6..69e63b95c2 100644 --- a/inject/javax_inject/Makefile +++ b/inject/javax_inject/Makefile @@ -48,6 +48,9 @@ FAT_LIB_SOURCE_DIRS = $(GEN_OBJC_DIR) FAT_LIB_COMPILE = $(J2OBJCC) -fobjc-abi-version=2 -fobjc-legacy-dispatch include $(J2OBJC_ROOT)/make/fat_lib.mk +JSR330_LICENSE = LICENSE +JSR330_LICENSE_DIST = $(DIST_LICENSE_DIR)/jsr330_license.txt + default: lib java: jar @@ -72,6 +75,10 @@ $(ARCH_INCLUDE_DIR)/%.h: $(GEN_OBJC_DIR)/%.h @mkdir -p $(@D) install -m 0644 $< $@ +$(JSR330_LICENSE_DIST): $(JSR330_LICENSE) + @mkdir -p $(@D) + @install -m 0644 $< $@ + $(JAVA_SOURCES_MANIFEST): $(EXTRACTED_JAVA) | $(BUILD_DIR) @echo "Building $$(basename $@)" @if [ -e $@ ]; then rm $@; fi @@ -94,7 +101,7 @@ $(BUILD_DIR): @mkdir -p $@ clean: - @rm -rf $(BUILD_DIR) $(INJECT_LIB_DIST) + @rm -rf $(BUILD_DIR) $(INJECT_LIB_DIST) $(JSR330_LICENSE_DIST) @rm -rf $(ARCH_INCLUDE_DIR)/javax/inject -dist: $(INJECT_LIB_DIST) $(ARCH_HEADERS) +dist: $(INJECT_LIB_DIST) $(ARCH_HEADERS) $(JSR330_LICENSE_DIST) diff --git a/inject/javax_inject/README b/inject/javax_inject/README index e0109a6512..9273506234 100644 --- a/inject/javax_inject/README +++ b/inject/javax_inject/README @@ -1,4 +1,6 @@ -This package creates an Objective-C library of the javax.inject annotations. +This package creates an Objective-C library of the javax.inject annotations, +specified in JSR 330 (https://www.jcp.org/en/jsr/detail?id=330). + This project's Java files are extracted from the javax.inject source jar when building. diff --git a/jre_emul/Makefile b/jre_emul/Makefile index 3a4e298f74..588a8ef682 100644 --- a/jre_emul/Makefile +++ b/jre_emul/Makefile @@ -1281,6 +1281,12 @@ FAT_LIB_COMPILE = $(CLANG) $(OBJCFLAGS) -I$(EMULATION_CLASS_DIR) -I$(GEN_OBJC_DI endif include ../make/fat_lib.mk +JRE_EMUL_LICENSES = \ + $(DIST_LICENSE_DIR)/android_license.txt \ + $(DIST_LICENSE_DIR)/apache_harmony_license.txt \ + $(DIST_LICENSE_DIR)/apple_license.txt \ + $(DIST_LICENSE_DIR)/icu_license.txt + fat_lib_dependencies: translate libs: $(FAT_LIB_LIBRARY) $(MAIN_LIB) @@ -1339,8 +1345,9 @@ clean: @rm -rf $(BUILD_DIR) $(GEN_OBJC_DIR) @rm -f $(DIST_DIR)/j2objcc $(EMULATION_JAR_DIST) $(EMULATION_LIB_DIST) $(MAIN_LIB_DIST) @rm -f $(DIST_INCLUDES) + @rm -f $(JRE_EMUL_LICENSES) -dist: emul_jar_dist libs_dist $(DIST_DIR)/j2objcc +dist: emul_jar_dist libs_dist $(DIST_DIR)/j2objcc licenses libs_dist: libs dist_includes $(EMULATION_LIB_DIST) $(MAIN_LIB_DIST) @@ -1388,3 +1395,20 @@ objc_sources_manifest: $(OBJC_SOURCES_MANIFEST) find_cycles: cycle_finder_dist $(JAVA_SOURCES_MANIFEST) $(DIST_DIR)/cycle_finder -w cycle_whitelist.txt `cat $(JAVA_SOURCES_MANIFEST)` +licenses: $(JRE_EMUL_LICENSES) + @: + +# Both Android and Apache Harmony have same license. +$(DIST_LICENSE_DIR)/android_license.txt \ +$(DIST_LICENSE_DIR)/apache_harmony_license.txt: apache_harmony/LICENSE + @mkdir -p $(@D) + @install -m 0644 $< $@ + +$(DIST_LICENSE_DIR)/apple_license.txt: apple_apsl/LICENSE + @mkdir -p $(@D) + @install -m 0644 $< $@ + +$(DIST_LICENSE_DIR)/icu_license.txt: icu4c/LICENSE + @mkdir -p $(@D) + @install -m 0644 $< $@ + diff --git a/jsr305/LICENSE b/jsr305/LICENSE new file mode 100644 index 0000000000..67366813ab --- /dev/null +++ b/jsr305/LICENSE @@ -0,0 +1,28 @@ +Copyright (c) 2007-2009, JSR305 expert group +All rights reserved. + +http://www.opensource.org/licenses/bsd-license.php + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of the JSR305 expert group nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/jsr305/Makefile b/jsr305/Makefile index 2e3e297f83..bc0e87c855 100644 --- a/jsr305/Makefile +++ b/jsr305/Makefile @@ -44,6 +44,9 @@ FAT_LIB_SOURCE_DIRS = $(GEN_OBJC_DIR) FAT_LIB_COMPILE = $(J2OBJCC) -fobjc-abi-version=2 -fobjc-legacy-dispatch include ../make/fat_lib.mk +JSR305_LICENSE = LICENSE +JSR305_LICENSE_DIST = $(DIST_LICENSE_DIR)/jsr305_license.txt + default: lib java: classes jar @@ -78,6 +81,10 @@ $(ARCH_INCLUDE_DIR)/%.h: $(GEN_OBJC_DIR)/%.h @mkdir -p $(@D) install -m 0644 $< $@ +$(JSR305_LICENSE_DIST): $(JSR305_LICENSE) + @mkdir -p $(@D) + @install -m 0644 $< $@ + $(JAVA_SOURCES_MANIFEST): $(EXTRACTED_JAVA) | $(BUILD_DIR) @echo "Building $$(basename $@)" @if [ -e $@ ]; then rm $@; fi @@ -100,7 +107,7 @@ $(BUILD_DIR): @mkdir -p $@ clean: - @rm -rf $(BUILD_DIR) $(JSR305_LIB_DIST) + @rm -rf $(BUILD_DIR) $(JSR305_LIB_DIST) $(JSR305_LICENSE_DIST) @rm -rf $(ARCH_INCLUDE_DIR)/javax/annotation -dist: $(JSR305_LIB_DIST) $(ARCH_HEADERS) +dist: $(JSR305_LIB_DIST) $(ARCH_HEADERS) $(JSR305_LICENSE_DIST) diff --git a/junit/Makefile b/junit/Makefile index 08cac27291..1d240498a9 100644 --- a/junit/Makefile +++ b/junit/Makefile @@ -239,6 +239,9 @@ FAT_LIB_SOURCE_DIRS = $(GEN_OBJC_DIR) FAT_LIB_COMPILE = $(CLANG) $(OBJCFLAGS) -I$(GEN_OBJC_DIR) -I$(ARCH_INCLUDE_DIR) include ../make/fat_lib.mk +JUNIT_LICENSE = LICENSE +JUNIT_LICENSE_DIST = $(DIST_LICENSE_DIR)/junit_license.txt + fat_lib_dependencies: jre_emul_dist java: $(JUNIT_DIST_JAR) @@ -284,14 +287,18 @@ $(ARCH_INCLUDE_DIR)/%.h: $(GEN_OBJC_DIR)/%.h @mkdir -p $(@D) install -m 0644 $< $@ +$(JUNIT_LICENSE_DIST): $(JUNIT_LICENSE) + @mkdir -p $(@D) + @install -m 0644 $< $@ + $(BUILD_DIR): @mkdir -p $@ clean: - @rm -rf $(BUILD_DIR) $(JUNIT_LIB_DIST) + @rm -rf $(BUILD_DIR) $(JUNIT_LIB_DIST) $(JUNIT_LICENSE_DIST) @rm -rf $(ARCH_INCLUDE_DIR)/junit $(ARCH_INCLUDE_DIR)/org/junit -dist: lib $(JUNIT_LIB_DIST) $(ARCH_HEADERS) +dist: lib $(JUNIT_LIB_DIST) $(ARCH_HEADERS) $(JUNIT_LICENSE_DIST) find_cycles: $(JAVA_SOURCES_MANIFEST) | cycle_finder_dist jre_emul_java_manifest $(DIST_DIR)/cycle_finder -sourcepath $(JAVA_SRC_DIR) \ diff --git a/make/common.mk b/make/common.mk index 32234fe7d2..12b01167ef 100644 --- a/make/common.mk +++ b/make/common.mk @@ -8,6 +8,7 @@ DIST_DIR = $(J2OBJC_ROOT)/dist DIST_INCLUDE_DIR = $(DIST_DIR)/include DIST_LIB_DIR = $(DIST_DIR)/lib DIST_JAR_DIR = $(DIST_LIB_DIR) +DIST_LICENSE_DIR = $(DIST_DIR)/license ifdef CONFIGURATION_BUILD_DIR XCODE_INCLUDE_DIR = $(CONFIGURATION_BUILD_DIR)/Headers diff --git a/protobuf/LICENSE b/protobuf/LICENSE new file mode 100644 index 0000000000..2dcab42dae --- /dev/null +++ b/protobuf/LICENSE @@ -0,0 +1,32 @@ +Copyright 2014, Google Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Code generated by the Protocol Buffer compiler is owned by the owner +of the input file used when generating it. This code is not +standalone and requires a support library to be linked with it. This +support library is itself covered by the above license. diff --git a/protobuf/runtime/Makefile b/protobuf/runtime/Makefile index eef8581c0a..9736acc743 100644 --- a/protobuf/runtime/Makefile +++ b/protobuf/runtime/Makefile @@ -86,11 +86,14 @@ FAT_LIB_COMPILE = $(J2OBJCC) $(C_FLAGS) $(INCLUDE_DIRS:%=-I%) include $(J2OBJC_ROOT)/make/fat_lib.mk fat_lib_dependencies: jre_emul_dist $(DESCRIPTOR_PROTO_H) +PROTOBUF_LICENSE = ../LICENSE +PROTOBUF_LICENSE_DIST = $(DIST_LICENSE_DIR)/protobuf_license.txt + PROTOC = $(DIST_DIR)/j2objc_protoc $(PROTOC): protobuf_compiler_dist @: -dist: $(DIST_JAR) $(DIST_LIBRARY) $(ARCH_BUILD_DIR)/.dist_headers +dist: $(DIST_JAR) $(DIST_LIBRARY) $(ARCH_BUILD_DIR)/.dist_headers $(PROTOBUF_LICENSE_DIST) @: java: $(DIST_JAR) @@ -109,8 +112,13 @@ $(OBJC_SOURCES_MANIFEST): echo $$i >> $@; \ done +$(PROTOBUF_LICENSE_DIST): $(PROTOBUF_LICENSE) + @mkdir -p $(@D) + @install -m 0644 $< $@ + clean: @rm -rf $(BUILD_DIR) $(DIST_JAR) $(DIST_LIBRARY) $(DIST_HEADERS) + @rm -rf $(PROTOBUF_LICENSE_DIST) $(DESCRIPTOR_PROTO_M): $(DESCRIPTOR_PROTO) $(PROTOC) @mkdir -p $(@D) diff --git a/testing/mockito/LICENSE b/testing/mockito/LICENSE new file mode 100644 index 0000000000..e0840a446c --- /dev/null +++ b/testing/mockito/LICENSE @@ -0,0 +1,21 @@ +The MIT License + +Copyright (c) 2007 Mockito contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/testing/mockito/Makefile b/testing/mockito/Makefile index bac04b9242..3290f6d9ea 100644 --- a/testing/mockito/Makefile +++ b/testing/mockito/Makefile @@ -307,6 +307,9 @@ FAT_LIB_SOURCE_DIRS = $(GEN_OBJC_DIR) FAT_LIB_COMPILE = $(J2OBJCC) include $(J2OBJC_ROOT)/make/fat_lib.mk +MOCKITO_LICENSE = LICENSE +MOCKITO_LICENSE_DIST = $(DIST_LICENSE_DIR)/mockito_license.txt + java: jar lib: $(FAT_LIB_LIBRARY) @@ -328,6 +331,10 @@ $(ARCH_INCLUDE_DIR)/%.h: $(GEN_OBJC_DIR)/%.h @mkdir -p $(@D) install -m 0644 $< $@ +$(MOCKITO_LICENSE_DIST): $(MOCKITO_LICENSE) + @mkdir -p $(@D) + @install -m 0644 $< $@ + $(JAVA_SOURCES_MANIFEST): $(EXTRACTED_JAVA) $(SUPERSOURCE_JAVA) | $(BUILD_DIR) @echo "Building $$(basename $@)" @if [ -e $@ ]; then rm $@; fi @@ -350,7 +357,7 @@ $(BUILD_DIR): @mkdir -p $@ clean: - @rm -rf $(BUILD_DIR) $(MOCKITO_LIB_DIST) + @rm -rf $(BUILD_DIR) $(MOCKITO_LIB_DIST) $(MOCKITO_LICENSE_DIST) @rm -rf $(ARCH_INCLUDE_DIR)/org/mockito -dist: $(MOCKITO_LIB_DIST) $(ARCH_HEADERS) +dist: $(MOCKITO_LIB_DIST) $(ARCH_HEADERS) $(MOCKITO_LICENSE_DIST)