[SM-Commit] GIT changes to master grimoire by Julien ROZO (c4ea31a9e31f65b59910f6cdfb35d202f0efcdfe)

Julien ROZO scm at sourcemage.org
Sat Aug 30 10:44:57 EDT 2008


GIT changes to master grimoire by Julien ROZO <julien at rozo.org>:

 java/ant/BUILD                     |   11 +++++++++--
 java/ant/DETAILS                   |    5 ++---
 java/ant/HISTORY                   |    8 ++++++++
 java/ant/PRE_BUILD                 |    7 +++++++
 java/ant/ant-buildfile-junit.patch |   11 +++++++++++
 kde4-apps/amarok2/DETAILS          |    2 +-
 kde4-apps/amarok2/HISTORY          |    3 +++
 7 files changed, 41 insertions(+), 6 deletions(-)

New commits:
commit b986f29ae349cbe6c6e6788c9c1d7a5fffa80b22
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    ant: updated version to 1.7.1 (fixing bug #13749), removed PATCHLEVEL
    in BUILD, added junit to CLASSPATH if installed (fixing bug #3230), added unexport of CLASSPATH
    added PRE_BUILD and ant-buildfile-junit.patch to remove junit testsif not installed (fixing bugs #13749 and #3230)

commit ed63f056e675e8b07badec44eaf9c4ba03e76b72
Author: Julien ROZO <julien at rozo.org>
Commit: Julien ROZO <julien at rozo.org>

    amarok2: SOURCE is needed by both svn and 1.90 versions, or svn version
    won't download

diff --git a/java/ant/BUILD b/java/ant/BUILD
index 1de551a..259dc2f 100755
--- a/java/ant/BUILD
+++ b/java/ant/BUILD
@@ -7,7 +7,14 @@ fi                                      &&
 set_java_env                            &&
   
 if  list_find  "$OPTS"  "--with-antlr";  then
-  export CLASSPATH="$INSTALL_ROOT/usr/share/antlr-$(installed_version antlr)/antlr.jar:$CLASSPATH"
+  CLASSPATH="$INSTALL_ROOT/usr/share/antlr-$(installed_version antlr)/antlr.jar:$CLASSPATH"
 fi                                      &&
 
-./build.sh -Ddist.dir=antbuild dist
+# fix bug #3230
+if  spell_ok junit;  then
+  CLASSPATH="$INSTALL_ROOT/usr/lib/java/ibm-dist/junit/junit-$(installed_version junit).jar:$CLASSPATH"
+fi                                      &&
+
+export CLASSPATH  &&
+./build.sh -Ddist.dir=antbuild dist  &&
+export -p CLASSPATH
diff --git a/java/ant/DETAILS b/java/ant/DETAILS
index b41ddbe..ee3846a 100755
--- a/java/ant/DETAILS
+++ b/java/ant/DETAILS
@@ -1,11 +1,10 @@
            SPELL=ant
-         VERSION=1.6.5
+         VERSION=1.7.1
           SOURCE=apache-$SPELL-$VERSION-src.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/apache-$SPELL-$VERSION
    SOURCE_URL[0]=http://archive.apache.org/dist/ant/source/$SOURCE
    SOURCE_URL[1]=ftp://ftp.sourcemage.sk/mirror/java/$SOURCE
-     SOURCE_HASH=sha512:d527c86df32045a1083c141bb5604b26ae94bb77f68e1bcad57fa86aa2c96c3648392597e793845c5753b3013a76259b18e433e686a0ac34612fba56761fe268
-      PATCHLEVEL=1
+     SOURCE_HASH=sha512:bb627d0c5d491d5505a71c5ef1cc6b748c6eab6b94b44fd582557585bd0472d0b110d3709a8a355c2480b0c000e57327925a467afbe50cd786f1898ad4b67cfc
       LICENSE[0]=APACHE
         WEB_SITE=http://ant.apache.org/
         KEYWORDS="java"
diff --git a/java/ant/HISTORY b/java/ant/HISTORY
index eb19169..ca3ddfd 100644
--- a/java/ant/HISTORY
+++ b/java/ant/HISTORY
@@ -1,3 +1,11 @@
+2008-08-30 Julien "_kaze_" ROZO <julien at rozo.org>
+	* DETAILS: updated version to 1.7.1 (fixing bug #13749),
+	  removed PATCHLEVEL
+	* BUILD: added junit to CLASSPATH if installed (fixing bug #3230),
+	  added unexport of CLASSPATH
+	* PRE_BUILD, ant-buildfile-junit.patch: added to remove junit tests
+	  if not installed (fixing bugs #13749 and #3230)
+
 2008-08-05 Eric Sandall <sandalle at sourcemage.org>
 	* DEPENDS: Requires javac (from a JDK)
 
diff --git a/java/ant/PRE_BUILD b/java/ant/PRE_BUILD
new file mode 100755
index 0000000..5c5cb06
--- /dev/null
+++ b/java/ant/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build  &&
+cd $SOURCE_DIRECTORY  &&
+
+# fix bugs #13749 and #3230 : removing junit task if not installed
+if ! spell_ok junit; then
+	patch -p0 < ${SPELL_DIRECTORY}/ant-buildfile-junit.patch
+fi
diff --git a/java/ant/ant-buildfile-junit.patch b/java/ant/ant-buildfile-junit.patch
new file mode 100644
index 0000000..21a4a0d
--- /dev/null
+++ b/java/ant/ant-buildfile-junit.patch
@@ -0,0 +1,11 @@
+--- build.xml.old       2008-08-30 13:59:52.000000000 +0200
++++ build.xml   2008-08-30 14:00:00.000000000 +0200
+@@ -925,7 +925,7 @@
+        ===================================================================
+   -->
+   <target name="dist-lite"
+-    depends="jars,test-jar"
++    depends="jars"
+     description="--> creates a minimum distribution to run Apache Ant">
+
+     <mkdir dir="${dist.dir}"/>
diff --git a/kde4-apps/amarok2/DETAILS b/kde4-apps/amarok2/DETAILS
index c2a20e5..3987402 100755
--- a/kde4-apps/amarok2/DETAILS
+++ b/kde4-apps/amarok2/DETAILS
@@ -7,10 +7,10 @@ if [[ $AMR_SVN == y ]];then
 else
         VERSION=1.90
     SOURCE_HASH=sha512:e0094e986fd4b67535558d39d988fa4b9bf6643dd889cc5e7988ff40a5ffb002e7ef4a5ad9ff50bfbc7fcdf784e7f42ddd61724931bd39a8c04b08fcdea60651
-          SOURCE=$SPELLX-$VERSION.tar.bz2
 #   SOURCE_URL[0]=${SOURCEFORGE_URL}/$SPELL/$SOURCE
    SOURCE_URL[0]=$KDE_URL/unstable/$SPELLX/$VERSION/src/$SOURCE
 fi
+          SOURCE=$SPELLX-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
         WEB_SITE=http://amarok.kde.org/
          ENTERED=20080122
diff --git a/kde4-apps/amarok2/HISTORY b/kde4-apps/amarok2/HISTORY
index e37bfba..5b30ad7 100644
--- a/kde4-apps/amarok2/HISTORY
+++ b/kde4-apps/amarok2/HISTORY
@@ -1,3 +1,6 @@
+2008-08-29 Julien "_kaze_" ROZO <julien at rozo.org>
+	* DETAILS: SOURCE is needed by both svn and 1.90 versions
+
 2008-08-28 Treeve Jelbert <treeve at sourcemage.org>
 	* DETAILS: version 1.90
 



More information about the SM-Commit mailing list