Changeset 22832


Ignore:
Timestamp:
09/01/10 17:25:37 (11 years ago)
Author:
mdewsnip
Message:

Lots of improvements, particularly to Windows makefiles.

Location:
main/trunk/gs2-core
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/gs2-core/build-src/src/Makefile

    r21680 r22832  
     1###########################################################################
     2#
     3# Makefile -- Makefile for build-src/src
     4#
     5# By Michael Dewsnip
     6#
     7# Copyright (C) 2010  DL Consulting Ltd.
     8#
     9###########################################################################
     10
    111
    212all:
    3     (cd java/org/nzdl/gsdl && $(MAKE) all)
     13    cd java/org/nzdl/gsdl && $(MAKE) all
     14
     15install:
     16    cp java/org/nzdl/gsdl/ApplyXSLT.jar ../../bin/java
    417
    518clean:
    6     (cd java/org/nzdl/gsdl && $(MAKE) clean)
    7 
    8 distclean:
    9     (cd java/org/nzdl/gsdl && $(MAKE) distclean)
    10 
    11 install:
    12     (cp java/org/nzdl/gsdl/ApplyXSLT.jar ../../bin/java)
     19    cd java/org/nzdl/gsdl && $(MAKE) clean
  • main/trunk/gs2-core/build-src/src/win32.mak

    r21691 r22832  
     1###########################################################################
     2#
     3# win32.mak -- Makefile for build-src\src
     4#
     5# By Michael Dewsnip
     6#
     7# Copyright (C) 2010  DL Consulting Ltd.
     8#
     9###########################################################################
     10
    111
    212all:
    3     (cd java\org\nzdl\gsdl && winMake.bat all)
     13    cd java\org\nzdl\gsdl && winMake.bat all
     14
     15install:
     16    copy java\org\nzdl\gsdl\ApplyXSLT.jar ..\..\bin\java
    417
    518clean:
    6     (cd java\org\nzdl\gsdl && winMake.bat clean)
    7 
    8 install:
    9     (copy java\org\nzdl\gsdl\ApplyXSLT.jar ..\..\bin\java)
     19    cd java\org\nzdl\gsdl && winMake.bat clean
  • main/trunk/gs2-core/build-src/win32.mak

    r22728 r22832  
    1313
    1414
    15 all: win32.mak $(SUBDIRS)
     15all:
     16    @FOR %i IN ($(SUBDIRS)) DO cd %i && $(MAKE) /f win32.mak && cd $(MAKEDIR)
    1617
    17 install: win32.mak $(SUBDIRS)
     18install:
     19    @FOR %i IN ($(SUBDIRS)) DO cd %i && $(MAKE) /f win32.mak install && cd $(MAKEDIR)
    1820
    19 $(SUBDIRS): FORCE
    20     cd "$@"
    21     $(MAKE) /f win32.mak
    22     $(MAKE) /f win32.mak install
    23     cd "$(MAKEDIR)"
    24 
    25 FORCE:
     21clean:
     22    @FOR %i IN ($(SUBDIRS)) DO cd %i && $(MAKE) /f win32.mak clean && cd $(MAKEDIR)
  • main/trunk/gs2-core/common-src/indexers/Makefile

    r21666 r22832  
     1###########################################################################
     2#
     3# Makefile -- Makefile for common-src/indexers
     4#
     5# By Michael Dewsnip
     6#
     7# Copyright (C) 2010  DL Consulting Ltd.
     8#
     9###########################################################################
     10
    111
    212all:
    3     (cd lucene-gs && $(MAKE) all)
     13    cd lucene-gs && $(MAKE) all
     14
     15install:
     16    cp lucene-gs/LuceneWrapper.jar ../../bin/java
    417
    518clean:
    6     (cd lucene-gs && $(MAKE) clean)
    7 
    8 distclean:
    9     (cd lucene-gs && $(MAKE) distclean)
    10 
    11 install:
    12     (cp lucene-gs/LuceneWrapper.jar ../../bin/java)
     19    cd lucene-gs && $(MAKE) clean
  • main/trunk/gs2-core/common-src/indexers/win32.mak

    r21689 r22832  
     1###########################################################################
     2#
     3# win32.mak -- Makefile for common-src\indexers
     4#
     5# By Michael Dewsnip
     6#
     7# Copyright (C) 2010  DL Consulting Ltd.
     8#
     9###########################################################################
     10
    111
    212all:
    3     (cd lucene-gs && winMake.bat all)
     13    cd lucene-gs && winMake.bat all
     14
     15install:
     16    copy lucene-gs\LuceneWrapper.jar ..\..\bin\java
    417
    518clean:
    6     (cd lucene-gs && winMake.bat clean)
    7 
    8 install:
    9     (copy lucene-gs\LuceneWrapper.jar ..\..\bin\java)
     19    cd lucene-gs && winMake.bat clean
  • main/trunk/gs2-core/common-src/packages/expat/Makefile

    r21540 r22832  
     1###########################################################################
     2#
     3# Makefile -- Makefile for common-src/packages/expat
     4#
     5# By Michael Dewsnip
     6#
     7# Copyright (C) 2010  DL Consulting Ltd.
     8#
     9###########################################################################
     10
    111
    212all:
    3     (cd expat-1.95.8 && $(MAKE) all install)
     13    cd expat-1.95.8 && $(MAKE) all install
     14
     15install:
     16    cd expat-1.95.8 && $(MAKE) install
    417
    518clean:
    6     (cd expat-1.95.8 && $(MAKE) clean)
    7 
    8 distclean:
    9     (cd expat-1.95.8 && $(MAKE) distclean)
    10 
    11 install:
    12     @echo Expat installed
     19    cd expat-1.95.8 && $(MAKE) clean
  • main/trunk/gs2-core/common-src/packages/expat/win32.mak

    r22762 r22832  
     1###########################################################################
     2#
     3# win32.mak -- Windows Makefile for common-src\packages\expat
     4#
     5# By Michael Dewsnip
     6#
     7# Copyright (C) 2010  DL Consulting Ltd.
     8#
     9###########################################################################
     10
    111
    212all:
    3     (cd expat-1.95.8 && $(MAKE) /f win32.mak all)
     13    cd expat-1.95.8 && $(MAKE) /f win32.mak all install
     14
     15install:
     16    cd expat-1.95.8 && $(MAKE) /f win32.mak install
    417
    518clean:
    6     (cd expat-1.95.8 && $(MAKE) /f win32.mak clean)
    7 
    8 install:
    9     (cd expat-1.95.8 && $(MAKE) /f win32.mak install)
     19    cd expat-1.95.8 && $(MAKE) /f win32.mak clean
  • main/trunk/gs2-core/common-src/packages/sqlite/Makefile

    r21540 r22832  
     1###########################################################################
     2#
     3# Makefile -- Makefile for common-src/packages/sqlite
     4#
     5# By Michael Dewsnip
     6#
     7# Copyright (C) 2010  DL Consulting Ltd.
     8#
     9###########################################################################
     10
    111
    212all:
    3     (cd sqlite-amalgamation-3.5.9 && $(MAKE) all install)
     13    cd sqlite-amalgamation-3.5.9 && $(MAKE) all install
     14
     15install:
     16    cd sqlite-amalgamation-3.5.9 && $(MAKE) install
    417
    518clean:
    6     (cd sqlite-amalgamation-3.5.9 && $(MAKE) clean)
    7 
    8 distclean:
    9     (cd sqlite-amalgamation-3.5.9 && $(MAKE) distclean)
    10 
    11 install:
    12     @echo SQLite installed
     19    cd sqlite-amalgamation-3.5.9 && $(MAKE) clean
  • main/trunk/gs2-core/common-src/packages/sqlite/win32.mak

    r21689 r22832  
     1###########################################################################
     2#
     3# win32.mak -- Windows Makefile for common-src\packages\sqlite
     4#
     5# By Michael Dewsnip
     6#
     7# Copyright (C) 2010  DL Consulting Ltd.
     8#
     9###########################################################################
     10
    111
    212all:
    3     (cd sqlite-amalgamation-3.5.9 && $(MAKE) /f win32.mak all)
     13    cd sqlite-amalgamation-3.5.9 && $(MAKE) /f win32.mak all install
     14
     15install:
     16    cd sqlite-amalgamation-3.5.9 && $(MAKE) /f win32.mak install
    417
    518clean:
    6     (cd sqlite-amalgamation-3.5.9 && $(MAKE) /f win32.mak clean)
    7 
    8 install:
    9     (cd sqlite-amalgamation-3.5.9 && $(MAKE) /f win32.mak install)
     19    cd sqlite-amalgamation-3.5.9 && $(MAKE) /f win32.mak clean
  • main/trunk/gs2-core/common-src/src/lib/win32.mak

    r22826 r22832  
    6969install: $(LIBRARIES)
    7070
    71 distclean:
    72     del *.obj $(LIBRARIES) win32.mak
    73 
    7471clean:
    75     del *.obj $(LIBRARIES)
     72    if EXIST *.obj del *.obj
     73    if EXIST $(LIBRARIES) del $(LIBRARIES)
  • main/trunk/gs2-core/common-src/win32.mak

    r22826 r22832  
    2626
    2727
    28 all: win32.mak $(SUBDIRS)
     28all:
     29    @FOR %i IN ($(SUBDIRS)) DO cd %i && $(MAKE) /f win32.mak && cd $(MAKEDIR)
    2930
    30 install: win32.mak $(SUBDIRS)
     31install:
     32    @FOR %i IN ($(SUBDIRS)) DO cd %i && $(MAKE) /f win32.mak install && cd $(MAKEDIR)
    3133
    32 $(SUBDIRS): FORCE
    33     cd "$@"
    34     $(MAKE) /f win32.mak
    35     $(MAKE) /f win32.mak install
    36     cd "$(MAKEDIR)"
    37 
    38 FORCE:
     34clean:
     35    @FOR %i IN ($(SUBDIRS)) DO cd %i && $(MAKE) /f win32.mak clean && cd $(MAKEDIR)
  • main/trunk/gs2-core/runtime-src/src/colservr/win32.mak

    r22826 r22832  
    7979install: $(LIBRARIES)
    8080
    81 distclean:
    82     del *.obj $(LIBRARIES) win32.mak
    83 
    8481clean:
    85     del *.obj $(LIBRARIES)
     82    if EXIST *.obj del *.obj
     83    if EXIST $(LIBRARIES) del $(LIBRARIES)
  • main/trunk/gs2-core/runtime-src/src/oaiservr/win32.mak

    r22826 r22832  
    8585    copy $(CGIBIN_PROGRAMS) $(CGIBIN_DIR)
    8686
    87 distclean:
    88     del *.obj $(CGIBIN_PROGRAMS) win32.mak
    89 
    9087clean:
    91     del *.obj $(CGIBIN_PROGRAMS)
     88    if EXIST *.obj del *.obj
     89    if EXIST $(CGIBIN_PROGRAMS) del $(CGIBIN_PROGRAMS)
  • main/trunk/gs2-core/runtime-src/src/protocol/win32.mak

    r22826 r22832  
    4646install: $(LIBRARIES)
    4747
    48 distclean:
    49     del *.obj $(LIBRARIES) win32.mak
    50 
    5148clean:
    52     del *.obj $(LIBRARIES)
     49    if EXIST *.obj del *.obj
     50    if EXIST $(LIBRARIES) del $(LIBRARIES)
  • main/trunk/gs2-core/runtime-src/src/recpt/win32.mak

    r22826 r22832  
    121121    copy $(CGIBIN_PROGRAMS) $(CGIBIN_DIR)
    122122
    123 distclean:
    124     del *.obj $(CGIBIN_PROGRAMS) win32.mak
    125 
    126123clean:
    127     del *.obj $(CGIBIN_PROGRAMS)
     124    if EXIST *.obj del *.obj
     125    if EXIST $(CGIBIN_PROGRAMS) del $(CGIBIN_PROGRAMS)
  • main/trunk/gs2-core/runtime-src/win32.mak

    r22728 r22832  
    1313
    1414
    15 all: win32.mak $(SUBDIRS)
     15all:
     16    @FOR %i IN ($(SUBDIRS)) DO cd %i && $(MAKE) /f win32.mak && cd $(MAKEDIR)
    1617
    17 install: win32.mak $(SUBDIRS)
     18install:
     19    @FOR %i IN ($(SUBDIRS)) DO cd %i && $(MAKE) /f win32.mak install && cd $(MAKEDIR)
    1820
    19 $(SUBDIRS): FORCE
    20     cd "$@"
    21     $(MAKE) /f win32.mak
    22     $(MAKE) /f win32.mak install
    23     cd "$(MAKEDIR)"
    24 
    25 FORCE:
     21clean:
     22    @FOR %i IN ($(SUBDIRS)) DO cd %i && $(MAKE) /f win32.mak clean && cd $(MAKEDIR)
  • main/trunk/gs2-core/win32.mak

    r22824 r22832  
    2222
    2323
    24 all: win32.mak $(SUBDIRS)
     24all:
     25    @FOR %i IN ($(SUBDIRS)) DO cd %i && $(MAKE) /f win32.mak && cd $(MAKEDIR)
    2526
    26 install: win32.mak $(SUBDIRS)
     27install:
     28    @FOR %i IN ($(SUBDIRS)) DO cd %i && $(MAKE) /f win32.mak install && cd $(MAKEDIR)
    2729
    28 $(SUBDIRS): FORCE
    29     cd "$@"
    30     $(MAKE) /f win32.mak
    31     $(MAKE) /f win32.mak install
    32     cd "$(MAKEDIR)"
    33 
    34 FORCE:
     30clean:
     31    @FOR %i IN ($(SUBDIRS)) DO cd %i && $(MAKE) /f win32.mak clean && cd $(MAKEDIR)
Note: See TracChangeset for help on using the changeset viewer.