update make-release-artifacts to work with current repo structure
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/commit/d09c9455 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/tree/d09c9455 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-dist/diff/d09c9455 Branch: refs/heads/master Commit: d09c9455373705d14e6e961db5739e938bd9413b Parents: 7f9016f Author: John McCabe <[email protected]> Authored: Thu Jan 21 18:42:08 2016 +0000 Committer: John McCabe <[email protected]> Committed: Thu Jan 21 18:42:08 2016 +0000 ---------------------------------------------------------------------- brooklyn-dist/release/make-release-artifacts.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-dist/blob/d09c9455/brooklyn-dist/release/make-release-artifacts.sh ---------------------------------------------------------------------- diff --git a/brooklyn-dist/release/make-release-artifacts.sh b/brooklyn-dist/release/make-release-artifacts.sh index 476a6e3..dfdd976 100755 --- a/brooklyn-dist/release/make-release-artifacts.sh +++ b/brooklyn-dist/release/make-release-artifacts.sh @@ -18,7 +18,9 @@ # under the License. # -# creates a source release - this is a .tar.gz file containing all the source code files that are permitted to be released. +# Creates the following releases with archives (.tar.gz/.zip), signatures and checksums: +# binary (-bin) - contains the brooklyn dist binary release +# source (-src) - contains all the source code files that are permitted to be released set -e @@ -179,7 +181,7 @@ mkdir -p ${bin_staging_dir} # * release (where this is running, and people who *have* the release don't need to make it) # * jars and friends (these are sometimes included for tests, but those are marked as skippable, # and apache convention does not allow them in source builds; see PR #365 -rsync -rtp --exclude .git\* --exclude docs/ --exclude sandbox/ --exclude release/ --exclude '**/*.[ejw]ar' . ${staging_dir}/${release_name}-src +rsync -rtp --exclude .git\* --exclude brooklyn-docs/ --exclude brooklyn-library/sandbox/ --exclude brooklyn-dist/release/ --exclude '**/*.[ejw]ar' . ${staging_dir}/${release_name}-src rm -rf ${artifact_dir} mkdir -p ${artifact_dir} @@ -210,10 +212,10 @@ fi # Perform the build and deploy to Nexus staging repository ( cd ${src_staging_dir} && mvn deploy -Papache-release ) ## To test the script without a big deploy, use the line below instead of above -#( cd ${src_staging_dir} && cd usage/dist && mvn clean install ) +#( cd ${src_staging_dir} && mvn clean install ) # Re-pack the archive with the correct names -tar xzf ${src_staging_dir}/usage/dist/target/brooklyn-dist-${current_version}-dist.tar.gz -C ${bin_staging_dir} +tar xzf ${src_staging_dir}/brooklyn-dist/dist/target/brooklyn-dist-${current_version}-dist.tar.gz -C ${bin_staging_dir} mv ${bin_staging_dir}/brooklyn-dist-${current_version} ${bin_staging_dir}/${release_name}-bin ( cd ${bin_staging_dir} && tar czf ${artifact_dir}/${artifact_name}-bin.tar.gz ${release_name}-bin )
