Changeset 19524


Ignore:
Timestamp:
2009-05-19T16:59:34+12:00 (12 years ago)
Author:
ak19
Message:

Dr Bainbridge updated the Windows makefiles to 1. Take the DEBUG flag so that we can recompile all of GS2 in the Vis C++ 2005 Express Edition command prompt and then use its Debugger on the C code. 2. Now GS2 make clean command cleans up all object and lib files that its make generates.

Location:
indexers/trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed
  • indexers/trunk/lucene-gs/winMake.bat

    r16583 r19524  
    1818set MYCLASSPATH=%LUCENE_JAR%;%JAVACLASSDIR%
    1919
     20if "%DEBUG%" == "" (
     21  set MAKE_VARS=DEBUG=0
     22) else (
     23  set MAKE_VARS=DEBUG=%DEBUG%
     24)
    2025
    2126if ""%1"" == """" goto all
  • indexers/trunk/mg/java/org/greenstone/mg/winMake.bat

    r16583 r19524  
    1414
    1515set JAVACOPTIONS= -deprecation -g -O
     16
     17if "%DEBUG%" == "" (
     18  set MAKE_VARS=DEBUG=0
     19) else (
     20  set MAKE_VARS=DEBUG=%DEBUG%
     21)
    1622
    1723
  • indexers/trunk/mg/jni/win32.mak

    r16583 r19524  
    2929AR = lib
    3030CC = cl
    31 CPPFLAGS =
     31DEBUG = 0
     32CXXFLAGS =
     33
     34!IF $(DEBUG)
     35CFLAGS = -DEBUG -Z7 /errorReport:prompt
     36LDFLAGS = -DEBUG -Z7 /errorReport:prompt
     37!ELSE
     38CFLAGS =
     39LDFLAGS =
     40!ENDIF
    3241
    3342DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN -DPARADOCNUM \
     
    3645           -I"$(JAVA_HOME)\include" -I"$(JAVA_HOME)\include\win32"           
    3746
    38 COMPILE = $(CC) -c $(DEFS) $(INCLUDES)
     47COMPILE = $(CC) $(CFLAGS) -c $(DEFS) $(INCLUDES)
    3948 
    4049.SUFFIXES:
  • indexers/trunk/mg/lib/win32.mak

    r16583 r19524  
    2929AR = lib
    3030CC = cl
    31 CPPFLAGS =
     31
     32DEBUG = 0
     33
     34!IF $(DEBUG)
     35CFLAGS = -DEBUG -Z7 /errorReport:prompt
     36ARFLAGS = /DEBUG /Z7 /errorReport:prompt
     37!ELSE
     38CFLAGS =
     39ARFLAGS =
     40!ENDIF
     41
    3242
    3343DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN -DPARADOCNUM \
     
    3646INCLUDES = -I"." -I"$(MGHOME)"
    3747
    38 COMPILE = $(CC) -c $(DEFS) $(INCLUDES)
     48COMPILE = $(CC) $(CFLAGS) -c $(DEFS) $(INCLUDES)
    3949 
    4050.SUFFIXES: .c .obj
     
    8393libmglib.lib : $(OBJECTS)
    8494        if exist libmglib.lib del libmglib.lib
    85     $(AR) /out:libmglib.lib $(OBJECTS)
     95    $(AR) /out:libmglib.lib $(ARFLAGS) $(OBJECTS)
    8696
    8797install:
  • indexers/trunk/mg/src/images/win32.mak

    r16583 r19524  
    2727INSTALLDIR = ..\..\..\bin
    2828
     29DEBUG = 0
     30
    2931CC = cl
    30 CPPFLAGS =
     32
     33!IF $(DEBUG)
     34CFLAGS = -DEBUG -Z7 /errorReport:prompt
     35LDFLAGS = -DEBUG -Z7 /errorReport:prompt
     36!ELSE
     37CFLAGS =
     38LDFLAGS =
     39!ENDIF
     40
    3141DEFS = -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN -D_CRT_SECURE_NO_DEPRECATE
    3242INCLUDES = -I"." -I"$(MGHOME)" -I"$(MGHOME)\lib"
    33 LDFLAGS =
    3443LIBS = $(MGHOME)\lib\libmglib.lib
    3544 
    36 COMPILE = $(CC) -c $(DEFS) $(INCLUDES)
     45COMPILE = $(CC) $(CFLAGS) -c $(DEFS) $(INCLUDES)
    3746LINK = $(CC) $(LDFLAGS)
    3847
     
    144153clean: mostlyclean
    145154    if exist *$e del *$e
    146  
     155    if exist *.pdb del *.pdb
     156
    147157distclean: clean
    148158    del ansi2knr
  • indexers/trunk/mg/src/text/win32.mak

    r16583 r19524  
    2929INSTALLDIR = ..\..\..\bin
    3030
     31DEBUG = 0
     32
    3133AR = lib
    32 
    3334CC = cl
    34 CPPFLAGS =
     35
     36!IF $(DEBUG)
     37CFLAGS = -DEBUG -Z7 /errorReport:prompt
     38LDFLAGS = -DEBUG -Z7 /errorReport:prompt
     39!ELSE
     40CFLAGS =
     41LDFLAGS =
     42!ENDIF
     43
     44
    3545DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H \
    3646       -D__WIN32__ -D_LITTLE_ENDIAN -D_CRT_SECURE_NO_DEPRECATE
    3747INCLUDES = -I"." -I"$(MGHOME)" -I"$(MGHOME)\lib"
    38 COMPILE = $(CC) $(CPPFLAGS) -c $(DEFS) $(INCLUDES)
    39 
    40 LDFLAGS =
     48COMPILE = $(CC) $(CFLAGS) -c $(DEFS) $(INCLUDES)
     49
    4150LINK = $(CC) $(LDFLAGS)
    4251
     
    241250        if exist libmgtext.lib del libmgtext.lib
    242251        if exist libmgpass.lib del libmgpass.lib
     252    if exist *.pdb del *.pdb
  • indexers/trunk/mg/win32.mak

    r16583 r19524  
    2525###########################################################################
    2626
     27
     28
    2729AR = lib
    2830CC = cl
    29 CPPFLAGS =
    3031
    3132MGHOME = $(MAKEDIR)
     33DEBUG = 0
    3234DLL = 0
    3335DLLDEBUG = 0
    3436
    3537MDEFINES = /f win32.mak
    36 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
    37 
    38 SOURCES =
    39 
    40 OBJECTS =
    4138
    4239OTHERDIRS = lib
     
    4542
    4643MAKECMD = $(MAKE) $(MDEFINES)
     44!IF $(DEBUG)
     45MAKECMD = $(MAKECMD) DEBUG=1
     46!ENDIF
    4747!IF $(DLL)
    4848MAKECMD = $(MAKECMD) DLL=1
  • indexers/trunk/mg/winMake.bat

    r16583 r19524  
    33set MAKE=nmake
    44set MAKE_OPTIONS=/f
     5
     6if "%DEBUG%" == "" (
     7  set MAKE_VARS=DEBUG=0
     8) else (
     9  set MAKE_VARS=DEBUG=%DEBUG%
     10)
    511
    612if ""%1"" == """" goto all
     
    1925:all
    2026    cd lib
    21     %MAKE% %MAKE_OPTIONS% win32.mak %1
     27    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS%
    2228    cd ..
    2329
    2430    cd src\images
    25     %MAKE% %MAKE_OPTIONS% win32.mak %1
     31    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS%
    2632    cd ..\..
    2733
    2834    cd src\text
    29     %MAKE% %MAKE_OPTIONS% win32.mak %1
     35    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS%
    3036    cd ..\..
    3137
     
    3541
    3642    cd jni
    37     %MAKE% %MAKE_OPTIONS% win32.mak %1
     43    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS%
    3844    cd ..
    3945    goto done
     
    4652:nojava
    4753    cd lib
    48     %MAKE% %MAKE_OPTIONS% win32.mak %1
     54    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS%
    4955    cd ..
    5056
    5157    cd src\images
    52     %MAKE% %MAKE_OPTIONS% win32.mak %1
     58    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS%
    5359    cd ..\..
    5460
    5561    cd src\text
    56     %MAKE% %MAKE_OPTIONS% win32.mak %1
     62    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS%
    5763    cd ..\..
    5864    goto done
  • indexers/trunk/mgpp/java/org/greenstone/mgpp/winMake.bat

    r16583 r19524  
    1414
    1515set JAVACOPTIONS= -deprecation -g -O
     16
     17if "%DEBUG%" == "" (
     18  set MAKE_VARS=DEBUG=0
     19) else (
     20  set MAKE_VARS=DEBUG=%DEBUG%
     21)
    1622
    1723
  • indexers/trunk/mgpp/jni/win32.mak

    r17007 r19524  
    3030ICONV_DIR = ../../packages/windows/iconv/iconv/lib
    3131
     32DEBUG = 0
    3233ENABLE_ACCENTFOLD = 1
    3334
     
    4243AR = lib
    4344CC = cl
    44 CPPFLAGS = -GX
     45
     46!IF $(DEBUG)
     47CXXFLAGS = -DEBUG -Z7 /errorReport:prompt
     48!ELSE
     49CXXFLAGS =
     50!ENDIF
     51
     52CXXFLAGS = $(CXXFLAGS) -GX
    4553
    4654DEFS = -DQUIET -DHAVE_CONFIG_H -DSHORT_SUFFIX -DHAVE_STRING_H -D__WIN32__
     
    4856           -I"$(JAVA_HOME)\include" -I"$(JAVA_HOME)\include\win32" $(AFINCLUDES)           
    4957
    50 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
     58COMPILE = $(CC) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
    5159 
    5260.SUFFIXES:
  • indexers/trunk/mgpp/lib/win32.mak

    r16583 r19524  
    2727MGPPHOME = ..
    2828
     29DEBUG = 0
     30
    2931AR = lib
    3032CC = cl
    31 CPPFLAGS =
     33
     34!IF $(DEBUG)
     35CXXFLAGS = -DEBUG -Z7 /errorReport:prompt
     36!ELSE
     37CXXFLAGS =
     38!ENDIF
     39
    3240
    3341DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
    3442INCLUDES = -I"." -I"$(MGPPHOME)"
    3543
    36 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS)
     44COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CXXFLAGS)
    3745
    3846.SUFFIXES:
  • indexers/trunk/mgpp/text/win32.mak

    r17894 r19524  
    3030ICONV_DIR = ../../packages/windows/iconv/iconv
    3131
     32DEBUG = 0
    3233GSDL_VC4 = 0
    3334ENABLE_ACCENTFOLD = 1
    3435
     36!IF $(DEBUG)
     37CXXFLAGS = -DEBUG -Z7 /errorReport:prompt
     38LDFLAGS = -DEBUG -Z7 /errorReport:prompt
     39!ELSE
     40CXXFLAGS =
     41LDFLAGS =
     42!ENDIF
     43
    3544!IF $(GSDL_VC4)
    36 CPPFLAGS = -GX
     45CXXFLAGS = $(CXXFLAGS) -GX
    3746!ELSE
    38 CPPFLAGS = -EHsc
     47CXXFLAGS = $(CXXFLAGS) -EHsc
    3948!ENDIF
    4049
     
    5362AR = lib
    5463CC = cl
    55 LINK = cl
    5664
    5765DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -DSILENT -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
    5866        -D__STDC__ -D__GNU_LIBRARY__ -D__MSDOS__ $(AFDEFS)
    5967INCLUDES = -I"." -I"$(MGPPHOME)" -I"$(MGPPHOME)\lib" $(AFINCLUDES)
     68COMPILE = $(CC) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
     69
     70LINK = $(CC) $(LDFLAGS)
     71
    6072LIBS = $(MGPPHOME)\lib\libmgpplib.lib $(AFLIBS)
    61 
    62 COMPILE = $(CC) -c  $(CPPFLAGS) $(DEFS) $(INCLUDES)
    6373
    6474.SUFFIXES:
     
    217227        if exist libmgpptext.lib del libmgpptext.lib
    218228        if exist libmgpppass.lib del libmgpppass.lib
    219 
     229    if exist *.pdb del *.pdb
     230
  • indexers/trunk/mgpp/winMake.bat

    r16583 r19524  
    33set MAKE=nmake
    44set MAKE_OPTIONS=/f
     5
     6if "%DEBUG%" == "" (
     7  set MAKE_VARS=DEBUG=0
     8) else (
     9  set MAKE_VARS=DEBUG=%DEBUG%
     10)
    511
    612if ""%1"" == """" goto all
     
    1925:all
    2026    cd lib
    21     %MAKE% %MAKE_OPTIONS% win32.mak %1
     27    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS%
    2228    cd ..
    2329
    2430    cd text
    25     %MAKE% %MAKE_OPTIONS% win32.mak %1
     31    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS%
    2632    cd ..
    2733
     
    3137
    3238    cd jni
    33     %MAKE% %MAKE_OPTIONS% win32.mak %1
     39    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS%
    3440    cd ..
    3541    goto done
     
    4349:nojava
    4450    cd lib
    45     %MAKE% %MAKE_OPTIONS% win32.mak %1
     51    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS%
    4652    cd ..
    4753
    4854    cd text
    49     %MAKE% %MAKE_OPTIONS% win32.mak %1
     55    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS%
    5056    cd ..
    5157    goto done
  • indexers/trunk/packages/unac/win32.mak

    r16583 r19524  
    44AR = lib
    55
     6DEBUG = 0
    67DLL = 0
    78DLLDEBUG = 0
     
    910
    1011INCLUDES = -I. -DUNAC_VERSION=\"1.7.0\"
     12
     13!IF $(DEBUG)
     14CXXFLAGS = -DEBUG -Z7 /errorReport:prompt
     15!ELSE
     16CXXFLAGS =
     17!ENDIF
     18
    1119!IF $(GSDL_VC4)
    12 CPPFLAGS = -GX
     20CXXFLAGS = $(CXXFLAGS) -GX
    1321!ELSE
    14 CPPFLAGS = -EHsc
     22CXXFLAGS = $(CXXFLAGS) -EHsc
    1523!ENDIF
    1624
    1725!IF $(DLL)
    18 CPPFLAGS = $(CPPFLAGS) -MD
     26CXXFLAGS = $(CXXFLAGS) -MD
    1927!ELSE
    2028!IF ($(DLLDEBUG))
    21 CPPFLAGS = $(CPPFLAGS) -MDd
     29CXXFLAGS = $(CXXFLAGS) -MDd
    2230!ENDIF
    2331!ENDIF
    2432
    2533
    26 COMPILE = $(CC) -nologo -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
     34COMPILE = $(CC) -nologo -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
    2735LINK = $(CC) -nologo $(LDFLAGS)
    2836
  • indexers/trunk/winMake.bat

    r18310 r19524  
    33set MAKE=nmake
    44set MAKE_OPTIONS=/f
     5
     6if "%DEBUG%" == "" (
     7  set MAKE_VARS=DEBUG=0
     8) else (
     9  set MAKE_VARS=DEBUG=%DEBUG%
     10)
    511
    612if ""%1"" == """" goto all
     
    2733    if NOT EXIST "iconv" unzip iconv.zip
    2834    cd iconv
    29     %MAKE% %MAKE_OPTIONS% Makefile.msvc NO_NLS=1
     35    %MAKE% %MAKE_OPTIONS% Makefile.msvc %MAKE_VARS% NO_NLS=1
    3036    cd ..\..\..\..
    3137
    3238    cd packages\unac
    33     %MAKE% %MAKE_OPTIONS% win32.mak %1
     39    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS%
    3440    cd ..\..
    3541
    3642    cd mg
    37     call winMake.bat %1 
     43    call winMake.bat %1
    3844    cd ..
    3945
     
    4551    call winMake.bat %1
    4652    cd ..
     53
     54    if ""%1"" == ""clean"" goto clean2
    4755    goto done
     56
     57:: Need another clean because a pre-all clean command sent to iconv regenerates some lib
     58:: and object files. So we delete these after it's finished processing the clean command
     59:clean2
     60    for %%I in (lib srclib libcharset\lib) do if exist packages\windows\iconv\iconv\%%I\^*.obj del packages\windows\iconv\iconv\%%I\*.obj;
     61    for %%I in (lib srclib libcharset\lib) do if exist packages\windows\iconv\iconv\%%I\^*.lib del packages\windows\iconv\iconv\%%I\*.lib;
    4862
    4963:java
     
    6377:nojava
    6478    cd packages\windows\iconv\iconv
    65     %MAKE% %MAKE_OPTIONS% Makefile.msvc NO_NLS=1
     79    %MAKE% %MAKE_OPTIONS% Makefile.msvc %MAKE_VARS% NO_NLS=1
    6680    cd ..\..\..\..
    6781
    6882    cd packages\unac
    69     %MAKE% %MAKE_OPTIONS% win32.mak %1
     83    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS%
    7084    cd ..\..
    7185
     
    8397
    8498    cd packages\windows\iconv\iconv
    85     %MAKE% %MAKE_OPTIONS% Makefile.msvc NO_NLS=1
     99    %MAKE% %MAKE_OPTIONS% Makefile.msvc %MAKE_VARS% NO_NLS=1
    86100    cd ..\..\..\..
    87101
    88102    cd packages\unac
    89     %MAKE% %MAKE_OPTIONS% win32.mak %1
     103    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS%
    90104    cd ..\..
    91105
Note: See TracChangeset for help on using the changeset viewer.