Changeset 21337

Show
Ignore:
Timestamp:
11.12.2009 14:44:12 (10 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/win32.mak

    r21332 r21337  
    9898!IF "$(USE_SQLITE)" == "1" 
    9999    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 
    100     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. ****** 
     100    @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. ****** 
     101    @IF NOT EXIST $(SQLITE_DIR) exit /b 1 
    101102!ENDIF 
    102103 
     
    191192    if NOT EXIST "$(GSDLHOME)\bin\java" mkdir "$(GSDLHOME)\bin\java" 
    192193    for %%i in (bin\*.exe) do \ 
    193       copy %%i "$(GSDLHOME)\bin\windows" 
     194      if exist %%i copy %%i "$(GSDLHOME)\bin\windows" 
    194195    if EXIST "lucene-gs\LuceneWrapper.jar" copy "lucene-gs\LuceneWrapper.jar" "$(GSDLHOME)\bin\java" 
    195196    @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

    r21332 r21337  
    3030compile:  
    3131    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=. 
    32     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. ****** 
    33     if not exist "$(APACHEHOME)" exit /b 1 
     32    @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. ****** 
     33    @if not exist "$(APACHEHOME)" exit /b 1 
    3434    cd "$(APACHEHOME)" 
    3535    copy "$(GSDLHOME)\bin\windows\awk.exe" "$(APACHEHOME)\."