Changeset 10422

Timestamp:

2005-08-05T12:14:12+12:00 (19 years ago)

Author:

mdewsnip

Message:

Made makegli.bat run clean.bat also, to remove all class files so everything is recompiled.

Location:

trunk/gli

Files:

• clean.bat (modified) (1 diff)
• clean.sh (modified) (2 diffs)
• makegli.bat (modified) (2 diffs)
• makegli.sh (modified) (3 diffs)

trunk/gli/clean.bat

@@ -43 +43 @@
 :exit
 echo.
-pause

trunk/gli/clean.sh

@@ -5 +5 @@
 
 ## ---- Remove class files ----
+echo
 if [ "$glilang" == "es" ]; then
     echo "Eliminando los archivos de clase de la Interfaz de la Biblioteca "
@@ -28 +29 @@
     echo "Done!"
 fi
+echo

trunk/gli/makegli.bat

@@ -108 +108 @@
 :makeGLI
 :: ---- Compile the GLI ----
-echo.
 
 if "%1" == "" goto makeAll
     :: If a file has been specified as a command-line argument, just compile that file
+    echo.
     if "%GLILANG%" == "en" echo Compiling %1 and dependent classes...
     if "%GLILANG%" == "es" echo Compilando %1 y clases dependientes...
@@ -127 +127 @@
 :makeAll
 :: Otherwise compile the lot...
+
+:: Remove any existing class files first
+call clean.bat
+
 if "%GLILANG%" == "en" echo Compiling the Greenstone Librarian Interface...
 if "%GLILANG%" == "es" echo Compilando la Interfaz de la Biblioteca Digital Greenstone...

trunk/gli/makegli.sh

@@ -79 +79 @@
 
 ## ---- Compile the GLI ----
-echo
 
 # If a file has been specified at the command-line, just compile that file
 if [ ! "x$*" = "x" ] ; then
+    echo
     if [ "$glilang" == "es" ]; then
     echo "Compilando $* y clases dependientes..."
@@ -108 +108 @@
 
 # Otherwise compile the lot...
+
+# Remove any existing class files first
+./clean.sh
+
 if [ "$glilang" == "es" ]; then
     echo "Compilando la Interfaz de la Biblioteca Digital Greenstone..."
@@ -117 +121 @@
     echo "Compiling the Greenstone Librarian Interface..."
 fi
-
-# Remove any existing class files
-./clean.sh > /dev/null
 
 # Compile the GLI