You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gearpump.apache.org by ma...@apache.org on 2016/11/16 08:22:23 UTC
incubator-gearpump git commit: [GEARPUMP-239] Correct binary and
source licenses subdirectory
Repository: incubator-gearpump
Updated Branches:
refs/heads/master cf3e2e0a0 -> e852b6fb8
[GEARPUMP-239] Correct binary and source licenses subdirectory
Author: Kam Kasravi <ka...@yahoo.com>
Closes #112 from kkasravi/GEARPUMP-239.
Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/e852b6fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/e852b6fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/e852b6fb
Branch: refs/heads/master
Commit: e852b6fb85b1687d5e78dc1252883d9a5f6de602
Parents: cf3e2e0
Author: Kam Kasravi <ka...@yahoo.com>
Authored: Wed Nov 16 16:22:08 2016 +0800
Committer: manuzhang <ow...@gmail.com>
Committed: Wed Nov 16 16:22:08 2016 +0800
----------------------------------------------------------------------
CHANGELOG.md | 1 +
dev-tools/create_apache_bin_release.sh | 1 +
dev-tools/create_apache_source_release.sh | 4 ++++
dev-tools/dependencies.sh | 16 ++++++++++++----
4 files changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/e852b6fb/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a696d5c..9e18daa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ Apache Gearpump 0.8.2
==================
Change log:
------------------
+- GEARPUMP-239 Correct binary and source licenses subdirectory
- GEARPUMP-238 Correct release naming and packaging
- GEARPUMP-237 do not manually download sbt launcher jar on travis
- GEARPUMP-234 Update LICENSE and related files for 0.8.2-incubating binary release
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/e852b6fb/dev-tools/create_apache_bin_release.sh
----------------------------------------------------------------------
diff --git a/dev-tools/create_apache_bin_release.sh b/dev-tools/create_apache_bin_release.sh
index b29b3c7..0294c1f 100755
--- a/dev-tools/create_apache_bin_release.sh
+++ b/dev-tools/create_apache_bin_release.sh
@@ -101,6 +101,7 @@ mv $GEARPUMP_ARCHIVE_FOLDER/* .
rmdir $GEARPUMP_ARCHIVE_FOLDER
cp ../NOTICE ../README.md ../CHANGELOG.md .
cp ../LICENSE.bin LICENSE
+cp -r ../licenses .
rsync -a ../tmp/ $GEARPUMP_RELEASE_VERSION
tar czf ../${GEARPUMP_RELEASE_VERSION}-bin.tgz $GEARPUMP_RELEASE_VERSION
echo Signing ../${GEARPUMP_RELEASE_VERSION}-bin.tgz
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/e852b6fb/dev-tools/create_apache_source_release.sh
----------------------------------------------------------------------
diff --git a/dev-tools/create_apache_source_release.sh b/dev-tools/create_apache_source_release.sh
index 7d26a2b..8961ee9 100755
--- a/dev-tools/create_apache_source_release.sh
+++ b/dev-tools/create_apache_source_release.sh
@@ -80,6 +80,10 @@ fi
dev-tools/build clean reset scrub
echo .git > exclude-list
echo .DS_Store >> exclude-list
+for i in $(ls licenses/*|grep -v LICENSE-jquery.txt|grep -v LICENSE-bootstrap.txt); do
+ echo $i >> exclude-list
+done
+cat exclude-list
rsync -a --exclude-from exclude-list ../incubator-gearpump/ $GEARPUMP_RELEASE_VERSION
tar czf ${GEARPUMP_RELEASE_VERSION}-src.tgz $GEARPUMP_RELEASE_VERSION
echo Signing ${GEARPUMP_RELEASE_VERSION}-src.tgz
http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/e852b6fb/dev-tools/dependencies.sh
----------------------------------------------------------------------
diff --git a/dev-tools/dependencies.sh b/dev-tools/dependencies.sh
index b887ff9..f67ad3a 100755
--- a/dev-tools/dependencies.sh
+++ b/dev-tools/dependencies.sh
@@ -15,6 +15,12 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+
+#
+# This will generate a file LICENSE.dependencies which can be used as input to the LICENSE.bin (binary release)
+# Some additional work is needed to automate the LICENSE.bin file generation - and it may be difficult to do so.
+# LICENSE.dependencies does save time by categorizing dependencies under the different licenses
+#
sbt dependencyLicenseInfo | tee dependencyInfo
cat dependencyInfo | sed -E "s/"$'\E'"\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]//g" | grep '^\[info\]' | grep -v '^\[info\] Updating'|grep -v '^\[info\] Resolving'|grep -v '^\[info\] Done'|grep -v '^\[info\] Loading '|grep -v '^\[info\] Set ' > licenses.out
cat licenses.out | grep '\[info\] [A-Z]' | sed 's/^\[info\] //' | sort | uniq > license.types
@@ -33,11 +39,13 @@ done
rm -f LICENSE.dependencies
touch LICENSE.dependencies
cat license.types | while read LINE; do
-echo cat licenses.out \| sed "'"'/^\[info\] '$LINE'$/,/^\[info\] $/!d;//d'"'" \| sort \| uniq > cmd
-echo "$LINE" >> LICENSE.dependencies
-sh cmd >> LICENSE.dependencies
-echo ' ' >> LICENSE.dependencies
+ echo cat licenses.out \| sed "'"'/^\[info\] '$LINE'$/,/^\[info\] $/!d;//d'"'" \| sort \| uniq > cmd
+ echo "$LINE" >> LICENSE.dependencies
+ sh cmd >> LICENSE.dependencies
+ echo ' ' >> LICENSE.dependencies
done
+cat LICENSE.dependencies | sed 's/^\[info\] //' > LICENSE.d
+mv LICENSE.d LICENSE.dependencies
#cleanup
rm -f cmd license.types licenses.out lines dependencyInfo