[Lunar-commits] CVS: moonbase/compilers/j2sdk POST_REMOVE, NONE, 1.1 BUILD, 1.4, 1.5 DETAILS, 1.6, 1.7 PRE_BUILD, 1.6, 1.7

[Moritz Heiber]

Update of /var/cvs/lunar/moonbase/compilers/j2sdk
In directory espresso.foo-projects.org:/tmp/cvs-serv27293

Modified Files:
	BUILD DETAILS PRE_BUILD 
Added Files:
	POST_REMOVE 
Log Message:
Shuuweed. I think the testing is done.

* Merged j2sdk-beta into j2sdk


--- NEW FILE: POST_REMOVE ---
# Tidy up

if [ -d /usr/lib/j2sdk$VERSION ]; then
  rm -rf /usr/lib/j2sdk$VERSION
fi

Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/j2sdk/BUILD,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- BUILD	18 Aug 2004 09:43:55 -0000	1.4
+++ BUILD	14 Feb 2005 16:51:31 -0000	1.5
@@ -1,14 +1,10 @@
 (
   prepare_install &&
   cp -r $SOURCE_DIRECTORY /usr/lib &&
+  chmod 0755 /usr/lib/j2sdk$VERSION &&
   for FILE in `/bin/ls /usr/lib/$MODULE$VERSION/bin`; do
     if [ -f "/usr/lib/$MODULE$VERSION/bin/$FILE" -a ! -e "/usr/bin/$FILE" ]; then
       ln -s "/usr/lib/$MODULE$VERSION/bin/$FILE" "/usr/bin/$FILE"
     fi
   done
-
-  if module_installed mozilla &&
-     [ -d "/usr/lib/mozilla/plugins" -a ! -e "/usr/lib/mozilla/plugins/javaplugin_oji.so" ]; then
-    ln -s /usr/lib/$MODULE$VERSION/jre/plugin/i386/mozilla/javaplugin_oji.so /usr/lib/mozilla/plugins/
-  fi
 ) > $C_FIFO 2>&1

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/j2sdk/DETAILS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- DETAILS	5 Oct 2004 09:29:53 -0000	1.6
+++ DETAILS	14 Feb 2005 16:51:34 -0000	1.7
@@ -1,14 +1,14 @@
           MODULE=j2sdk
-         VERSION=1.4.1
+         VERSION=1.4.2
       SUBVERSION=01
-          SOURCE=$MODULE-$VERSION-$SUBVERSION-linux-i586-gcc3.2.bin
+          SOURCE=$MODULE-$VERSION-$SUBVERSION-linux-i586.bin
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE$VERSION
-   SOURCE_URL[0]=ftp://metalab.unc.edu/pub/linux/devel/lang/java/blackdown.org/JDK-$VERSION/i386/$SUBVERSION/
-   SOURCE_URL[1]=ftp://sunsite.dk/mirrors/java-linux/JDK-$VERSION/i386/$SUBVERSION/
-      SOURCE_VFY=md5:a0c7838233603fccb30641998195e8bc
+   SOURCE_URL[0]=ftp://sunsite.dk/mirrors/java-linux/JDK-$VERSION/i386/$SUBVERSION/
+   SOURCE_URL[1]=ftp://mirror.switch.ch/mirror/java-linux/JDK-$VERSION/i386/$SUBVERSION/
+      SOURCE_VFY=sha1:b54113e7eb52403eb8364125e5b9698ca5a210ac
         WEB_SITE=http://www.blackdown.org/java-linux/java2-status
          ENTERED=20010922
-         UPDATED=20040818
+         UPDATED=20050214
            SHORT="j2sdk is Blackdown port of Sun's Java virtual machine."
 cat << EOF
 The Java 2 Standard Edition (J2SE) is a feature-complete development and

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/compilers/j2sdk/PRE_BUILD,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PRE_BUILD	23 Aug 2004 14:29:59 -0000	1.6
+++ PRE_BUILD	14 Feb 2005 16:51:34 -0000	1.7
@@ -2,7 +2,7 @@
 chmod +x $SOURCE_CACHE/$SOURCE &&
 _POSIX2_VERSION=199209 $SOURCE_CACHE/$SOURCE
 
-if [ $? -ne 3 ]; then
+if [ $? -ne 0 ]; then
   echo 'Problem with either License Agreement or j2sdk binary'
   exit 1
 fi