summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorIsmael Luceno2014-12-22 17:05:53 -0300
committerIsmael Luceno2014-12-22 17:20:50 -0300
commit793bd46bed33e73cc5cb7e77898582a8d7489042 (patch)
treea4a00934bc8c06425dc1c405dfca5f3af0b947dc /java
parente1c76800775363a89f125e0677ced5a6da92f1dc (diff)
jakarta-commons-dbcp: Normalize SPELL field and remove PKG_* variables
Diffstat (limited to 'java')
-rwxr-xr-xjava/jakarta-commons-dbcp/BUILD4
-rw-r--r--[-rwxr-xr-x]java/jakarta-commons-dbcp/DETAILS13
-rw-r--r--java/jakarta-commons-dbcp/HISTORY4
-rwxr-xr-xjava/jakarta-commons-dbcp/INSTALL8
4 files changed, 15 insertions, 14 deletions
diff --git a/java/jakarta-commons-dbcp/BUILD b/java/jakarta-commons-dbcp/BUILD
index 4c737be300..747f84df4b 100755
--- a/java/jakarta-commons-dbcp/BUILD
+++ b/java/jakarta-commons-dbcp/BUILD
@@ -6,7 +6,7 @@ set_ant_env &&
export CLASSPATH="${JAVA_HOME}/lib/tools.jar:${JAVA_HOME}/lib/classes.zip:${ANT_HOME}/lib/ant.jar"
# create build.properties
-cat > $SOURCE_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src/build.properties <<EOF
+cat > $SOURCE_DIRECTORY/${SPELL#*-}-${VERSION}-src/build.properties <<EOF
base.path=${SM_JAKARTA_HOME}
commons-collections.home=\${base.path}/commons-collections
commons-collections.jar=\${commons-collections.home}/commons-collections.jar
@@ -25,6 +25,6 @@ jndi.lib=\${jndi.home}/lib
jndi.jar=\${jndi.lib}/jndi.jar
EOF
-cd ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src &&
+cd ${SPELL#*-}-${VERSION}-src &&
cp LICENSE.txt ../LICENSE &&
ant dist
diff --git a/java/jakarta-commons-dbcp/DETAILS b/java/jakarta-commons-dbcp/DETAILS
index 210854db9b..fc57a6fa91 100755..100644
--- a/java/jakarta-commons-dbcp/DETAILS
+++ b/java/jakarta-commons-dbcp/DETAILS
@@ -1,12 +1,9 @@
- PKG_PROJECT=jakarta
- PKG_SUBPRJ=commons
- PKG_NAME=dbcp
- SPELL=${PKG_PROJECT}-${PKG_SUBPRJ}-${PKG_NAME}
+ SPELL=jakarta-commons-dbcp
VERSION=1.0
- SOURCE=${PKG_NAME}-${VERSION}-src.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src
- SOURCE_URL[0]=http://www.apache.org/dist/${PKG_PROJECT}/${PKG_SUBPRJ}/${PKG_NAME}/source/$SOURCE
- SOURCE_URL[1]=http://archive.apache.org/dist/${PKG_SUBPRJ}/${PKG_NAME}/source/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src.tar.gz
+ SOURCE=${SPELL##*-}-${VERSION}-src.tar.gz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL#*-}-${VERSION}-src
+ SOURCE_URL[0]=http://www.apache.org/dist/${SPELL//-/\/}/source/$SOURCE
+ SOURCE_URL[1]=http://archive.apache.org/dist/commons/${SPELL##*-}/source/${SPELL#*-}-${VERSION}-src.tar.gz
SOURCE_HASH=sha512:d5d8e2bf44277d9a309b8a4bf04505bce11a82d79e88cb4b3694a0da346df745d8c4466121cdcb5f65bfc99dd5e2875a772e88447dad75c3ee029c0792adcd3c
LICENSE[0]=APACHE
WEB_SITE=http://jakarta.apache.org/commons/dbcp/
diff --git a/java/jakarta-commons-dbcp/HISTORY b/java/jakarta-commons-dbcp/HISTORY
index 509eecdcaf..c7b60b2e89 100644
--- a/java/jakarta-commons-dbcp/HISTORY
+++ b/java/jakarta-commons-dbcp/HISTORY
@@ -1,3 +1,7 @@
+2014-12-22 Ismael Luceno <ismael@sourcemage.org>
+ * BUILD, DETAILS, INSTALL: Normalize SPELL field and remove PKG_*
+ variables
+
2010-10-30 Bor Kraljič <pyrobor@ver.si>
* DETAILS: added SOURCE_URL[1]
diff --git a/java/jakarta-commons-dbcp/INSTALL b/java/jakarta-commons-dbcp/INSTALL
index a9651a4eeb..473428fcba 100755
--- a/java/jakarta-commons-dbcp/INSTALL
+++ b/java/jakarta-commons-dbcp/INSTALL
@@ -1,7 +1,7 @@
-extract_jakarta_src ${PKG_SUBPRJ}-${PKG_NAME} \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION} \
- $SOURCE_DIRECTORY/${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}-src &&
+extract_jakarta_src ${SPELL#*-} \
+ ${SPELL#*-}-${VERSION} \
+ $SOURCE_DIRECTORY/${SPELL#*-}-${VERSION}-src &&
register_jakarta_jar \
- ${PKG_SUBPRJ}-${PKG_NAME}-${VERSION}/dist/commons-dbcp.jar \
+ ${SPELL#*-}-${VERSION}/dist/commons-dbcp.jar \
commons-dbcp.jar