Changeset 19524
- Timestamp:
- 2009-05-19T16:59:34+12:00 (15 years ago)
- Location:
- indexers/trunk
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
indexers/trunk/lucene-gs/winMake.bat
r16583 r19524 18 18 set MYCLASSPATH=%LUCENE_JAR%;%JAVACLASSDIR% 19 19 20 if "%DEBUG%" == "" ( 21 set MAKE_VARS=DEBUG=0 22 ) else ( 23 set MAKE_VARS=DEBUG=%DEBUG% 24 ) 20 25 21 26 if ""%1"" == """" goto all -
indexers/trunk/mg/java/org/greenstone/mg/winMake.bat
r16583 r19524 14 14 15 15 set JAVACOPTIONS= -deprecation -g -O 16 17 if "%DEBUG%" == "" ( 18 set MAKE_VARS=DEBUG=0 19 ) else ( 20 set MAKE_VARS=DEBUG=%DEBUG% 21 ) 16 22 17 23 -
indexers/trunk/mg/jni/win32.mak
r16583 r19524 29 29 AR = lib 30 30 CC = cl 31 CPPFLAGS = 31 DEBUG = 0 32 CXXFLAGS = 33 34 !IF $(DEBUG) 35 CFLAGS = -DEBUG -Z7 /errorReport:prompt 36 LDFLAGS = -DEBUG -Z7 /errorReport:prompt 37 !ELSE 38 CFLAGS = 39 LDFLAGS = 40 !ENDIF 32 41 33 42 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN -DPARADOCNUM \ … … 36 45 -I"$(JAVA_HOME)\include" -I"$(JAVA_HOME)\include\win32" 37 46 38 COMPILE = $(CC) -c $(DEFS) $(INCLUDES)47 COMPILE = $(CC) $(CFLAGS) -c $(DEFS) $(INCLUDES) 39 48 40 49 .SUFFIXES: -
indexers/trunk/mg/lib/win32.mak
r16583 r19524 29 29 AR = lib 30 30 CC = cl 31 CPPFLAGS = 31 32 DEBUG = 0 33 34 !IF $(DEBUG) 35 CFLAGS = -DEBUG -Z7 /errorReport:prompt 36 ARFLAGS = /DEBUG /Z7 /errorReport:prompt 37 !ELSE 38 CFLAGS = 39 ARFLAGS = 40 !ENDIF 41 32 42 33 43 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN -DPARADOCNUM \ … … 36 46 INCLUDES = -I"." -I"$(MGHOME)" 37 47 38 COMPILE = $(CC) -c $(DEFS) $(INCLUDES)48 COMPILE = $(CC) $(CFLAGS) -c $(DEFS) $(INCLUDES) 39 49 40 50 .SUFFIXES: .c .obj … … 83 93 libmglib.lib : $(OBJECTS) 84 94 if exist libmglib.lib del libmglib.lib 85 $(AR) /out:libmglib.lib $( OBJECTS)95 $(AR) /out:libmglib.lib $(ARFLAGS) $(OBJECTS) 86 96 87 97 install: -
indexers/trunk/mg/src/images/win32.mak
r16583 r19524 27 27 INSTALLDIR = ..\..\..\bin 28 28 29 DEBUG = 0 30 29 31 CC = cl 30 CPPFLAGS = 32 33 !IF $(DEBUG) 34 CFLAGS = -DEBUG -Z7 /errorReport:prompt 35 LDFLAGS = -DEBUG -Z7 /errorReport:prompt 36 !ELSE 37 CFLAGS = 38 LDFLAGS = 39 !ENDIF 40 31 41 DEFS = -DHAVE_CONFIG_H -D__WIN32__ -D_LITTLE_ENDIAN -D_CRT_SECURE_NO_DEPRECATE 32 42 INCLUDES = -I"." -I"$(MGHOME)" -I"$(MGHOME)\lib" 33 LDFLAGS =34 43 LIBS = $(MGHOME)\lib\libmglib.lib 35 44 36 COMPILE = $(CC) -c $(DEFS) $(INCLUDES)45 COMPILE = $(CC) $(CFLAGS) -c $(DEFS) $(INCLUDES) 37 46 LINK = $(CC) $(LDFLAGS) 38 47 … … 144 153 clean: mostlyclean 145 154 if exist *$e del *$e 146 155 if exist *.pdb del *.pdb 156 147 157 distclean: clean 148 158 del ansi2knr -
indexers/trunk/mg/src/text/win32.mak
r16583 r19524 29 29 INSTALLDIR = ..\..\..\bin 30 30 31 DEBUG = 0 32 31 33 AR = lib 32 33 34 CC = cl 34 CPPFLAGS = 35 36 !IF $(DEBUG) 37 CFLAGS = -DEBUG -Z7 /errorReport:prompt 38 LDFLAGS = -DEBUG -Z7 /errorReport:prompt 39 !ELSE 40 CFLAGS = 41 LDFLAGS = 42 !ENDIF 43 44 35 45 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H \ 36 46 -D__WIN32__ -D_LITTLE_ENDIAN -D_CRT_SECURE_NO_DEPRECATE 37 47 INCLUDES = -I"." -I"$(MGHOME)" -I"$(MGHOME)\lib" 38 COMPILE = $(CC) $(CPPFLAGS) -c $(DEFS) $(INCLUDES) 39 40 LDFLAGS = 48 COMPILE = $(CC) $(CFLAGS) -c $(DEFS) $(INCLUDES) 49 41 50 LINK = $(CC) $(LDFLAGS) 42 51 … … 241 250 if exist libmgtext.lib del libmgtext.lib 242 251 if exist libmgpass.lib del libmgpass.lib 252 if exist *.pdb del *.pdb -
indexers/trunk/mg/win32.mak
r16583 r19524 25 25 ########################################################################### 26 26 27 28 27 29 AR = lib 28 30 CC = cl 29 CPPFLAGS =30 31 31 32 MGHOME = $(MAKEDIR) 33 DEBUG = 0 32 34 DLL = 0 33 35 DLLDEBUG = 0 34 36 35 37 MDEFINES = /f win32.mak 36 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)37 38 SOURCES =39 40 OBJECTS =41 38 42 39 OTHERDIRS = lib … … 45 42 46 43 MAKECMD = $(MAKE) $(MDEFINES) 44 !IF $(DEBUG) 45 MAKECMD = $(MAKECMD) DEBUG=1 46 !ENDIF 47 47 !IF $(DLL) 48 48 MAKECMD = $(MAKECMD) DLL=1 -
indexers/trunk/mg/winMake.bat
r16583 r19524 3 3 set MAKE=nmake 4 4 set MAKE_OPTIONS=/f 5 6 if "%DEBUG%" == "" ( 7 set MAKE_VARS=DEBUG=0 8 ) else ( 9 set MAKE_VARS=DEBUG=%DEBUG% 10 ) 5 11 6 12 if ""%1"" == """" goto all … … 19 25 :all 20 26 cd lib 21 %MAKE% %MAKE_OPTIONS% win32.mak %1 27 %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 22 28 cd .. 23 29 24 30 cd src\images 25 %MAKE% %MAKE_OPTIONS% win32.mak %1 31 %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 26 32 cd ..\.. 27 33 28 34 cd src\text 29 %MAKE% %MAKE_OPTIONS% win32.mak %1 35 %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 30 36 cd ..\.. 31 37 … … 35 41 36 42 cd jni 37 %MAKE% %MAKE_OPTIONS% win32.mak %1 43 %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 38 44 cd .. 39 45 goto done … … 46 52 :nojava 47 53 cd lib 48 %MAKE% %MAKE_OPTIONS% win32.mak %1 54 %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 49 55 cd .. 50 56 51 57 cd src\images 52 %MAKE% %MAKE_OPTIONS% win32.mak %1 58 %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 53 59 cd ..\.. 54 60 55 61 cd src\text 56 %MAKE% %MAKE_OPTIONS% win32.mak %1 62 %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 57 63 cd ..\.. 58 64 goto done -
indexers/trunk/mgpp/java/org/greenstone/mgpp/winMake.bat
r16583 r19524 14 14 15 15 set JAVACOPTIONS= -deprecation -g -O 16 17 if "%DEBUG%" == "" ( 18 set MAKE_VARS=DEBUG=0 19 ) else ( 20 set MAKE_VARS=DEBUG=%DEBUG% 21 ) 16 22 17 23 -
indexers/trunk/mgpp/jni/win32.mak
r17007 r19524 30 30 ICONV_DIR = ../../packages/windows/iconv/iconv/lib 31 31 32 DEBUG = 0 32 33 ENABLE_ACCENTFOLD = 1 33 34 … … 42 43 AR = lib 43 44 CC = cl 44 CPPFLAGS = -GX 45 46 !IF $(DEBUG) 47 CXXFLAGS = -DEBUG -Z7 /errorReport:prompt 48 !ELSE 49 CXXFLAGS = 50 !ENDIF 51 52 CXXFLAGS = $(CXXFLAGS) -GX 45 53 46 54 DEFS = -DQUIET -DHAVE_CONFIG_H -DSHORT_SUFFIX -DHAVE_STRING_H -D__WIN32__ … … 48 56 -I"$(JAVA_HOME)\include" -I"$(JAVA_HOME)\include\win32" $(AFINCLUDES) 49 57 50 COMPILE = $(CC) -c $(C PPFLAGS) $(DEFS) $(INCLUDES)58 COMPILE = $(CC) -c $(CXXFLAGS) $(DEFS) $(INCLUDES) 51 59 52 60 .SUFFIXES: -
indexers/trunk/mgpp/lib/win32.mak
r16583 r19524 27 27 MGPPHOME = .. 28 28 29 DEBUG = 0 30 29 31 AR = lib 30 32 CC = cl 31 CPPFLAGS = 33 34 !IF $(DEBUG) 35 CXXFLAGS = -DEBUG -Z7 /errorReport:prompt 36 !ELSE 37 CXXFLAGS = 38 !ENDIF 39 32 40 33 41 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 34 42 INCLUDES = -I"." -I"$(MGPPHOME)" 35 43 36 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(C PPFLAGS)44 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CXXFLAGS) 37 45 38 46 .SUFFIXES: -
indexers/trunk/mgpp/text/win32.mak
r17894 r19524 30 30 ICONV_DIR = ../../packages/windows/iconv/iconv 31 31 32 DEBUG = 0 32 33 GSDL_VC4 = 0 33 34 ENABLE_ACCENTFOLD = 1 34 35 36 !IF $(DEBUG) 37 CXXFLAGS = -DEBUG -Z7 /errorReport:prompt 38 LDFLAGS = -DEBUG -Z7 /errorReport:prompt 39 !ELSE 40 CXXFLAGS = 41 LDFLAGS = 42 !ENDIF 43 35 44 !IF $(GSDL_VC4) 36 C PPFLAGS =-GX45 CXXFLAGS = $(CXXFLAGS) -GX 37 46 !ELSE 38 C PPFLAGS =-EHsc47 CXXFLAGS = $(CXXFLAGS) -EHsc 39 48 !ENDIF 40 49 … … 53 62 AR = lib 54 63 CC = cl 55 LINK = cl56 64 57 65 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -DSILENT -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 58 66 -D__STDC__ -D__GNU_LIBRARY__ -D__MSDOS__ $(AFDEFS) 59 67 INCLUDES = -I"." -I"$(MGPPHOME)" -I"$(MGPPHOME)\lib" $(AFINCLUDES) 68 COMPILE = $(CC) -c $(CXXFLAGS) $(DEFS) $(INCLUDES) 69 70 LINK = $(CC) $(LDFLAGS) 71 60 72 LIBS = $(MGPPHOME)\lib\libmgpplib.lib $(AFLIBS) 61 62 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)63 73 64 74 .SUFFIXES: … … 217 227 if exist libmgpptext.lib del libmgpptext.lib 218 228 if exist libmgpppass.lib del libmgpppass.lib 219 229 if exist *.pdb del *.pdb 230 -
indexers/trunk/mgpp/winMake.bat
r16583 r19524 3 3 set MAKE=nmake 4 4 set MAKE_OPTIONS=/f 5 6 if "%DEBUG%" == "" ( 7 set MAKE_VARS=DEBUG=0 8 ) else ( 9 set MAKE_VARS=DEBUG=%DEBUG% 10 ) 5 11 6 12 if ""%1"" == """" goto all … … 19 25 :all 20 26 cd lib 21 %MAKE% %MAKE_OPTIONS% win32.mak %1 27 %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 22 28 cd .. 23 29 24 30 cd text 25 %MAKE% %MAKE_OPTIONS% win32.mak %1 31 %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 26 32 cd .. 27 33 … … 31 37 32 38 cd jni 33 %MAKE% %MAKE_OPTIONS% win32.mak %1 39 %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 34 40 cd .. 35 41 goto done … … 43 49 :nojava 44 50 cd lib 45 %MAKE% %MAKE_OPTIONS% win32.mak %1 51 %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 46 52 cd .. 47 53 48 54 cd text 49 %MAKE% %MAKE_OPTIONS% win32.mak %1 55 %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 50 56 cd .. 51 57 goto done -
indexers/trunk/packages/unac/win32.mak
r16583 r19524 4 4 AR = lib 5 5 6 DEBUG = 0 6 7 DLL = 0 7 8 DLLDEBUG = 0 … … 9 10 10 11 INCLUDES = -I. -DUNAC_VERSION=\"1.7.0\" 12 13 !IF $(DEBUG) 14 CXXFLAGS = -DEBUG -Z7 /errorReport:prompt 15 !ELSE 16 CXXFLAGS = 17 !ENDIF 18 11 19 !IF $(GSDL_VC4) 12 C PPFLAGS =-GX20 CXXFLAGS = $(CXXFLAGS) -GX 13 21 !ELSE 14 C PPFLAGS =-EHsc22 CXXFLAGS = $(CXXFLAGS) -EHsc 15 23 !ENDIF 16 24 17 25 !IF $(DLL) 18 C PPFLAGS = $(CPPFLAGS) -MD26 CXXFLAGS = $(CXXFLAGS) -MD 19 27 !ELSE 20 28 !IF ($(DLLDEBUG)) 21 C PPFLAGS = $(CPPFLAGS) -MDd29 CXXFLAGS = $(CXXFLAGS) -MDd 22 30 !ENDIF 23 31 !ENDIF 24 32 25 33 26 COMPILE = $(CC) -nologo -c $(C PPFLAGS) $(DEFS) $(INCLUDES)34 COMPILE = $(CC) -nologo -c $(CXXFLAGS) $(DEFS) $(INCLUDES) 27 35 LINK = $(CC) -nologo $(LDFLAGS) 28 36 -
indexers/trunk/winMake.bat
r18310 r19524 3 3 set MAKE=nmake 4 4 set MAKE_OPTIONS=/f 5 6 if "%DEBUG%" == "" ( 7 set MAKE_VARS=DEBUG=0 8 ) else ( 9 set MAKE_VARS=DEBUG=%DEBUG% 10 ) 5 11 6 12 if ""%1"" == """" goto all … … 27 33 if NOT EXIST "iconv" unzip iconv.zip 28 34 cd iconv 29 %MAKE% %MAKE_OPTIONS% Makefile.msvc NO_NLS=135 %MAKE% %MAKE_OPTIONS% Makefile.msvc %MAKE_VARS% NO_NLS=1 30 36 cd ..\..\..\.. 31 37 32 38 cd packages\unac 33 %MAKE% %MAKE_OPTIONS% win32.mak %1 39 %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 34 40 cd ..\.. 35 41 36 42 cd mg 37 call winMake.bat %1 43 call winMake.bat %1 38 44 cd .. 39 45 … … 45 51 call winMake.bat %1 46 52 cd .. 53 54 if ""%1"" == ""clean"" goto clean2 47 55 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; 48 62 49 63 :java … … 63 77 :nojava 64 78 cd packages\windows\iconv\iconv 65 %MAKE% %MAKE_OPTIONS% Makefile.msvc NO_NLS=179 %MAKE% %MAKE_OPTIONS% Makefile.msvc %MAKE_VARS% NO_NLS=1 66 80 cd ..\..\..\.. 67 81 68 82 cd packages\unac 69 %MAKE% %MAKE_OPTIONS% win32.mak %1 83 %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 70 84 cd ..\.. 71 85 … … 83 97 84 98 cd packages\windows\iconv\iconv 85 %MAKE% %MAKE_OPTIONS% Makefile.msvc NO_NLS=199 %MAKE% %MAKE_OPTIONS% Makefile.msvc %MAKE_VARS% NO_NLS=1 86 100 cd ..\..\..\.. 87 101 88 102 cd packages\unac 89 %MAKE% %MAKE_OPTIONS% win32.mak %1 103 %MAKE% %MAKE_OPTIONS% win32.mak %1 %MAKE_VARS% 90 104 cd ..\.. 91 105
Note:
See TracChangeset
for help on using the changeset viewer.