jvanzyl 2004/02/07 08:55:04
Modified: maven-mboot TODO.txt
maven-mboot/src/bash maven.functions mboot
Log:
o adding install capability
Revision Changes Path
1.6 +0 -1 maven-components/maven-mboot/TODO.txt
Index: TODO.txt
===================================================================
RCS file: /home/cvs/maven-components/maven-mboot/TODO.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TODO.txt 7 Feb 2004 16:27:09 -0000 1.5
+++ TODO.txt 7 Feb 2004 16:55:04 -0000 1.6
@@ -1,3 +1,2 @@
o obey jar overrides
o transitive deps
-o install
1.20 +20 -5 maven-components/maven-mboot/src/bash/maven.functions
Index: maven.functions
===================================================================
RCS file: /home/cvs/maven-components/maven-mboot/src/bash/maven.functions,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- maven.functions 2 Feb 2004 13:46:14 -0000 1.19
+++ maven.functions 7 Feb 2004 16:55:04 -0000 1.20
@@ -151,9 +151,10 @@
# 5. Create JAR.
# $1 == directory where project lives
- # $4 == jar name
- # $5 == flag to leave mboot files
-
+ # $2 == jar name
+ # $3 == flag to install
+ # $4 == flag to leave mboot files
+
(
home=`pwd`
@@ -236,8 +237,21 @@
echo "Building jars (${jarName}) in `pwd`/target"
buildJar $buildDest target/${jarName}
-
- if [ -z $3 ]
+
+ if [ "$3" = "1" ]
+ then
+
+ findAndSetMavenRepoLocal
+
+ groupId=`cat project.xml | tr '\n' ' ' | sed
's#<dependencies>.*</dependencies>##' | grep '<groupId>' | sed -e
's#^.*<groupId>##;s#</groupId>.*$##'`
+
+ echo "Installing ${jarName} in ${repoLocal}/${groupId}/jars"
+
+ cp target/${jarName} ${repoLocal}/${groupId}/jars
+
+ fi
+
+ if [ "$4" = "0" ]
then
rm -f bootstrap.classpath > /dev/null 2>&1
rm -f bootstrap.libs > /dev/null 2>&1
@@ -247,6 +261,7 @@
rm -f bootstrap.tests.excludes > /dev/null 2>&1
rm -f bootstrap.tests.resources > /dev/null 2>&1
fi
+
)
}
1.6 +6 -2 maven-components/maven-mboot/src/bash/mboot
Index: mboot
===================================================================
RCS file: /home/cvs/maven-components/maven-mboot/src/bash/mboot,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mboot 10 Jan 2004 08:24:01 -0000 1.5
+++ mboot 7 Feb 2004 16:55:04 -0000 1.6
@@ -12,7 +12,8 @@
dir="."
jar="default"
-leaveBootFiles=""
+leaveBootFiles="0"
+install="0"
while [ $# -gt 0 ]; do
case $1 in
@@ -45,6 +46,9 @@
--leave-boot-files)
leaveBootFiles=1;
;;
+ --install)
+ install=1;
+ ;;
esac
shift
@@ -58,4 +62,4 @@
[ ! -f $dir/project.xml ] && echo "No project.xml in specified directory!" && exit
-buildMavenProject $dir $jar $leaveBootFiles
+buildMavenProject $dir $jar $install $leaveBootFiles
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
