Changeset 128 in Main for trunk

Timestamp:

Sep 23, 2024, 7:19:19 PM (8 weeks ago)

Author:

Nishi

Message:

release 1.04

Location:

trunk

Files:

• Binary (added)
• Binary/pbtewi.gif (moved) (moved from trunk/Server/powered.gif )
• Binary/tewi-install.ico (moved) (moved from trunk/Server/tewi-install.ico )
• Binary/tewi.ico (moved) (moved from trunk/Server/tewi.ico )
• Makefile (modified) (3 diffs)
• Server/Makefile (modified) (1 diff)
• Server/config.c (modified) (2 diffs)
• Server/install.nsi (modified) (2 diffs)
• Server/tewi.rc (modified) (1 diff)
• Server/tw_config.h (modified) (1 diff)
• Server/tw_version.h (modified) (1 diff)
• Tool (added)
• Tool/genconf.c (added)
• Tool/option.c (moved) (moved from trunk/Server/option.c )
• config.h.tmpl (modified) (1 diff)
• example-win.conf (deleted)
• installer.sh (modified) (3 diffs)
• itworks.html (deleted)

trunk/Makefile

@@ -11 +11 @@
 .PHONY: all format clean ./Server ./Common ./Module ./Manpage get-version
 
-all: ./Server ./Module ./Manpage
+all: ./Server ./Module ./Manpage ./Tool/genconf ./Tool/itworks
 
-./Server/option: ./Server/option.c
-        cc -o $@ ./Server/option.c
+./Tool/option: ./Tool/option.c
+        cc -o $@ ./Tool/option.c
 
-./Server:: ./Common ./Server/option
-        $(MAKE) -C $@ $(FLAGS) EXTOBJS="`./Server/option objs ../`" EXTLIBS="`./Server/option libs ../`" EXTCFLAGS="`./Server/option cflags ../`" EXTLDFLAGS="`./Server/option ldflags ../`"
+./Tool/genconf: ./Tool/genconf.c
+        cc -o $@ ./Tool/genconf.c
+
+./Server:: ./Common ./Tool/option
+        $(MAKE) -C $@ $(FLAGS) EXTOBJS="`./Tool/option objs ../`" EXTLIBS="`./Tool/option libs ../`" EXTCFLAGS="`./Tool/option cflags ../`" EXTLDFLAGS="`./Tool/option ldflags ../`"
 
 ./Module:: ./Common
@@ -28 +31 @@
         $(MAKE) -C $@ $(FLAGS)
 
