Changeset 8178 for trunk

Timestamp:

2004-09-29T12:17:38+12:00 (20 years ago)

Author:

mdewsnip

Message:

Some changes to tidy up creating GLI JAR files, both unsigned and signed (for the applet).

File:

• trunk/gli/makejar.sh (modified) (1 diff)

trunk/gli/makejar.sh

@@ -1 @@
-#!/bin/bash
+#!/bin/sh
+glilang=en
 
-if [ ! -d classes/org ] ; then
-  echo "Compiled version of Java code missing: classes/org does not exist"
-  exit 1;
-else
-  echo "Assuming that Java code is freshly compiled ..."
+
+# This script must be run from within the directory in which it lives
+thisdir=`pwd`
+if [ ! -f "${thisdir}/makejar.sh" ]; then
+    if [ "$glilang" == "es" ]; then
+        echo "Este guión deberá ejecutarse desde el directorio en el que reside."
+    elif [ "$glilang" == "fr" ]; then
+    echo "Ce script doit être exécuté à partir du répertoire dans lequel il se trouve."
+    elif [ "$glilang" == "ru" ]; then
+    echo "üÔÏÔ ÓËÒÉÐÔ ÄÏÌÖÅÎ ÂÙÔØ ×ÚÑÔ ÉÚ ÄÉÒÅËÔÏÒÉÉ, × ËÏÔÏÒÏÊ ÏÎ ÒÁÓÐÏÌÏÖÅÎ"
+    else
+    echo "This script must be run from the directory in which it resides."
+    fi
+    exit 1
 fi
 
-if [ ! -d libexpand ] ; then
-  mkdir libexpand
+## ---- Check that the GLI has been compiled ----
+if [ ! -f "classes/org/greenstone/gatherer/GathererProg.class" ]; then
+    echo
+    if [ "$glilang" == "es" ]; then
+    echo "Usted necesita compilar la Interfaz de la Biblioteca Digital Greenstone"
+    echo "(por medio de makegli.sh) antes de ejecutar este guión."
+    elif [ "$glilang" == "fr" ]; then
+    echo "Vous devez compiler le Greenstone Interface (en utilisant makegli.sh)"
+    echo "avant d'exécuter ce script."
+    elif [ "$glilang" == "ru" ]; then
+    echo "÷Ù ÄÏÌÖÎÙ ËÏÍÐÉÌÉÒÏ×ÁÔØ ÂÉÂÌÉÏÔÅÞÎÙÊ ÉÎÔÅÒÆÅÊÓ Greenstone"
+    echo "(ÉÓÐÏÌØÚÕÑ makegli.sh) ÐÅÒÅÄ ××ÏÄÏÍ ÜÔÏÇÏ ÓËÒÉÐÔÁ"
+    else
+    echo "You need to compile the Greenstone Librarian Interface (using makegli.sh)"
+    echo "before running this script."
+    fi
+    exit 1
+fi
+
+echo "Assuming that Java code is freshly compiled ..."
+
+# All the GLI class files and supporting libraries are put into the "jar" directory
+if [ ! -d jar ]; then
+  mkdir jar
+
   cd lib
-  jar xvf activation.jar com javax 
+  jar xvf activation.jar com javax
   jar xvf apache.jar com org
-  jar xvf jp.jar jp 
+  jar xvf jp.jar jp
   jar xvf mail.jar com javax
   jar xvf qfslib.jar de
 
-  /bin/mv com de javax jp org ../libexpand/.
+  mv com de javax jp org ../jar/.
   cd ..
 fi
 
-if [ ! -d orgmerge ] ; then
-  mkdir orgmerge
-else
-  /bin/rm -rf orgmerge/org
+# Copy the latest version of the GLI classes into the jar directory
+rm -rf jar/org/greenstone
+cp -r classes/org/greenstone jar/org
+
+# Jar everything up
+jar cf GLI.jar collect.zip \
+    .java.policy plugins.dat classifiers.dat help \
+    -C classes dictionary.properties -C classes dictionary_es.properties \
+    -C classes dictionary_fr.properties -C classes dictionary_ru.properties \
+    -C classes feedback.properties -C classes metadata.zip -C classes images \
+    -C jar com -C jar de -C jar javax -C jar jp -C jar org
+
+
+# ---- Make signed JAR file for the applet, if desired ----
+if [ "$1" == "-sign" ]; then
+    rm -f SignedGatherer.jar
+    echo "greenstone" | jarsigner -keystore .greenstonestore -signedjar SignedGatherer.jar GLI.jar privateKey 2> /dev/null
+    echo
+    echo "Installing SignedGatherer in ../bin/java"
+    mv SignedGatherer.jar ../bin/java/.
 fi
-
-# Can't have two different org directories in jared-up  sequence
-# => merge them on the file system
-
-/bin/mv classes/org orgmerge/.
-/bin/cp -r libexpand/org orgmerge/.
-
-jar cvf GLI.jar .java.policy metadata.zip collect.zip \
-    plugins.dat classifiers.dat help \
-    -C classes . \
-    -C libexpand com -C libexpand de -C libexpand javax -C libexpand jp \
-    -C orgmerge org
-