1 |
commit: 2635a5185a661a73e3d53f55d6622f0c0f1e171e |
2 |
Author: zongyu <zzy2529420793 <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Aug 18 03:20:15 2020 +0000 |
4 |
Commit: Miroslav Å ulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 18 08:05:21 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=2635a518 |
7 |
|
8 |
update java-pkg-maven, add two licenses |
9 |
|
10 |
Signed-off-by: zongyu <zzy2529420793 <AT> gmail.com> |
11 |
|
12 |
maven/eclass/java-pkg-maven.eclass | 19 +++++++-- |
13 |
maven/licenses/Indiana-University-Extreme-Lab | 58 +++++++++++++++++++++++++++ |
14 |
maven/licenses/UPL-1.0 | 35 ++++++++++++++++ |
15 |
3 files changed, 108 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/maven/eclass/java-pkg-maven.eclass b/maven/eclass/java-pkg-maven.eclass |
18 |
index 68f6712..089523c 100644 |
19 |
--- a/maven/eclass/java-pkg-maven.eclass |
20 |
+++ b/maven/eclass/java-pkg-maven.eclass |
21 |
@@ -37,26 +37,35 @@ EXPORT_FUNCTIONS src_unpack |
22 |
# the application. Give it a default value to handle src_unpack. |
23 |
: ${JAVA_TEST_SRC_DIR:=src/test/java} |
24 |
|
25 |
+# @ECLASS-VARIABLE: JAVA_BINJAR_FILENAME |
26 |
+# @DEFAULT_UNSET |
27 |
+# @DESCRIPTION: |
28 |
+# The name of the binary jar file that java-pkg-maven will not unpack |
29 |
+ |
30 |
# @FUNCTION: java-pkg-binjar_src_unpack |
31 |
# @DESCRIPTION: |
32 |
# Copy the binary jar into the expected place of java-pkg-simple. Do |
33 |
# not extract files from archive. |
34 |
java-pkg-maven_src_unpack() { |
35 |
+ # mkdir |
36 |
+ mkdir -p "${S}"/${JAVA_TEST_SRC_DIR}\ |
37 |
+ || die "Could not create ${JAVA_TEST_SRC_DIR}" |
38 |
+ mkdir -p "${S}"/${JAVA_SRC_DIR}\ |
39 |
+ || die "Could not create ${JAVA_SRC_DIR}" |
40 |
+ |
41 |
+ # unpack files |
42 |
for file in ${A}; do |
43 |
case ${file} in |
44 |
*-test-sources.jar) |
45 |
- mkdir -p "${S}"/${JAVA_TEST_SRC_DIR}\ |
46 |
- || die "Could not create ${JAVA_TEST_SRC_DIR}" |
47 |
unzip -q -o "${DISTDIR}"/${file} -d "${S}"/${JAVA_TEST_SRC_DIR}\ |
48 |
|| die "Could not unzip source code for testing" ;; |
49 |
*-sources.jar) |
50 |
- mkdir -p "${S}"/${JAVA_SRC_DIR}\ |
51 |
- || die "Could not create ${JAVA_SRC_DIR}" |
52 |
unzip -q -o "${DISTDIR}"/${file} -d "${S}"/${JAVA_SRC_DIR}\ |
53 |
|| die "Could not unzip source code" |
54 |
if [[ -d "${S}"/${JAVA_SRC_DIR}/META-INF ]] ; then |
55 |
rm "${S}"/${JAVA_SRC_DIR}/META-INF -r || die |
56 |
fi ;; |
57 |
+ ${JAVA_BINJAR_FILENAME}) ;; |
58 |
*) |
59 |
unpack ${file};; |
60 |
esac |
61 |
@@ -67,5 +76,7 @@ java-pkg-maven_src_unpack() { |
62 |
cp "${S}"/${JAVA_SRC_DIR} "${S}"/${JAVA_RESOURCE_DIRS} -r || die |
63 |
find "${S}"/${JAVA_RESOURCE_DIRS} -type f ! -name \*.properties \ |
64 |
-exec rm {} \; || die |
65 |
+ find "${S}"/${JAVA_RESOURCE_DIRS} -type d -empty -delete || die |
66 |
+ mkdir -p "${S}"/${JAVA_RESOURCE_DIRS} |
67 |
} |
68 |
|
69 |
|
70 |
diff --git a/maven/licenses/Indiana-University-Extreme-Lab b/maven/licenses/Indiana-University-Extreme-Lab |
71 |
new file mode 100644 |
72 |
index 0000000..104f189 |
73 |
--- /dev/null |
74 |
+++ b/maven/licenses/Indiana-University-Extreme-Lab |
75 |
@@ -0,0 +1,58 @@ |
76 |
+LICENSE FOR THE Extreme! Lab PullParser |
77 |
+------------------------------------------------------------------------ |
78 |
+ |
79 |
+Copyright © 2002 The Trustees of Indiana University. |
80 |
+All rights reserved. |
81 |
+ |
82 |
+Redistribution and use in source and binary forms, with or without |
83 |
+modification, are permitted provided that the following conditions are |
84 |
+met: |
85 |
+ |
86 |
+1) All redistributions of source code must retain the above |
87 |
+ copyright notice, the list of authors in the original source |
88 |
+ code, this list of conditions and the disclaimer listed in this |
89 |
+ license; |
90 |
+ |
91 |
+2) All redistributions in binary form must reproduce the above |
92 |
+ copyright notice, this list of conditions and the disclaimer |
93 |
+ listed in this license in the documentation and/or other |
94 |
+ materials provided with the distribution; |
95 |
+ |
96 |
+3) Any documentation included with all redistributions must include |
97 |
+ the following acknowledgement: |
98 |
+ |
99 |
+ "This product includes software developed by the Indiana |
100 |
+ University Extreme! Lab. For further information please visit |
101 |
+ http://www.extreme.indiana.edu/" |
102 |
+ |
103 |
+ Alternatively, this acknowledgment may appear in the software |
104 |
+ itself, and wherever such third-party acknowledgments normally |
105 |
+ appear. |
106 |
+ |
107 |
+4) The name "Indiana Univeristy" and "Indiana Univeristy |
108 |
+ Extreme! Lab" shall not be used to endorse or promote |
109 |
+ products derived from this software without prior written |
110 |
+ permission from Indiana University. For written permission, |
111 |
+ please contact http://www.extreme.indiana.edu/. |
112 |
+ |
113 |
+5) Products derived from this software may not use "Indiana |
114 |
+ Univeristy" name nor may "Indiana Univeristy" appear in their name, |
115 |
+ without prior written permission of the Indiana University. |
116 |
+ |
117 |
+Indiana University provides no reassurances that the source code |
118 |
+provided does not infringe the patent or any other intellectual |
119 |
+property rights of any other entity. Indiana University disclaims any |
120 |
+liability to any recipient for claims brought by any other entity |
121 |
+based on infringement of intellectual property rights or otherwise. |
122 |
+ |
123 |
+LICENSEE UNDERSTANDS THAT SOFTWARE IS PROVIDED "AS IS" FOR WHICH |
124 |
+NO WARRANTIES AS TO CAPABILITIES OR ACCURACY ARE MADE. INDIANA |
125 |
+UNIVERSITY GIVES NO WARRANTIES AND MAKES NO REPRESENTATION THAT |
126 |
+SOFTWARE IS FREE OF INFRINGEMENT OF THIRD PARTY PATENT, COPYRIGHT, OR |
127 |
+OTHER PROPRIETARY RIGHTS. INDIANA UNIVERSITY MAKES NO WARRANTIES THAT |
128 |
+SOFTWARE IS FREE FROM "BUGS", "VIRUSES", "TROJAN HORSES", "TRAP |
129 |
+DOORS", "WORMS", OR OTHER HARMFUL CODE. LICENSEE ASSUMES THE ENTIRE |
130 |
+RISK AS TO THE PERFORMANCE OF SOFTWARE AND/OR ASSOCIATED MATERIALS, |
131 |
+AND TO THE PERFORMANCE AND VALIDITY OF INFORMATION GENERATED USING |
132 |
+SOFTWARE. |
133 |
+ |
134 |
|
135 |
diff --git a/maven/licenses/UPL-1.0 b/maven/licenses/UPL-1.0 |
136 |
new file mode 100644 |
137 |
index 0000000..e2f6bd3 |
138 |
--- /dev/null |
139 |
+++ b/maven/licenses/UPL-1.0 |
140 |
@@ -0,0 +1,35 @@ |
141 |
+Copyright (c) [year] [copyright holders] |
142 |
+ |
143 |
+The Universal Permissive License (UPL), Version 1.0 |
144 |
+ |
145 |
+Subject to the condition set forth below, permission is hereby granted to any |
146 |
+person obtaining a copy of this software, associated documentation and/or data |
147 |
+(collectively the "Software"), free of charge and under any and all copyright |
148 |
+rights in the Software, and any and all patent rights owned or freely |
149 |
+licensable by each licensor hereunder covering either (i) the unmodified |
150 |
+Software as contributed to or provided by such licensor, or (ii) the Larger |
151 |
+Works (as defined below), to deal in both |
152 |
+ |
153 |
+(a) the Software, and |
154 |
+(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if |
155 |
+one is included with the Software (each a "Larger Work" to which the Software |
156 |
+is contributed by such licensors), |
157 |
+ |
158 |
+without restriction, including without limitation the rights to copy, create |
159 |
+derivative works of, display, perform, and distribute the Software and make, |
160 |
+use, sell, offer for sale, import, export, have made, and have sold the |
161 |
+Software and the Larger Work(s), and to sublicense the foregoing rights on |
162 |
+either these or other terms. |
163 |
+ |
164 |
+This license is subject to the following condition: |
165 |
+The above copyright notice and either this complete permission notice or at |
166 |
+a minimum a reference to the UPL must be included in all copies or |
167 |
+substantial portions of the Software. |
168 |
+ |
169 |
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
170 |
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
171 |
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
172 |
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
173 |
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
174 |
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
175 |
+SOFTWARE. |