Changeset 21337

Timestamp:

2009-12-11T14:44:12+13:00 (14 years ago)

Author:

ak19

Message:

Make tends to output every statement to the console, regardless of whether it is to be executed or not. Now some echo statements won't be displayed until the actual error condition holds true, to prevent these error messages from confusing people on normal execution.

Location:

main/trunk/greenstone2

Files:

• common-src/win32.mak (modified) (2 diffs)
• runtime-src/packages/apache-httpd/win32.mak (modified) (1 diff)

main/trunk/greenstone2/common-src/win32.mak

@@ -98 +98 @@
 !IF "$(USE_SQLITE)" == "1"
     IF NOT EXIST $(SQLITE_DIR) IF EXIST "$(GSDLHOME)\bin\windows\gunzip.exe" IF EXIST "$(GSDLHOME)\bin\windows\tar.exe" "$(GSDLHOME)\bin\windows\gunzip.exe" -cd "$(SQLITE_DIR).tar.gz" | "$(GSDLHOME)\bin\windows\tar.exe" xv --directory=./packages/sqlite
-    IF NOT EXIST $(SQLITE_DIR) echo ****** Couldn't extract archive $(SQLITE_DIR).tar.gz. Extract it manually, or check that gunzip.exe and tar.exe exist in GSDLHOME\bin\windows. ******
+    @IF NOT EXIST $(SQLITE_DIR) echo ****** Couldn't extract archive $(SQLITE_DIR).tar.gz. Extract it manually, or check that gunzip.exe and tar.exe exist in GSDLHOME\bin\windows. ******
+    @IF NOT EXIST $(SQLITE_DIR) exit /b 1
 !ENDIF
 
@@ -191 +192 @@
     if NOT EXIST "$(GSDLHOME)\bin\java" mkdir "$(GSDLHOME)\bin\java"
     for %%i in (bin\*.exe) do \
-      copy %%i "$(GSDLHOME)\bin\windows"
+      if exist %%i copy %%i "$(GSDLHOME)\bin\windows"
     if EXIST "lucene-gs\LuceneWrapper.jar" copy "lucene-gs\LuceneWrapper.jar" "$(GSDLHOME)\bin\java"
     @if NOT EXIST "lucene-gs\LuceneWrapper.jar" echo Warning: Failed to find lucene-gs\LuceneWrapper.jar.  Greenstone will not be able to use Lucene for indexing

main/trunk/greenstone2/runtime-src/packages/apache-httpd/win32.mak

@@ -30 +30 @@
 compile: 
     if not exist "$(APACHEHOME)" if exist "$(GSDLHOME)\bin\windows\gunzip.exe" if exist "$(GSDLHOME)\bin\windows\tar.exe" "$(GSDLHOME)\bin\windows\gunzip.exe" -cd "$(APACHEHOME)-gs.tar.gz" | "$(GSDLHOME)\bin\windows\tar.exe" xv --directory=.
-    if not exist "$(APACHEHOME)" echo ****** Couldn't extract archive $(APACHEHOME)-gs.tar.gz. Extract it manually, or check that gunzip.exe and tar.exe exist in $(GSDLHOME)\bin\windows. ******
-    if not exist "$(APACHEHOME)" exit /b 1
+    @if not exist "$(APACHEHOME)" echo ****** Couldn't extract archive $(APACHEHOME)-gs.tar.gz. Extract it manually, or check that gunzip.exe and tar.exe exist in $(GSDLHOME)\bin\windows. ******
+    @if not exist "$(APACHEHOME)" exit /b 1
     cd "$(APACHEHOME)"
     copy "$(GSDLHOME)\bin\windows\awk.exe" "$(APACHEHOME)\."