Merge lp:~posulliv/akiban-sql-parser/update-release-script into lp:~akiban-technologies/akiban-sql-parser/trunk

Proposed by Padraig O'Sullivan
Status: Merged
Approved by: Nathan Williams
Approved revision: 282
Merged at revision: 282
Proposed branch: lp:~posulliv/akiban-sql-parser/update-release-script
Merge into: lp:~akiban-technologies/akiban-sql-parser/trunk
Diff against target: 82 lines (+1/-41)
1 file modified
build_release.sh (+1/-41)
To merge this branch: bzr merge lp:~posulliv/akiban-sql-parser/update-release-script
Reviewer Review Type Date Requested Status
Nathan Williams Approve
Review via email: mp+143149@code.launchpad.net

Description of the change

Remove community edition from release script.

LBJ: NO_BUILD

To post a comment you must log in.
Revision history for this message
Nathan Williams (nwilliams) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build_release.sh'
2--- build_release.sh 2012-11-08 22:00:15 +0000
3+++ build_release.sh 2013-01-14 17:19:21 +0000
4@@ -21,8 +21,6 @@
5 # - akiban-sql-parser-X.X.X.tar.gz (binary, EPL)
6 # - akiban-sql-parser-X.X.X-source.zip (source, EPL)
7 # - akiban-sql-parser-X.X.X-source.tar.gz (source, EPL)
8-# - akiban-sql-parser-community-X.X.X.zip (binary, EULA)
9-# - akiban-sql-parser-community-X.X.X.tar.gz (binary, EULA)
10 #
11
12 set -e
13@@ -72,7 +70,6 @@
14
15 REQUIRED_PROGS="bzr mvn javac sphinx-build curl awk sed tr basename zip tar gpg"
16 BRANCH_DEFAULT="lp:~akiban-technologies/akiban-sql-parser"
17-COMM_LICENSE_URL="http://www.akiban.com/akiban-persistit-community-license-agreement-plaintext"
18
19 VERSION=""
20 BRANCH_URL=""
21@@ -119,7 +116,6 @@
22 BRANCH_DIR="${WORKSPACE}/${VERSION}"
23 SOURCE_DIR="${WORKSPACE}/${NAME}-${VERSION}-source"
24 OPEN_DIR="${WORKSPACE}/${NAME}-${VERSION}"
25-COMM_DIR="${WORKSPACE}/${NAME}-community-${VERSION}"
26
27
28 echo "Cleaning workspace ${WORKSPACE}"
29@@ -142,7 +138,6 @@
30 cp -r "${BRANCH_DIR}" "${OPEN_DIR}"
31 rm -r "${OPEN_DIR}"/{src,pom.xml}
32 mkdir "${OPEN_DIR}/doc"
33-cp -r "${OPEN_DIR}" "${COMM_DIR}"
34
35
36 echo "Building open edition and docs"
37@@ -159,44 +154,9 @@
38 mv "${BRANCH_DIR}"/target/${NAME}-${VERSION}.jar "${OPEN_DIR}/${NAME}-${VERSION}.jar"
39
40
41-echo "Downloading and formating community license"
42-cd "${WORKSPACE}"
43-curl -s "${COMM_LICENSE_URL}" |
44- # Pull out the content between the two regexes, excluding the matches themselves
45- awk '/<div class="content">/ {flag=1;next} /<\/div>/ {flag=0} flag {print}' |
46- # Replace paragraph end marks for the first 4 paragraphs with newlines
47- awk '{if(NR < 8) sub(/<\/p>/, "\n"); print }' |
48- # Delete all: <p>, </p>, </div>, and &nbsp; occurrences
49- sed -e 's/<p>//g' -e 's/<\/p>//g' -e 's/<\/div>//g' -e 's/&nbsp;//g' |
50- # Replace unicode quotes with simple ones
51- sed -e 's/[“”]/"/g' -e "s/’/'/g" |
52- # Un-link email address(es)
53- sed -e 's/<a href=".*">//g' -e 's/<\/a>//g' |
54- # Collapse repeated spaces
55- tr -s ' ' |
56- # Wrap nicely at 80 characters
57- fold -s \
58- > "${COMM_DIR}/LICENSE.txt"
59-
60-
61-echo "Building community edition and docs"
62-cd "${BRANCH_DIR}"
63-cp "${COMM_DIR}/LICENSE.txt" .
64-awk 'BEGIN { FS="\n"; RS="";}\
65- {sub(/[ ]*<licenses>.*<\/licenses>/,\
66- "<licenses>\n<license>\n<name>Proprietary</name>\n<url>http://www.akiban.com/akiban-persistit-community-license-agreement</url>\n<distribution>manual</distribution>\n</license>\n</licenses>\n"); print;}'\
67- pom.xml > pom_comm.xml
68-maven_build "${REVNO}" "-f pom_comm.xml"
69-docs_build "../apidocs"
70-cp -r target/site/apidocs "${COMM_DIR}/doc"
71-# TODO: need to start creating release notes for parser
72-rm target/*-sources.jar
73-mv target/${NAME}-${VERSION}.jar "${COMM_DIR}/${NAME}-${VERSION}.jar"
74-
75-
76 echo "Creating zip and tar.gz files"
77 cd "${WORKSPACE}"
78-for DIR in "${OPEN_DIR}" "${SOURCE_DIR}" "${COMM_DIR}"; do
79+for DIR in "${OPEN_DIR}" "${SOURCE_DIR}"; do
80 BASE_DIR="`basename ${DIR}`"
81 zip -r "${DIR}.zip" "$BASE_DIR" >/dev/null
82 tar czf "${DIR}.tar.gz" "${BASE_DIR}"

Subscribers

People subscribed via source and target branches