-install: all
-        mkdir -p $(PREFIX)/bin $(PREFIX)/lib/tewi $(PREFIX)/share/man/man5 $(PREFIX)/etc
-        if [ ! -e $(PREFIX)/etc/tewi.conf ]; then cp example.conf $(PREFIX)/etc/tewi.conf ; fi
+install: all ./Tool/genconf ./Tool/itworks
+        mkdir -p $(PREFIX)/bin $(PREFIX)/lib/tewi $(PREFIX)/share/man/man5 $(PREFIX)/etc $(PREFIX)/www
+        if [ ! -e $(PREFIX)/etc/tewi.conf ]; then ( ./Tool/genconf $(PREFIX) > $(PREFIX)/etc/tewi.conf || ( rm $(PREFIX)/etc/tewi.conf ; exit 1 ) ) ; fi
+        if [ ! -e $(PREFIX)/www/index.html ]; then ( ./Tool/itworks > $(PREFIX)/www/index.html || ( rm $(PREFIX)/www/index.html ; exit 1 ) ) ; fi
+        if [ ! -e $(PREFIX)/www/pbtewi.gif ]; then ( cp Binary/pbtewi.gif $(PREFIX)/www/ || ( rm $(PREFIX)/www/pbtewi.gif ; exit 1 ) ) ; fi
         cp ./Server/tewi $(PREFIX)/bin/
         cp ./Module/*.so $(PREFIX)/lib/tewi/
@@ -46 +51 @@
         $(MAKE) -C ./Common $(FLAGS) clean
         $(MAKE) -C ./Manpage $(FLAGS) clean
-        rm -f ./Server/option
+        rm -f ./Tool/option ./Tool/genconf

trunk/Server/Makefile

@@ -16 +16 @@
         $(CC) $(CFLAGS) $(EXTCFLAGS) -c -o $@ $<
 
-tewi.res: tewi.rc tewi.ico
+tewi.res: tewi.rc ../Binary/tewi.ico
         $(WINDRES) tewi.rc -O coff -o $@
 

trunk/Server/config.c

@@ -90 +90 @@
         config.extension = NULL;
         config.server_root = cm_strdup(PREFIX);
+        config.server_admin = cm_strdup(SERVER_ADMIN);
         gethostname(config.hostname, 1024);
+        chdir(config.server_root);
 }
 
@@ -247 +249 @@
                                                         free(config.server_root);
                                                         config.server_root = cm_strdup(r[1]);
+                                                }
+                                        } else if(cm_strcaseequ(r[0], "ServerAdmin")) {
+                                                if(r[1] == NULL) {
+                                                        cm_log("Config", "Missing email at line %d", ln);
+                                                        stop = 1;
+                                                } else {
+                                                        free(config.server_admin);
+                                                        config.server_admin = cm_strdup(r[1]);
                                                 }
                                         } else if(cm_strcaseequ(r[0], "DocumentRoot")) {

trunk/Server/install.nsi

@@ -13 +13 @@
 OutFile "install.exe"
 InstallDir "C:\Tewi"
-Icon "tewi-install.ico"
+Icon "../Binary/tewi-install.ico"
 LicenseData ../LICENSE
 
@@ -43 +43 @@
         SetOutPath "$INSTDIR\etc"
         SetOverWrite off
-        File /oname=tewi.conf "../example-win.conf"
+        File /oname=tewi.conf "../generated.conf"
         SetOutPath "$INSTDIR\www"
         File /oname=index.html "../itworks.html"
+        File /oname=pbtewi.gif "../Binary/pbtewi.gif"
         SetOutPath "$INSTDIR\www\icons"
         File "../Icons/*.png"

trunk/Server/tewi.rc

@@ -3 +3 @@
 #include "../config.h"
 
-id ICON "./tewi.ico"
+id ICON "../Binary/tewi.ico"
 VS_VERSION_INFO VERSIONINFO
         FILEVERSION 1,0,0,0

trunk/Server/tw_config.h

@@ -82 +82 @@
         int module_count;
         int vhost_count;
+        char* server_admin;
         char* server_root;
         char* extension;

trunk/Server/tw_version.h

@@ -4 +4 @@
 #define __TW_VERSION_H__
 
-#define TW_VERSION "1.03A\0"
+#define TW_VERSION "1.04\0"
 
 const char* tw_get_version(void);

trunk/config.h.tmpl

@@ -3 +3 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
+
+#define SERVER_ADMIN "webmaster@domain"
 
 #undef NO_SSL

trunk/installer.sh

@@ -5 +5 @@
         rm -f tewi-service.exe
         rm -f tewi.exe
+        rm -f generated.conf
+        rm -f itworks.html
         mv config.h.bak config.h
         exit 1
@@ -22 +24 @@
 cp Server/tewi.exe tewi-service.exe
 cd Server
+../Tool/genconf > ../generated.conf
+../Tool/itworks > ../itworks.html
 makensis -DVERSION=$VERSION install.nsi
 cp install.exe ../install-nossl.exe
@@ -36 +40 @@
 cp Server/tewi.exe tewi-service.exe
 cd Server
+../Tool/genconf > ../generated.conf
+../Tool/itworks > ../itworks.html
 makensis -DVERSION=$VERSION install.nsi
 cp install.exe ../install-ssl.exe
 rm -f tewi.exe tewi-service.exe
 cd ..
+
+rm itworks.html
+rm generated.conf