Changeset 16577


Ignore:
Timestamp:
2008-07-29T12:05:44+12:00 (16 years ago)
Author:
davidb
Message:

Minor tweaks to windows make files

Location:
gsdl/trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/build-src/win32.mak

    r16575 r16577  
    3434MDEFINES = /f win32.mak
    3535
    36 
    37 COMPILEDIRS = src\hashfile src\phind\generate
    38 
    3936INSTALLDIRS = src\hashfile src\phind\generate
    40 
    41 
    42 PACKAGEDIRS =
    4337
    4438
    … …  
    5751MAKECLEANCMD = $(MAKE) $(MDEFINES) clean
    5852
    59 all: win32.mak $(PACKAGEDIRS) $(COMPILEDIRS) $(INSTALLDIRS)
     53all: win32.mak $(INSTALLDIRS)
    6054
    6155install: win32.mak $(INSTALLDIRS)
    6256
    6357clean:
     58    cd "$(BUILDHOME)"
    6459    cd src\phind\generate
    6560    $(MAKECLEANCMD)
    66     cd "$(GSDLHOME)"
     61    cd "$(BUILDHOME)"
    6762    cd src\hashfile
    6863    $(MAKECLEANCMD)
    6964    cd "$(GSDLHOME)"
    7065
    71 $(COMPILEDIRS): FORCE
    72     cd "$@"
    73     $(MAKECMD)
    74     cd "$(GSDLHOME)"
    75 
    7666$(INSTALLDIRS): FORCE
     67    cd "$(BUILDHOME)"
    7768    cd "$@"
    7869    $(MAKECMD)

  • gsdl/trunk/common-src/src/lib/gsdlconf.h

    r15913 r16577  
    3737
    3838#if defined(__WIN32__) && !defined(__CYGWIN__)
    39 #include "../../win32cfg.h"
     39#include "../../../win32cfg.h"
    4040#else
    41 #include "../../config.h"
     41#include "../../../config.h"
    4242#endif
    4343

  • gsdl/trunk/common-src/src/lib/win32.mak

    r15910 r16577  
    2525###########################################################################
    2626
    27 GSDL_DIR = ..\..
    28 INDEXERS_DIR = $(GSDL_DIR)\indexers
    29 PACKAGES_DIR = $(GSDL_DIR)\packages
     27GSDL_DIR = ..\..\..
     28INDEXERS_DIR = $(GSDL_DIR)\common-src\indexers
     29PACKAGES_DIR = $(GSDL_DIR)\common-src\packages
    3030
    3131

  • gsdl/trunk/common-src/win32.mak

    r16576 r16577  
    6868
    6969clean:
     70    cd "$(COMMONHOME)"
    7071    cd packages\windows\crypt\crypt
    7172    $(MAKECLEANCMD)
    … …  
    9192
    9293$(COMPILEDIRS): FORCE
     94    cd "$(COMMONHOME)"
    9395    cd "$@"
    9496    $(MAKECMD)
    … …  
    9698
    9799$(INSTALLDIRS): FORCE
     100    cd "$(COMMONHOME)"
    98101    cd "$@"
    99102    $(MAKECMD)
    … …  
    102105
    103106$(SQLITE_DIR): FORCE
     107    cd "$(COMMONHOME)"
    104108    cd "$@"
    105109    $(MAKECMD)
    … …  
    108112
    109113$(INDEXERSDIR): FORCE
     114    cd "$(COMMONHOME)"
    110115    cd "$@"
    111116    call winMake.bat all gs2
    … …  
    115120    for %%i in (bin\*.exe) do \
    116121      copy %%i "$(GSDLHOME)\bin\windows"
    117     copy lucene-gs\LuceneWrapper.jar "$(GSDLHOME)\bin\java"
     122    if EXIST "lucene-gs\LuceneWrapper.jar" copy "lucene-gs\LuceneWrapper.jar" "$(GSDLHOME)\bin\java"
     123    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
    118124    cd "$(GSDLHOME)"
    119125

  • gsdl/trunk/runtime-src/src/colservr/win32.mak

    r16574 r16577  
    5454!IF $(USE_SQLITE)
    5555SQLITE_DEFINES = -DUSE_SQLITE
    56 SQLITE_INCLUDES = -I"$(PACKAGES_DIR)\sqlite\include"
     56SQLITE_INCLUDES = -I"$(COMMON_DIR)\packages\sqlite\include"
    5757!ELSE
    5858SQLITE_DEFINES =
    … …  
    6969    -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \
    7070    -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" \
    71     -I"$(PACKAGES_DIR)\windows\expat\expat" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" $(SQLITE_INCLUDES)
     71    -I"$(COMMON_DIR)\packages\windows\expat\expat" -I"$(COMMON_DIR)\packages\windows\gdbm\gdbm" $(SQLITE_INCLUDES)
    7272
    7373!IF $(GSDL_VC4)
    7474DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    75 INCLUDES = $(INCLUDES) -I"$(PACKAGES_DIR)\windows\stlport\stlport"
     75INCLUDES = $(INCLUDES) -I"$(COMMON_DIR)\packages\windows\stlport\stlport"
    7676!ENDIF
    7777

  • gsdl/trunk/runtime-src/src/oaiservr/win32.mak

    r16574 r16577  
    3030
    3131INDEXERS_DIR = $(COMMON_DIR)\indexers
     32COMMON_PACKAGES = $(COMMON_DIR)\packages
     33
    3234PACKAGES_DIR = $(RUNTIME_DIR)\packages
    3335COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr
    … …  
    6567
    6668!IF $(USE_SQLITE)
    67 SQLITE_LIBS = "$(PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
     69SQLITE_LIBS = "$(COMMON_PACKAGES)\sqlite\lib\sqlite3.lib"
    6870!ELSE
    6971SQLITE_LIBS =
    … …  
    7678        -DGSDL_NOCACHE
    7779INCLUDES = -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
    78         -I"$(INDEXERS_DIR)\mgpp\text" -I"$(PACKAGES_DIR)\windows\crypt\crypt" \
    79     -I"$(PACKAGES_DIR)\windows\expat\expat" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm"
     80        -I"$(INDEXERS_DIR)\mgpp\text" -I"$(COMMON_PACKAGES)\windows\crypt\crypt" \
     81    -I"$(COMMON_PACKAGES)\windows\expat\expat" -I"$(COMMON_PACKAGES)\windows\gdbm\gdbm"
    8082LDFLAGS =
    81 LIBS = "$(PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
    82         "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
     83LIBS = "$(COMMON_PACKAGES)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES)\windows\expat\expat\libexpat.lib" \
     84        "$(COMMON_PACKAGES)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
    8385
    8486!IF $(GSDL_VC4)
    8587DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    86 INCLUDES = $(INCLUDES) -I"$(PACKAGES_DIR)\windows\stlport\stlport"
     88INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES)\windows\stlport\stlport"
    8789!ENDIF
    8890!IF $(LOCAL_LIBRARY)

  • gsdl/trunk/runtime-src/src/protocol/win32.mak

    r16574 r16577  
    3030
    3131INDEXERS_DIR = $(COMMON_DIR)\indexers
    32 PACKAGES_DIR = $(RUNTIME_DIR)\packages
     32COMMON_PACKAGES = $(COMMON_DIR)\packages
     33
    3334COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr
    3435
    … …  
    5960# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist!
    6061INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mgpp\text" \
    61      -I"$(PACKAGES_DIR)\windows\gdbm\gdbm"
     62     -I"$(COMMON_PACKAGES)\windows\gdbm\gdbm"
    6263
    6364!IF $(GSDL_VC4)
    6465DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    65 INCLUDES = $(INCLUDES) -I"$(PACKAGES_DIR)\windows\stlport\stlport"
     66INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES)\windows\stlport\stlport"
    6667!ENDIF
    6768

  • gsdl/trunk/runtime-src/src/recpt/win32.mak

    r16574 r16577  
    3030
    3131INDEXERS_DIR = $(COMMON_DIR)\indexers
     32COMMON_PACKAGES = $(COMMON_DIR)\packages
     33
     34
    3235PACKAGES_DIR = $(RUNTIME_DIR)\packages
    3336COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr
    … …  
    6669
    6770!IF $(USE_SQLITE)
    68 SQLITE_LIBS = "$(PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
     71SQLITE_LIBS = "$(COMMON_PACKAGES)\sqlite\lib\sqlite3.lib"
    6972!ELSE
    7073SQLITE_LIBS =
    … …  
    7477Z3950_DEFS = -DUSE_Z3950
    7578Z3950_INCLUDES = -I$(Z3950_DIR)
    76 Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib
     79Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(COMMON_PACKAGES)\yaz\yaz-2.1.4\lib\yaz.lib
    7780!ELSE
    7881Z3950_DEFS =
    … …  
    8891INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
    8992    -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mgpp\text" \
    90     -I"$(PACKAGES_DIR)\windows\crypt\crypt" -I"$(PACKAGES_DIR)\windows\expat\expat" \
    91     -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" $(Z3950_INCLUDES)
     93    -I"$(COMMON_PACKAGES)\windows\crypt\crypt" -I"$(COMMON_PACKAGES)\windows\expat\expat" \
     94    -I"$(COMMON_PACKAGES)\windows\gdbm\gdbm" $(Z3950_INCLUDES)
    9295LDFLAGS =
    93 LIBS = "$(PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
    94         "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)
     96LIBS = "$(COMMON_PACKAGES)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES)\windows\expat\expat\libexpat.lib" \
     97        "$(COMMON_PACKAGES)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)
    9598
    9699!IF $(GSDL_VC4)
    97100DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    98 INCLUDES = $(INCLUDES) -I"$(PACKAGES_DIR)\windows\stlport\stlport"
     101INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES)\windows\stlport\stlport"
    99102!ENDIF
    100103!IF $(LOCAL_LIBRARY)

  • gsdl/trunk/runtime-src/src/w32server/win32.mak

    r16574 r16577  
    3030
    3131INDEXERS_DIR = $(COMMON_DIR)\indexers
     32COMMON_PACKAGES = $(COMMON_DIR)\packages
     33
    3234PACKAGES_DIR = $(RUNTIME_DIR)\packages
    3335COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr
    34 PROTOCOL_DIR = $(RUNTIME_DIR)\protocol
     36PROTOCOL_DIR = $(RUNTIME_DIR)\src\protocol
    3537RECPT_DIR    = $(RUNTIME_DIR)\src\recpt
    3638
    … …  
    5456
    5557!IF $(USE_SQLITE)
    56 SQLITE_LIBS = "$(PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
     58SQLITE_LIBS = "$(COMMON_PACKAGES)\sqlite\lib\sqlite3.lib"
    5759!ELSE
    5860SQLITE_LIBS =
    … …  
    6567INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
    6668    -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mg" \
    67     -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" \
     69    -I"$(COMMON_PACKAGES)\windows\gdbm\gdbm" \
    6870        -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \
    6971        -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text"
    7072LDFLAGS =
    71 LIBS = "$(PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
    72         "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
     73LIBS = "$(COMMON_PACKAGES)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES)\windows\expat\expat\libexpat.lib" \
     74        "$(COMMON_PACKAGES)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
    7375RSC = rc
    7476WINLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib \
    … …  
    8082!IF $(GSDL_VC4)
    8183DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
    82 INCLUDES = $(INCLUDES) -I"$(PACKAGES_DIR)\windows\stlport\stlport"
     84INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES)\windows\stlport\stlport"
    8385!ENDIF
    8486

  • gsdl/trunk/runtime-src/win32.mak

    r16575 r16577  
    11###########################################################################
    22#
    3 # win32 makefile -- gsdl
     3# win32 makefile -- gsdl runtime code
    44# A component of the Greenstone digital library software
    55# from the New Zealand Digital Library Project at the
    … …  
    2525###########################################################################
    2626
    27 GSDLHOME = $(MAKEDIR)
     27GSDLHOME = $(GSDLHOME)
     28RUNTIMEHOME = $(MAKEDIR)
     29
    2830GSDL_VC4 = 0
    2931LOCAL_LIBRARY = 0
    … …  
    3537MDEFINES = /f win32.mak
    3638
    37 INDEXERSDIR = indexers
     39COMPILEDIRS = src\colservr src\protocol
    3840
    39 COMPILEDIRS = packages\windows\gdbm\gdbm packages\windows\crypt\crypt \
    40         packages\windows\expat\expat src\lib src\colservr src\protocol
    41 
    42 INSTALLDIRS = src\hashfile src\gdbmedit\db2txt src\gdbmedit\txt2db src\phind\generate \
    43         src\recpt src\oaiservr
     41INSTALLDIRS = src\recpt src\oaiservr
    4442
    4543PACKAGEDIRS =
    … …  
    7472MAKECLEANCMD = $(MAKE) $(MDEFINES) clean
    7573
    76 all: win32.mak $(INDEXERSDIR) $(PACKAGEDIRS) $(COMPILEDIRS) $(INSTALLDIRS)
     74all: win32.mak $(PACKAGEDIRS) $(COMPILEDIRS) $(INSTALLDIRS)
    7775
    78 install: win32.mak $(INDEXERSDIR) $(INSTALLDIRS)
     76install: win32.mak $(INSTALLDIRS)
    7977
    8078clean:
    81     cd packages\windows\crypt\crypt
    82     $(MAKECLEANCMD)
    83     cd "$(GSDLHOME)"
    84     cd packages\windows\gdbm\gdbm
    85     $(MAKECLEANCMD)
    86     cd "$(GSDLHOME)"
    87     cd packages\windows\expat\expat
    88     $(MAKECLEANCMD)
    89     cd "$(GSDLHOME)"
    90     cd src\lib
    91     $(MAKECLEANCMD)
    92     cd "$(GSDLHOME)"
     79    cd "$(RUNTIMEHOME)"
    9380    cd src\colservr
    9481    $(MAKECLEANCMD)
    95     cd "$(GSDLHOME)"
     82    cd "$(RUNTIMEHOME)"
    9683    cd src\protocol
    9784    $(MAKECLEANCMD)
    98     cd "$(GSDLHOME)"
     85    cd "$(RUNTIMEHOME)"
    9986    cd src\recpt
    10087    $(MAKECLEANCMD)
    101     cd "$(GSDLHOME)"
     88    cd "$(RUNTIMEHOME)"
    10289    cd src\oaiservr
    10390    $(MAKECLEANCMD)
    104     cd "$(GSDLHOME)"
     91    cd "$(RUNTIMEHOME)"
    10592    cd src\w32server
    10693    $(MAKECLEANCMD)
    10794    cd "$(GSDLHOME)"
    108     cd src\phind\generate
    109     $(MAKECLEANCMD)
    110     cd "$(GSDLHOME)"
    111     cd src\hashfile
    112     $(MAKECLEANCMD)
    113     cd "$(GSDLHOME)"
    114     cd src\gdbmedit\txt2db
    115     $(MAKECLEANCMD)
    116     cd "$(GSDLHOME)"
    117     cd src\gdbmedit\db2txt
    118     $(MAKECLEANCMD)
    119     cd "$(GSDLHOME)"
    120     cd indexers
    121     call winMake.bat clean
    122     cd "$(GSDLHOME)"
    12395
    12496$(COMPILEDIRS): FORCE
     97    cd "$(RUNTIMEHOME)"
    12598    cd "$@"
    12699    $(MAKECMD)
    … …  
    128101
    129102$(INSTALLDIRS): FORCE
     103    cd "$(RUNTIMEHOME)"
    130104    cd "$@"
    131105    $(MAKECMD)
    … …  
    144118    cd "$(GSDLHOME)"
    145119
    146 $(INDEXERSDIR): FORCE
    147     cd "$@"
    148     call winMake.bat all gs2
    149     call winMake.bat install gs2
    150     if NOT EXIST "$(GSDLHOME)\bin\windows" mkdir "$(GSDLHOME)\bin\windows"
    151     if NOT EXIST "$(GSDLHOME)\bin\java" mkdir "$(GSDLHOME)\bin\java"
    152     for %%i in (bin\*.exe) do \
    153       copy %%i "$(GSDLHOME)\bin\windows"
    154     copy lucene-gs\LuceneWrapper.jar "$(GSDLHOME)\bin\java"
    155     cd "$(GSDLHOME)"
    156 
    157120FORCE:
    158121

  • gsdl/trunk/win32.mak

    r16574 r16577  
    3535MDEFINES = /f win32.mak
    3636
    37 COMPILEDIRS = common-src build-src runtime-src
    38 
    3937INSTALLDIRS = common-src build-src runtime-src
    4038
    … …  
    6361MAKECLEANCMD = $(MAKE) $(MDEFINES) clean
    6462
    65 all: win32.mak $(COMPILEDIRS) $(INSTALLDIRS)
     63all: win32.mak $(INSTALLDIRS)
    6664
    6765install: win32.mak $(INSTALLDIRS)
    … …  
    7876    cd "$(GSDLHOME)"
    7977
    80 $(COMPILEDIRS): FORCE
    81     cd "$@"
    82     $(MAKECMD)
    83     cd "$(GSDLHOME)"
    84 
    8578$(INSTALLDIRS): FORCE
    8679    cd "$@"
Note: See TracChangeset for help on using the changeset viewer.