Changeset 131 in Main for trunk


Ignore:
Timestamp:
Sep 23, 2024, 7:30:00 PM (8 weeks ago)
Author:
Nishi
Message:

fix genconf

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r130 r131  
    3636install: all ./Tool/genconf ./Tool/itworks
    3737        mkdir -p $(PREFIX)/bin $(PREFIX)/lib/tewi $(PREFIX)/share/man/man5 $(PREFIX)/etc $(PREFIX)/www
    38         if [ ! -e $(PREFIX)/etc/tewi.conf ]; then ( ./Tool/genconf $(PREFIX) > $(PREFIX)/etc/tewi.conf || ( rm $(PREFIX)/etc/tewi.conf ; exit 1 ) ) ; fi
     38        if [ ! -e $(PREFIX)/etc/tewi.conf ]; then ( ./Tool/genconf $(PREFIX) lib/tewi so > $(PREFIX)/etc/tewi.conf || ( rm $(PREFIX)/etc/tewi.conf ; exit 1 ) ) ; fi
    3939        if [ ! -e $(PREFIX)/www/index.html ]; then ( ./Tool/itworks > $(PREFIX)/www/index.html || ( rm $(PREFIX)/www/index.html ; exit 1 ) ) ; fi
    4040        if [ ! -e $(PREFIX)/www/pbtewi.gif ]; then ( cp Binary/pbtewi.gif $(PREFIX)/www/ || ( rm $(PREFIX)/www/pbtewi.gif ; exit 1 ) ) ; fi

  • trunk/Server/tw_version.h

    r130 r131  
    44#define __TW_VERSION_H__
    55
    6 #define TW_VERSION "1.04A\0"
     6#define TW_VERSION "1.04B\0"
    77
    88const char* tw_get_version(void);

  • trunk/Tool/genconf.c

    r129 r131  
    66
    77int main(int argc, char** argv) {
    8         if(argc < 2) {
     8        if(argc < 4) {
    99                return 1;
    1010        }
    … …  
    1919        printf("ServerAdmin %s\n", SERVER_ADMIN);
    2020        printf("\n");
    21         printf("LoadModule lib/tewi/mod_cgi.so\n");
    22         printf("#LoadModule lib/tewi/mod_proxy.so\n");
     21        printf("LoadModule %s/mod_cgi.%s\n", argv[2], argv[3]);
     22        printf("#LoadModule %s/mod_proxy.%s\n", argv[2], argv[3]);
    2323        printf("\n");
    2424        printf("Listen 80\n");

  • trunk/installer.sh

    r130 r131  
    2323cp Server/tewi.exe tewi-service.exe
    2424cd Server
    25 ../Tool/genconf "C:/Tewi" > ../generated.conf
     25../Tool/genconf "C:/Tewi" modules dll > ../generated.conf
    2626../Tool/itworks > ../itworks.html
    2727makensis -DVERSION=$VERSION install.nsi
    … …  
    3939cp Server/tewi.exe tewi-service.exe
    4040cd Server
    41 ../Tool/genconf "C:/Tewi" > ../generated.conf
     41../Tool/genconf "C:/Tewi" modules dll > ../generated.conf
    4242../Tool/itworks > ../itworks.html
    4343makensis -DVERSION=$VERSION install.nsi
Note: See TracChangeset for help on using the changeset viewer.