Changeset 19524 for indexers/trunk/mgpp

Timestamp:

2009-05-19T16:59:34+12:00 (15 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/mgpp

Files:

• java/org/greenstone/mgpp/winMake.bat (modified) (1 diff)
• jni/win32.mak (modified) (3 diffs)
• lib/win32.mak (modified) (1 diff)
• text/win32.mak (modified) (3 diffs)
• winMake.bat (modified) (4 diffs)

indexers/trunk/mgpp/java/org/greenstone/mgpp/winMake.bat

@@ -14 +14 @@
 
 set JAVACOPTIONS= -deprecation -g -O
+
+if "%DEBUG%" == "" (
+  set MAKE_VARS=DEBUG=0
+) else (
+  set MAKE_VARS=DEBUG=%DEBUG%
+)
 
 

indexers/trunk/mgpp/jni/win32.mak

@@ -30 +30 @@
 ICONV_DIR = ../../packages/windows/iconv/iconv/lib
 
+DEBUG = 0
 ENABLE_ACCENTFOLD = 1
 
@@ -42 +43 @@
 AR = lib
 CC = cl
-CPPFLAGS = -GX
+
+!IF $(DEBUG)
+CXXFLAGS = -DEBUG -Z7 /errorReport:prompt
+!ELSE
+CXXFLAGS =
+!ENDIF
+
+CXXFLAGS = $(CXXFLAGS) -GX
 
 DEFS = -DQUIET -DHAVE_CONFIG_H -DSHORT_SUFFIX -DHAVE_STRING_H -D__WIN32__
@@ -48 +56 @@
            -I"$(JAVA_HOME)\include" -I"$(JAVA_HOME)\include\win32" $(AFINCLUDES)           
 
-COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES) 
+COMPILE = $(CC) -c $(CXXFLAGS) $(DEFS) $(INCLUDES) 
  
 .SUFFIXES:

indexers/trunk/mgpp/lib/win32.mak

@@ -27 +27 @@
 MGPPHOME = ..
 
+DEBUG = 0
+
 AR = lib
 CC = cl
-CPPFLAGS = 
+
+!IF $(DEBUG)
+CXXFLAGS = -DEBUG -Z7 /errorReport:prompt
+!ELSE
+CXXFLAGS =
+!ENDIF
+
 
 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
 INCLUDES = -I"." -I"$(MGPPHOME)"
 
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS)
+COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CXXFLAGS)
 
 .SUFFIXES:

indexers/trunk/mgpp/text/win32.mak

@@ -30 +30 @@
 ICONV_DIR = ../../packages/windows/iconv/iconv
 
+DEBUG = 0
 GSDL_VC4 = 0
 ENABLE_ACCENTFOLD = 1
 
+!IF $(DEBUG)
+CXXFLAGS = -DEBUG -Z7 /errorReport:prompt
+LDFLAGS = -DEBUG -Z7 /errorReport:prompt
+!ELSE
+CXXFLAGS =
+LDFLAGS =
+!ENDIF
+
 !IF $(GSDL_VC4)
-CPPFLAGS = -GX
+CXXFLAGS = $(CXXFLAGS) -GX
 !ELSE
-CPPFLAGS = -EHsc
+CXXFLAGS = $(CXXFLAGS) -EHsc
 !ENDIF
 
@@ -53 +62 @@
 AR = lib
 CC = cl
-LINK = cl
 
 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -DSILENT -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
         -D__STDC__ -D__GNU_LIBRARY__ -D__MSDOS__ $(AFDEFS)
 INCLUDES = -I"." -I"$(MGPPHOME)" -I"$(MGPPHOME)\lib" $(AFINCLUDES)
+COMPILE = $(CC) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
+
+LINK = $(CC) $(LDFLAGS)
+
 LIBS = $(MGPPHOME)\lib\libmgpplib.lib $(AFLIBS) 
-
-COMPILE = $(CC) -c  $(CPPFLAGS) $(DEFS) $(INCLUDES)
 
 .SUFFIXES:
@@ -217 +227 @@
         if exist libmgpptext.lib del libmgpptext.lib 
         if exist libmgpppass.lib del libmgpppass.lib
-
+    if exist *.pdb del *.pdb
+

indexers/trunk/mgpp/winMake.bat

@@ -3 +3 @@
 set MAKE=nmake
 set MAKE_OPTIONS=/f
+
+if "%DEBUG%" == "" (
+  set MAKE_VARS=DEBUG=0
+) else (
+  set MAKE_VARS=DEBUG=%DEBUG%
+)
 
 if ""%1"" == """" goto all
@@ -19 +25 @@
 :all
     cd lib
-    %MAKE% %MAKE_OPTIONS% win32.mak %1
+    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 
     cd ..
 
     cd text
-    %MAKE% %MAKE_OPTIONS% win32.mak %1
+    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 
     cd ..
 
@@ -31 +37 @@
 
     cd jni
-    %MAKE% %MAKE_OPTIONS% win32.mak %1
+    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 
     cd ..
     goto done
@@ -43 +49 @@
 :nojava
     cd lib
-    %MAKE% %MAKE_OPTIONS% win32.mak %1
+    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 
     cd ..
 
     cd text
-    %MAKE% %MAKE_OPTIONS% win32.mak %1
+    %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 
     cd ..
     goto done